Fixed project reorg