Intermediate commit before a whole lot of reverts.
Reverting "Intermediate commit before a whole lot of reverts."
Reverting "Simplifying commit."
Reverting "Moved stuff so that it is now in many chapters instead of just onwe."
Revert "Moved stuff so that it is now in many chapters instead of just onwe."

This reverts commit 6350e4142ae171e4e185a1fdbacdad51c1876c27.