Reorganized some of the music header, and finished