Sorting Your Albums - How?

My total amount of Digital Albums has raised lately, and it's getting hard to find stuff. This is going to be a bit long, so please bare with me
So far - all I did was to sort Albums by Folders, for example:

First is the Album name 'Trip to New York', following by sub-directories (For example ' Hotel). The Numbers before the Sections Names represent the chronical order of things.

Now, my problem is that now I have quite a lot of 'Albums' and it's getting hard to find something if you can't remember the folder name, and that sometimes 'Sections' are getting complex. For example: Pictures 1 to 10 are pictures from times Square, Picture 11 is a picture of a dog I took while walking from Times Square to Broadway f and pictures 12-20 is Broadway. It will translate to: