I have a ton of incandescents and cfls of similar size, some have proper boxes, some have just a thin paper wrap, and some have no packaging. I want advice on how to store them, as I currently store them on shelves and I'm running out of space. Does anyone know how to store them?

For the ones without box, you can try those dividers that are meant for christmas ornaments. If you take stackable cardboard boxes and put the dividers in there, you can stack layers of lamps safely.