Makeup (Re)Organization

As my mother (or anyone who has lived with me, really) can attest, my life is cluttered.  In shared spaces, I like things to be just so and am anal-retentive, but in my own space it is an entirely different story.  While part of the problem is that I have too much stuff and no place to put it (especially since moving to DC where proper-sized closets and dressers do not fit), I also just am cluttered.  I put things where it is most convenient and not where it actually belongs.  
So it should come as no surprise that the clutter extends everywhere, from my closet to my dresser, to my makeup.  Since the closet needs a lot of work (shelves, etc) and the dresser is going to wait until I swap out my winter clothes for summer, I decided to tackle my makeup.  
I wish I had before pictures, but to give you a little frame of reference: that basket in the picture below, which now contains some extra makeup and my nail polish used to contain all of my makeup.  The nail polishes were just tossed in the excess space in the drawer.  Ew.
So, I took a little trip to Bed, Bath and Beyond and picked up a cup for my makeup brushes and a table-top organizer for my most commonly-used makeup.  I then reorganized the drawer.
Results:
Nail polish placed neatly in a bin, along with files and some makeup I don't use every day.  Also in the drawer are hair products and lotions, all within easy reach, and some vitamins.

I might have a nail polish problem...This is after I weeded out the nasty old ones.  Also, I believe there are at least 5 that could be classified as a shade of pink.  Oops?

Makeup products I use frequently are neatly placed in the compartments, and the brushes are in their cup!

In the words of my roommate: "I've never seen anyone with so many lip products in my life!" What can I say, I'm obsessed?

I may still have too much makeup...

Dresser is finally clean and organized.

We'll see how long this lasts...