Added Song and SongService classes