Phase 1
Phase 2
Merge branch 'reorganize-2' into dev
Added {{BaseURL}} and change some relative URLs
Merge branch 'dev'