My next project is cleaning my "shop." What an s-hole my place is! I have, literally, a foot tall pile of crap covering my entire workbench. I dig, find what I need, use it, dig some more. It's SOOOO aggravating. This is how I've been my whole life, though, so I might just be stuck with it.
My only word of advice would be to move your buffer away from the grinders. Otherwise you get metal chips and dust in your buffing wheel and it becomes more of a sander than a buffer!