Sounds like me and you got about the same organization skills.. lol. When ever taking something apart I use little bins or trays like you use to stock various screws, washers, nuts, bolts etc. You can buy them like 20 for $10 bucks at places like northern tool or harbor freight. I also have learned to label everything, even if I toss it in a cardboard box and throw it under a work bench, I to keep spare parts and old equipment, can't seem to part with it easily. I had an employee go thru and restock some of my shelf space in the shop, bad bad decision, now neither one of us can find what I'm looking for... Lol... at least I got someone to pin it on... :-)