minor
Minor removing of defines
Extract samples from DizSound class
Extract music from DizSound.