cleaned up filetools and dir