Introduce Artist/Album classes instead of using dicts to clean up mess