Restructured parts of the user guide