CORE-4066: more documentation reorganization