Numbering tweaks

Changed folder numbering to increase consistency