Reorder more sections (will do a final squash once we are happy)