Edits to the reorganization

[ngfreiter]

Several typo fixes, but also some content changes that you should take a careful look at.