implement avi's changes
Merge branch 'song-oriented' of github.com:team-saga/playlister-rb-unit-1 into remotes/origin/song-oriented
Merge branch 'master' of github.com:team-saga/playlister-rb-unit-1 into remotes/origin/song-oriented
new structure