Added sound fx folder, more code clean up