Fuck doing it by hand. If you acquire the full version of MediaMonkey and learn how to use it's sorting/tag system it can manage your entire library flawlessly. I mean, it has the ability to pull album/track information from Amazon and update the ID3 tags and auto-organize all the files (including custom file name formats), what more do you need?