Rearranged some of the scenes, sorted out some music tracks