Minor project reorg