You are doing better than me. At least you have all of yours in one folder, on one computer!
I do my best sorting as I load them on to the computer or right after. Otherwise I forget and my lazy self takes over to me pretty much never getting back to that until they are taking over other parts of the computer and I have to herd them all back together.