Move sound code to sound.rs