fix sigs of tools and improve organization