Further reorganising of folders.

Folders are now grouped in nines (i.e. 1-9, 10-19 etc.)