Rework MusicSource (now extends PrimarySource)