Storage is a critical issue for me, I bought one those 15 drawer filing cabinets off eBay you can use one drawer for drills, one for measuring equipment, one for marking out gear and so on. They also have slots in so you can compartmentalise individual drawers for different size nuts & bolts etching
https://www.ebay.co.uk/itm/283969640188
