Let the computer do the work, I recommend beets which pulls Musicbrainz data: http://beets.io/
For something much simpler I recommend EasyTAG: https://wiki.gnome.org/Apps/EasyTAG
I've had mixed success with this before when it comes to organizing media. Is there any app which takes the middle ground of doing the work but letting the user confirm?