DOCS-975 DOCS-863 edits and organizational overhaul