Reorganize and fix numbering.