Tree reorg

Cleanup of the tree