Re-order sections to make better sense.