Reorganize repo structure. Phase 2.