Made toolbox tools modular