Phase 1
Phase 2
Merge branch 'reorganize-2' into dev