I do pretty much the same but I also use EXIF data to add place names to the folder name.