Today I started to collect all the remaining kit from the old building shack and set it up in the new QTH. The large pieces of test gear are the easy bit. It is all the boxes and bags of "these might come in handy some day" components and crystals that are the problem. Also wire: I have so many reels of "useful" wire! My plan is to continue this over the weekend and get most of the useful stuff moved and other, less useful, kit boxed and stored in a box should I ever need it. I am really hoping that I can be a lot better organised going forwards. Once I start an electronics building project the workbench goes from orderly to chaos very quickly!
When I was an RF engineer (not a very good one BTW) we used to keep resistors and capacitors in little open topped brown envelopes in a box on the bench. This worked very well and was easier and less space intensive that racks of storage drawers. I may go back to this for the more common non ESD sensitive components.