Reorg codebase.