No, but what I do is take a few moments to describe an image. That way each seems to fit into a category more easily. Once the category is established, I try to sub-categorize it.
One thing that I will need to do when uploading images is to offer title, description and keywords. That will be used for categorization within the upload site. So organization is forced upon the upload image - organize them in a similar way for the originals should help you.
Placing the image within a sub-category is the only way I can offer any assistance in organizing your photos in the meantime.