Adapt documentation.
Minor restructuring.