Songs are now stored as MusicFile objects