Improved LibraryScanner.

Leaved itunesfeature as it was.