Reorders, renames, and adds some sections