I have been going through my system doing it. Try http://www.mp3tag.de/en/ to get the music info from Amazon etc as well. I have 2 folders of music at the mo, sorted and unsorted, run mp3tag on the unsorted stuff, move it into sorted and let Media Player do the rest