Reorganize headings