Full redo of numbering structure.