Music Commit (Remaster)

I did a little bit of a folder switch for the music. I also found the
missing sounds and put them back into place. (Hopefully this doesn't
cause too much merging nightmares.)