Move tool-chain scaffolding back into the tools directory