Reorg project structure.