Got rid of tools.hpp, it was somewhat redundant