Renaming folders in a more sensible manner