WIP. Project reorg.