Re-organize repo to simplify the migration to the new domain