I was in a similar situation only a couple of weeks ago. So I FINALLY got around to sorting my mp3 collection by artist (each artist had their own directory) - yes this sucked. I don't ever want to do it again as long as I live. Then after that I used this: http://www.mp3tag.de/en/ to handle the tags and various other tasks - it was very helpful. Maybe it could help you. I know it takes a long time to do this, I had to handle ~5000 mp3's this way, but now I'm MUCH happier that I've done so. Just my 2 cents. Good luck!