Finally organizing the tools section