Minor treecat reorg