Do not mess with anything until you move of course. You already hit on the fact the tools are crammed into the drawers and so many you can't organize them. That is the way my wrenches ,sockets etc etc are organized. I do have a spare tool box i keep runover sockets in. I also made a tool box from ammo cans for each vehicle and for the boats that usually stay in the vehicles and boats. Got the basic tools I need to do starters and alternators or belts etc on the side of the road. Tape and zip ties and a little bailing wire go a long ways in those boxes.