Adding sound effect; some reorg