Do away with tools folder