Reorganize some sections and add empty sections.