You guys probably knew this already but I only found out yesterday. Picard. Tags your files and aranges them for you. Still requires monitoring but it sure beats renaming 2000 files by hand. For instance I have a CCR ripped greatest hits album. Well CCR has as many greatest hits albums as it does hits. You can drag it from the wrong album to the correct one.

After you finish tagging all your albums doing the new ones you add is a snap and little work.