Improve numbering: rename folders