Oh, I misunderstood your problem! Try the MusicBrainz Tagger - it makes an attempt at guessing the songs based on special signatures and a CDDB-like back-end. I can't remember if it can organize the actual files better, but once your ID3 tags are correct there are other tools to do that - none jump at me right now though.