DOCS-1770 administration reorganization

Ready for merge.