2.7 reorg