Reorg of cohorts and discussion topics
Excludes changes for always-cohort-inline-discussions (DOC-1077)