Merge "Structural changes to documentation"