MusicPlayer
CHG: Refactoring of tracks