Reorder some sections.

I think the new ordering makes more sense when reading the document in a first run context.