Merge "Doc change: Updating toc with final restructuring changes"