Add tools
Reorg some things