Get rid of the dependencies on the Tools.h and the Tool.cpp files