I have a tinge of resentment at chief38's tool stash. But just a tinge, because I have a pretty fair stash myself.
My plier drawer is not as neatly laid out. I have several depths of pliers as that is a limitation of space available and proximity. The hemostats are in a separate small drawer designated for very small precision tools.
For gun work I have a separate milsurp steel box that is about 8X8", broad and shallow that holds everything I need to work on guns. I have a similarly equipped identical box that stays in my gun box (Pachmyar from my PPC days) for any issues that may arise when out shooting. These two boxes, with some degree of redundancy, contain the specific tools I need for these purposes. Some of these are firearm specific, such as screwdrivers. Others are adapted for the purpose. The third such box (unfortunately the last one) contains cleaning supplies/gear except for fluids and longer rods. Except for the box in my shooting box, the other two reside in a cabinet that contains most of my other shooting supplies. The Pachmyar gun box sits on top of this cabinet. Perfectly organized for my purposes.
All tools, regardless of type, are always put back completely clean in the drawers or boxes at the end of the work session, even if the project is not completed.
I am quite particular about taking care of my gear, all of it in any category. My bride asserts I am OCD about care and maintenance. But I am not. I am just resolutely reasonable. (I am OCD about being termed OCD, so don't call me OCD!).
The only frustration to any of this is there seems to be no further joy to be derived from browsing the tool departments looking for something I did not know about, but having seen it, must have it.