"Cleanup" has various issues

[chrisgraham]

"Remove Empty Folders" will not work if "File/Folder Cleanup" is not enabled, and the preferences UI does not make this clear.

And then there's the moving of non-music files, which HAS to happen if "File/Folder Cleanup" is on.

I think it makes more sense to have a "Remove Empty Folders" option and a "Move Associated Files" option, as really the two things you do under "File/Folder Cleanup" are pretty different things and I see no reason to have a parent option to them.

And all this said, the moving of non-music files is very dangerous, because the user may be reorganizing stuff that is not under a deep directory yet. E.g. ~/Music/example.mp3. Any other files in ~/Music, e.g. random playlist files, will get moved with it.