Adding artist/album filter refining support.

Also moving the data structures into their own folder.