Office Organization

If anyone has ever been to my office, you know its a mess! I "know" where everything is, but it is a mess... Well, it has finally been brought to a head. My new boss put on my annual review that the lack of organization in my office may begin to undermine my authority. Of course, I don't want that to happen, soooo I'm instituting project organization! I am open to ideas. I will spend parts of the spring going through my desk drawers, but the tops of my desk are really what need the most work. The good news is that I should be getting my new laptop for work soon, so that will free up my space (currently my tower is perched on my desk, behind my monitor and next to my printer). I also need to work on my labels. Any ideas for office organization?