I have a closet in my bathroom next to the sink with nice shelves. I think it was supposed to be a linen closet but I use something else for that purpose.
I keep ALL my beauty supplies in the closet and I have four sets of plastic drawers that organizes everything. They look like this only they're a little bigger and there are four of them:
I have two sets of drawers on a shelf, so two shelves are devoted only to makeup. Some of the drawers have another plastic insert in them to hold more. I bought a plastic craft box and removed the lid to hold various pots -- especially my BE shadows.
It works for me!
Where do you purchase these?