Adjust both content and document structure. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>