reorganize sections; reorder methods