Refactor and added Spotify files.