subproject reorg