remove tools dir, change dir structure