Tools hooked up, some app reorg
Merge