I totally agree with Jerome about the current folder-naming convention. Months and years are no longer sustainable, but I'm not sure about folder-subfolder approach. What about adding the ability to tag media so that way they get categorized?