Cleanup and single root
Reorg