If you use a PC, then look at MediaMonkey; I’ve used it for years, and find it very rational. It’s what I now use to maintain my music library on my MC. It will even undo the obfuscation on iThings, pulling music off into logical folders.
I discussed it, and some other alternatives, on this thread:
Oh, and some alternatives here, too: