Reorganize sound files; minor code edit