Reorganize by section number and add subheadings.