Merge "Update the structure of the documentation"