Some structure changes
Merge branch 'master' into show_songs_list