DOCS-2981 agg reorg w Mathias feedback from Friday