Reorg the repo as necessary
Reorg the repo as necessary