I have been engaged in a shop re-org recently. It has gone pretty well, and maybe my problem is just a personality disorder, but every time I clear the horizontal surfaces in the shop within a remarkably short time they are covered with off-cuts, odds and ends, hand tools and stuff. I'm thinking of just making a two level rolling cart to catch all of it as I move from place to place. What other than a level of self discipline I don't possess works for you?