Reorganize documentation.
Merge master onto pr/473