Changed Song from cutsom structures to Map
Updating uses of Song in project