diff --git a/Makefile b/Makefile
index d82b65ec0f..fbea65f3cd 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,9 @@ libcocos2dx-clean:
 	$(MAKE) -C cocos2dx/proj.$(PLATFORM) clean
 
 cocosdenshion: libcocos2dx
-	$(MAKE) -C CocosDenshion/proj.$(PLATFORM)
+	$(MAKE) -C audio/proj.$(PLATFORM)
 cocosdenshion-clean:
-	$(MAKE) -C CocosDenshion/proj.$(PLATFORM) clean
+	$(MAKE) -C audio/proj.$(PLATFORM) clean
 
 lua: libextensions
 	$(MAKE) -C scripting/lua/proj.$(PLATFORM)
diff --git a/CocosDenshion/android/Android.mk b/audio/android/Android.mk
similarity index 100%
rename from CocosDenshion/android/Android.mk
rename to audio/android/Android.mk
diff --git a/CocosDenshion/android/ccdandroidUtils.cpp b/audio/android/ccdandroidUtils.cpp
similarity index 100%
rename from CocosDenshion/android/ccdandroidUtils.cpp
rename to audio/android/ccdandroidUtils.cpp
diff --git a/CocosDenshion/android/ccdandroidUtils.h b/audio/android/ccdandroidUtils.h
similarity index 100%
rename from CocosDenshion/android/ccdandroidUtils.h
rename to audio/android/ccdandroidUtils.h
diff --git a/CocosDenshion/android/cddSimpleAudioEngine.cpp b/audio/android/cddSimpleAudioEngine.cpp
similarity index 100%
rename from CocosDenshion/android/cddSimpleAudioEngine.cpp
rename to audio/android/cddSimpleAudioEngine.cpp
diff --git a/CocosDenshion/android/jni/cddandroidAndroidJavaEngine.cpp b/audio/android/jni/cddandroidAndroidJavaEngine.cpp
similarity index 100%
rename from CocosDenshion/android/jni/cddandroidAndroidJavaEngine.cpp
rename to audio/android/jni/cddandroidAndroidJavaEngine.cpp
diff --git a/CocosDenshion/android/jni/cddandroidAndroidJavaEngine.h b/audio/android/jni/cddandroidAndroidJavaEngine.h
similarity index 100%
rename from CocosDenshion/android/jni/cddandroidAndroidJavaEngine.h
rename to audio/android/jni/cddandroidAndroidJavaEngine.h
diff --git a/CocosDenshion/android/opensl/OpenSLEngine.cpp b/audio/android/opensl/OpenSLEngine.cpp
similarity index 100%
rename from CocosDenshion/android/opensl/OpenSLEngine.cpp
rename to audio/android/opensl/OpenSLEngine.cpp
diff --git a/CocosDenshion/android/opensl/OpenSLEngine.h b/audio/android/opensl/OpenSLEngine.h
similarity index 100%
rename from CocosDenshion/android/opensl/OpenSLEngine.h
rename to audio/android/opensl/OpenSLEngine.h
diff --git a/CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.cpp b/audio/android/opensl/SimpleAudioEngineOpenSL.cpp
similarity index 100%
rename from CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.cpp
rename to audio/android/opensl/SimpleAudioEngineOpenSL.cpp
diff --git a/CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.h b/audio/android/opensl/SimpleAudioEngineOpenSL.h
similarity index 100%
rename from CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.h
rename to audio/android/opensl/SimpleAudioEngineOpenSL.h
diff --git a/CocosDenshion/android/opensl/cddandroidOpenSLEngine.cpp b/audio/android/opensl/cddandroidOpenSLEngine.cpp
similarity index 100%
rename from CocosDenshion/android/opensl/cddandroidOpenSLEngine.cpp
rename to audio/android/opensl/cddandroidOpenSLEngine.cpp
diff --git a/CocosDenshion/android/opensl/cddandroidOpenSLEngine.h b/audio/android/opensl/cddandroidOpenSLEngine.h
similarity index 100%
rename from CocosDenshion/android/opensl/cddandroidOpenSLEngine.h
rename to audio/android/opensl/cddandroidOpenSLEngine.h
diff --git a/CocosDenshion/emscripten/SimpleAudioEngine.cpp b/audio/emscripten/SimpleAudioEngine.cpp
similarity index 100%
rename from CocosDenshion/emscripten/SimpleAudioEngine.cpp
rename to audio/emscripten/SimpleAudioEngine.cpp
diff --git a/CocosDenshion/include/Export.h b/audio/include/Export.h
similarity index 100%
rename from CocosDenshion/include/Export.h
rename to audio/include/Export.h
diff --git a/CocosDenshion/include/SimpleAudioEngine.h b/audio/include/SimpleAudioEngine.h
similarity index 100%
rename from CocosDenshion/include/SimpleAudioEngine.h
rename to audio/include/SimpleAudioEngine.h
diff --git a/CocosDenshion/ios/CDAudioManager.h b/audio/ios/CDAudioManager.h
similarity index 100%
rename from CocosDenshion/ios/CDAudioManager.h
rename to audio/ios/CDAudioManager.h
diff --git a/CocosDenshion/ios/CDAudioManager.m b/audio/ios/CDAudioManager.m
similarity index 100%
rename from CocosDenshion/ios/CDAudioManager.m
rename to audio/ios/CDAudioManager.m
diff --git a/CocosDenshion/ios/CDConfig.h b/audio/ios/CDConfig.h
similarity index 100%
rename from CocosDenshion/ios/CDConfig.h
rename to audio/ios/CDConfig.h
diff --git a/CocosDenshion/ios/CDOpenALSupport.h b/audio/ios/CDOpenALSupport.h
similarity index 100%
rename from CocosDenshion/ios/CDOpenALSupport.h
rename to audio/ios/CDOpenALSupport.h
diff --git a/CocosDenshion/ios/CDOpenALSupport.m b/audio/ios/CDOpenALSupport.m
similarity index 100%
rename from CocosDenshion/ios/CDOpenALSupport.m
rename to audio/ios/CDOpenALSupport.m
diff --git a/CocosDenshion/ios/CocosDenshion.h b/audio/ios/CocosDenshion.h
similarity index 100%
rename from CocosDenshion/ios/CocosDenshion.h
rename to audio/ios/CocosDenshion.h
diff --git a/CocosDenshion/ios/CocosDenshion.m b/audio/ios/CocosDenshion.m
similarity index 100%
rename from CocosDenshion/ios/CocosDenshion.m
rename to audio/ios/CocosDenshion.m
diff --git a/CocosDenshion/ios/SimpleAudioEngine.mm b/audio/ios/SimpleAudioEngine.mm
similarity index 100%
rename from CocosDenshion/ios/SimpleAudioEngine.mm
rename to audio/ios/SimpleAudioEngine.mm
diff --git a/CocosDenshion/ios/SimpleAudioEngine_objc.h b/audio/ios/SimpleAudioEngine_objc.h
similarity index 100%
rename from CocosDenshion/ios/SimpleAudioEngine_objc.h
rename to audio/ios/SimpleAudioEngine_objc.h
diff --git a/CocosDenshion/ios/SimpleAudioEngine_objc.m b/audio/ios/SimpleAudioEngine_objc.m
similarity index 100%
rename from CocosDenshion/ios/SimpleAudioEngine_objc.m
rename to audio/ios/SimpleAudioEngine_objc.m
diff --git a/CocosDenshion/linux/AudioPlayer.h b/audio/linux/AudioPlayer.h
similarity index 100%
rename from CocosDenshion/linux/AudioPlayer.h
rename to audio/linux/AudioPlayer.h
diff --git a/CocosDenshion/linux/FmodAudioPlayer.cpp b/audio/linux/FmodAudioPlayer.cpp
similarity index 100%
rename from CocosDenshion/linux/FmodAudioPlayer.cpp
rename to audio/linux/FmodAudioPlayer.cpp
diff --git a/CocosDenshion/linux/FmodAudioPlayer.h b/audio/linux/FmodAudioPlayer.h
similarity index 100%
rename from CocosDenshion/linux/FmodAudioPlayer.h
rename to audio/linux/FmodAudioPlayer.h
diff --git a/CocosDenshion/linux/SimpleAudioEngineFMOD.cpp b/audio/linux/SimpleAudioEngineFMOD.cpp
similarity index 100%
rename from CocosDenshion/linux/SimpleAudioEngineFMOD.cpp
rename to audio/linux/SimpleAudioEngineFMOD.cpp
diff --git a/CocosDenshion/mac/CDAudioManager.h b/audio/mac/CDAudioManager.h
similarity index 100%
rename from CocosDenshion/mac/CDAudioManager.h
rename to audio/mac/CDAudioManager.h
diff --git a/CocosDenshion/mac/CDAudioManager.m b/audio/mac/CDAudioManager.m
similarity index 100%
rename from CocosDenshion/mac/CDAudioManager.m
rename to audio/mac/CDAudioManager.m
diff --git a/CocosDenshion/mac/CDConfig.h b/audio/mac/CDConfig.h
similarity index 100%
rename from CocosDenshion/mac/CDConfig.h
rename to audio/mac/CDConfig.h
diff --git a/CocosDenshion/mac/CDOpenALSupport.h b/audio/mac/CDOpenALSupport.h
similarity index 100%
rename from CocosDenshion/mac/CDOpenALSupport.h
rename to audio/mac/CDOpenALSupport.h
diff --git a/CocosDenshion/mac/CDOpenALSupport.m b/audio/mac/CDOpenALSupport.m
similarity index 100%
rename from CocosDenshion/mac/CDOpenALSupport.m
rename to audio/mac/CDOpenALSupport.m
diff --git a/CocosDenshion/mac/CDXMacOSXSupport.h b/audio/mac/CDXMacOSXSupport.h
similarity index 100%
rename from CocosDenshion/mac/CDXMacOSXSupport.h
rename to audio/mac/CDXMacOSXSupport.h
diff --git a/CocosDenshion/mac/CDXMacOSXSupport.mm b/audio/mac/CDXMacOSXSupport.mm
similarity index 100%
rename from CocosDenshion/mac/CDXMacOSXSupport.mm
rename to audio/mac/CDXMacOSXSupport.mm
diff --git a/CocosDenshion/mac/CocosDenshion.h b/audio/mac/CocosDenshion.h
similarity index 100%
rename from CocosDenshion/mac/CocosDenshion.h
rename to audio/mac/CocosDenshion.h
diff --git a/CocosDenshion/mac/CocosDenshion.m b/audio/mac/CocosDenshion.m
similarity index 100%
rename from CocosDenshion/mac/CocosDenshion.m
rename to audio/mac/CocosDenshion.m
diff --git a/CocosDenshion/mac/SimpleAudioEngine.mm b/audio/mac/SimpleAudioEngine.mm
similarity index 100%
rename from CocosDenshion/mac/SimpleAudioEngine.mm
rename to audio/mac/SimpleAudioEngine.mm
diff --git a/CocosDenshion/mac/SimpleAudioEngine_objc.h b/audio/mac/SimpleAudioEngine_objc.h
similarity index 100%
rename from CocosDenshion/mac/SimpleAudioEngine_objc.h
rename to audio/mac/SimpleAudioEngine_objc.h
diff --git a/CocosDenshion/mac/SimpleAudioEngine_objc.m b/audio/mac/SimpleAudioEngine_objc.m
similarity index 100%
rename from CocosDenshion/mac/SimpleAudioEngine_objc.m
rename to audio/mac/SimpleAudioEngine_objc.m
diff --git a/CocosDenshion/openal/OpenALDecoder.cpp b/audio/openal/OpenALDecoder.cpp
similarity index 100%
rename from CocosDenshion/openal/OpenALDecoder.cpp
rename to audio/openal/OpenALDecoder.cpp
diff --git a/CocosDenshion/openal/OpenALDecoder.h b/audio/openal/OpenALDecoder.h
similarity index 100%
rename from CocosDenshion/openal/OpenALDecoder.h
rename to audio/openal/OpenALDecoder.h
diff --git a/CocosDenshion/openal/SimpleAudioEngineOpenAL.cpp b/audio/openal/SimpleAudioEngineOpenAL.cpp
similarity index 100%
rename from CocosDenshion/openal/SimpleAudioEngineOpenAL.cpp
rename to audio/openal/SimpleAudioEngineOpenAL.cpp
diff --git a/CocosDenshion/proj.emscripten/Makefile b/audio/proj.emscripten/Makefile
similarity index 100%
rename from CocosDenshion/proj.emscripten/Makefile
rename to audio/proj.emscripten/Makefile
diff --git a/CocosDenshion/proj.ios/CocosDenshion.xcodeproj/project.pbxproj b/audio/proj.ios/CocosDenshion.xcodeproj/project.pbxproj
similarity index 100%
rename from CocosDenshion/proj.ios/CocosDenshion.xcodeproj/project.pbxproj
rename to audio/proj.ios/CocosDenshion.xcodeproj/project.pbxproj
diff --git a/CocosDenshion/proj.linux/.cproject b/audio/proj.linux/.cproject
similarity index 100%
rename from CocosDenshion/proj.linux/.cproject
rename to audio/proj.linux/.cproject
diff --git a/CocosDenshion/proj.linux/.project b/audio/proj.linux/.project
similarity index 100%
rename from CocosDenshion/proj.linux/.project
rename to audio/proj.linux/.project
diff --git a/CocosDenshion/proj.linux/CocosDenshion.prf b/audio/proj.linux/CocosDenshion.prf
similarity index 100%
rename from CocosDenshion/proj.linux/CocosDenshion.prf
rename to audio/proj.linux/CocosDenshion.prf
diff --git a/CocosDenshion/proj.linux/Makefile b/audio/proj.linux/Makefile
similarity index 100%
rename from CocosDenshion/proj.linux/Makefile
rename to audio/proj.linux/Makefile
diff --git a/CocosDenshion/proj.mac/CocosDenshion.xcodeproj/project.pbxproj b/audio/proj.mac/CocosDenshion.xcodeproj/project.pbxproj
similarity index 100%
rename from CocosDenshion/proj.mac/CocosDenshion.xcodeproj/project.pbxproj
rename to audio/proj.mac/CocosDenshion.xcodeproj/project.pbxproj
diff --git a/CocosDenshion/proj.nacl/Makefile b/audio/proj.nacl/Makefile
similarity index 100%
rename from CocosDenshion/proj.nacl/Makefile
rename to audio/proj.nacl/Makefile
diff --git a/CocosDenshion/proj.qt5/cocosdenshion.pro b/audio/proj.qt5/cocosdenshion.pro
similarity index 100%
rename from CocosDenshion/proj.qt5/cocosdenshion.pro
rename to audio/proj.qt5/cocosdenshion.pro
diff --git a/CocosDenshion/proj.tizen/.cproject b/audio/proj.tizen/.cproject
similarity index 100%
rename from CocosDenshion/proj.tizen/.cproject
rename to audio/proj.tizen/.cproject
diff --git a/CocosDenshion/proj.tizen/.project b/audio/proj.tizen/.project
similarity index 100%
rename from CocosDenshion/proj.tizen/.project
rename to audio/proj.tizen/.project
diff --git a/CocosDenshion/proj.tizen/src/placeholder.txt b/audio/proj.tizen/src/placeholder.txt
similarity index 100%
rename from CocosDenshion/proj.tizen/src/placeholder.txt
rename to audio/proj.tizen/src/placeholder.txt
diff --git a/CocosDenshion/proj.win32/CocosDenshion.vcxproj b/audio/proj.win32/CocosDenshion.vcxproj
similarity index 100%
rename from CocosDenshion/proj.win32/CocosDenshion.vcxproj
rename to audio/proj.win32/CocosDenshion.vcxproj
diff --git a/CocosDenshion/proj.win32/CocosDenshion.vcxproj.filters b/audio/proj.win32/CocosDenshion.vcxproj.filters
similarity index 100%
rename from CocosDenshion/proj.win32/CocosDenshion.vcxproj.filters
rename to audio/proj.win32/CocosDenshion.vcxproj.filters
diff --git a/CocosDenshion/proj.win32/CocosDenshion.vcxproj.user b/audio/proj.win32/CocosDenshion.vcxproj.user
similarity index 100%
rename from CocosDenshion/proj.win32/CocosDenshion.vcxproj.user
rename to audio/proj.win32/CocosDenshion.vcxproj.user
diff --git a/CocosDenshion/qt5/SimpleAudioEngineQt5.cpp b/audio/qt5/SimpleAudioEngineQt5.cpp
similarity index 100%
rename from CocosDenshion/qt5/SimpleAudioEngineQt5.cpp
rename to audio/qt5/SimpleAudioEngineQt5.cpp
diff --git a/CocosDenshion/third_party/fmod/Makefile b/audio/third_party/fmod/Makefile
similarity index 100%
rename from CocosDenshion/third_party/fmod/Makefile
rename to audio/third_party/fmod/Makefile
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod.h.REMOVED.git-id b/audio/third_party/fmod/api/inc/fmod.h.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod.h.REMOVED.git-id
rename to audio/third_party/fmod/api/inc/fmod.h.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod.hpp b/audio/third_party/fmod/api/inc/fmod.hpp
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod.hpp
rename to audio/third_party/fmod/api/inc/fmod.hpp
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod_codec.h b/audio/third_party/fmod/api/inc/fmod_codec.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod_codec.h
rename to audio/third_party/fmod/api/inc/fmod_codec.h
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod_dsp.h b/audio/third_party/fmod/api/inc/fmod_dsp.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod_dsp.h
rename to audio/third_party/fmod/api/inc/fmod_dsp.h
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod_errors.h b/audio/third_party/fmod/api/inc/fmod_errors.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod_errors.h
rename to audio/third_party/fmod/api/inc/fmod_errors.h
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod_memoryinfo.h b/audio/third_party/fmod/api/inc/fmod_memoryinfo.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod_memoryinfo.h
rename to audio/third_party/fmod/api/inc/fmod_memoryinfo.h
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmod_output.h b/audio/third_party/fmod/api/inc/fmod_output.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmod_output.h
rename to audio/third_party/fmod/api/inc/fmod_output.h
diff --git a/CocosDenshion/third_party/fmod/api/inc/fmodlinux.h b/audio/third_party/fmod/api/inc/fmodlinux.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/inc/fmodlinux.h
rename to audio/third_party/fmod/api/inc/fmodlinux.h
diff --git a/CocosDenshion/third_party/fmod/api/lib/libfmodex-4.36.01.so.REMOVED.git-id b/audio/third_party/fmod/api/lib/libfmodex-4.36.01.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/lib/libfmodex-4.36.01.so.REMOVED.git-id
rename to audio/third_party/fmod/api/lib/libfmodex-4.36.01.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/api/lib/libfmodex.so.REMOVED.git-id b/audio/third_party/fmod/api/lib/libfmodex.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/lib/libfmodex.so.REMOVED.git-id
rename to audio/third_party/fmod/api/lib/libfmodex.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/api/lib/libfmodexL-4.36.01.so.REMOVED.git-id b/audio/third_party/fmod/api/lib/libfmodexL-4.36.01.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/lib/libfmodexL-4.36.01.so.REMOVED.git-id
rename to audio/third_party/fmod/api/lib/libfmodexL-4.36.01.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/api/lib/libfmodexL.so.REMOVED.git-id b/audio/third_party/fmod/api/lib/libfmodexL.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/api/lib/libfmodexL.so.REMOVED.git-id
rename to audio/third_party/fmod/api/lib/libfmodexL.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/lib64/Makefile b/audio/third_party/fmod/lib64/Makefile
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/Makefile
rename to audio/third_party/fmod/lib64/Makefile
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod.h.REMOVED.git-id b/audio/third_party/fmod/lib64/api/inc/fmod.h.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod.h.REMOVED.git-id
rename to audio/third_party/fmod/lib64/api/inc/fmod.h.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod.hpp b/audio/third_party/fmod/lib64/api/inc/fmod.hpp
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod.hpp
rename to audio/third_party/fmod/lib64/api/inc/fmod.hpp
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod_codec.h b/audio/third_party/fmod/lib64/api/inc/fmod_codec.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod_codec.h
rename to audio/third_party/fmod/lib64/api/inc/fmod_codec.h
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod_dsp.h b/audio/third_party/fmod/lib64/api/inc/fmod_dsp.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod_dsp.h
rename to audio/third_party/fmod/lib64/api/inc/fmod_dsp.h
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod_errors.h b/audio/third_party/fmod/lib64/api/inc/fmod_errors.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod_errors.h
rename to audio/third_party/fmod/lib64/api/inc/fmod_errors.h
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod_memoryinfo.h b/audio/third_party/fmod/lib64/api/inc/fmod_memoryinfo.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod_memoryinfo.h
rename to audio/third_party/fmod/lib64/api/inc/fmod_memoryinfo.h
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmod_output.h b/audio/third_party/fmod/lib64/api/inc/fmod_output.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmod_output.h
rename to audio/third_party/fmod/lib64/api/inc/fmod_output.h
diff --git a/CocosDenshion/third_party/fmod/lib64/api/inc/fmodlinux.h b/audio/third_party/fmod/lib64/api/inc/fmodlinux.h
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/inc/fmodlinux.h
rename to audio/third_party/fmod/lib64/api/inc/fmodlinux.h
diff --git a/CocosDenshion/third_party/fmod/lib64/api/lib/libfmodex64-4.38.00.so.REMOVED.git-id b/audio/third_party/fmod/lib64/api/lib/libfmodex64-4.38.00.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/lib/libfmodex64-4.38.00.so.REMOVED.git-id
rename to audio/third_party/fmod/lib64/api/lib/libfmodex64-4.38.00.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/lib64/api/lib/libfmodex64.so.REMOVED.git-id b/audio/third_party/fmod/lib64/api/lib/libfmodex64.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/lib/libfmodex64.so.REMOVED.git-id
rename to audio/third_party/fmod/lib64/api/lib/libfmodex64.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/lib64/api/lib/libfmodexL64-4.38.00.so.REMOVED.git-id b/audio/third_party/fmod/lib64/api/lib/libfmodexL64-4.38.00.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/lib/libfmodexL64-4.38.00.so.REMOVED.git-id
rename to audio/third_party/fmod/lib64/api/lib/libfmodexL64-4.38.00.so.REMOVED.git-id
diff --git a/CocosDenshion/third_party/fmod/lib64/api/lib/libfmodexL64.so.REMOVED.git-id b/audio/third_party/fmod/lib64/api/lib/libfmodexL64.so.REMOVED.git-id
similarity index 100%
rename from CocosDenshion/third_party/fmod/lib64/api/lib/libfmodexL64.so.REMOVED.git-id
rename to audio/third_party/fmod/lib64/api/lib/libfmodexL64.so.REMOVED.git-id
diff --git a/CocosDenshion/win32/MciPlayer.cpp b/audio/win32/MciPlayer.cpp
similarity index 100%
rename from CocosDenshion/win32/MciPlayer.cpp
rename to audio/win32/MciPlayer.cpp
diff --git a/CocosDenshion/win32/MciPlayer.h b/audio/win32/MciPlayer.h
similarity index 100%
rename from CocosDenshion/win32/MciPlayer.h
rename to audio/win32/MciPlayer.h
diff --git a/CocosDenshion/win32/SimpleAudioEngine.cpp b/audio/win32/SimpleAudioEngine.cpp
similarity index 100%
rename from CocosDenshion/win32/SimpleAudioEngine.cpp
rename to audio/win32/SimpleAudioEngine.cpp
diff --git a/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
index c1720e39d7..ef385cb2a2 100644
--- a/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-8ad5afb135018cfa93b3aee4dddbea24f0ef9b9e
\ No newline at end of file
+b8bac548f5a84cbc6b7bd9c99617868737bb103f
\ No newline at end of file
diff --git a/cocos2dx/proj.linux/cocos2dx.mk b/cocos2dx/proj.linux/cocos2dx.mk
index 29c1f8f3fd..0058e43bac 100644
--- a/cocos2dx/proj.linux/cocos2dx.mk
+++ b/cocos2dx/proj.linux/cocos2dx.mk
@@ -112,10 +112,10 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \
 
 ifneq ($(OPENAL),1)
 ifeq ($(LBITS),64)
-FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/lib64/api/lib
+FMOD_LIBDIR = $(COCOS_ROOT)/audio/third_party/fmod/lib64/api/lib
 SHAREDLIBS += -lfmodex64
 else
-FMOD_LIBDIR = $(COCOS_ROOT)/CocosDenshion/third_party/fmod/api/lib
+FMOD_LIBDIR = $(COCOS_ROOT)/audio/third_party/fmod/api/lib
 SHAREDLIBS += -lfmodex
 endif
 endif
diff --git a/extensions/Android.mk b/extensions/Android.mk
index 4289775bc8..8c0b1e2591 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -161,7 +161,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
 $(call import-module,external/Box2D)
 $(call import-module,external/chipmunk)
diff --git a/extensions/proj.linux/Makefile b/extensions/proj.linux/Makefile
index a932d20016..6565ee9b94 100644
--- a/extensions/proj.linux/Makefile
+++ b/extensions/proj.linux/Makefile
@@ -4,7 +4,7 @@ COCOS_ROOT=../..
 
 INCLUDES = -I$(COCOS_ROOT)/external \
 	-I$(COCOS_ROOT)/external/chipmunk/include/chipmunk \
-	-I$(COCOS_ROOT)/CocosDenshion/include \
+	-I$(COCOS_ROOT)/audio/include \
 	-I.. \
 	-I../CCBReader \
 	-I../GUI/CCControlExtension \
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk
index a85ad02ade..42c47b9f80 100644
--- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk
+++ b/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/Android.mk b/samples/Cpp/HelloCpp/proj.android/jni/Android.mk
index 13989f3cf1..6ffd7d62ef 100644
--- a/samples/Cpp/HelloCpp/proj.android/jni/Android.mk
+++ b/samples/Cpp/HelloCpp/proj.android/jni/Android.mk
@@ -17,5 +17,5 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdens
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Android.mk b/samples/Cpp/SimpleGame/proj.android/jni/Android.mk
index e3f5b5c1ef..d0fd9a4eb2 100644
--- a/samples/Cpp/SimpleGame/proj.android/jni/Android.mk
+++ b/samples/Cpp/SimpleGame/proj.android/jni/Android.mk
@@ -17,7 +17,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocos2dxandroid_static cocosdens
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,cocos2dx)
 $(call import-module,extensions)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Cpp/SimpleGame/proj.linux/Makefile b/samples/Cpp/SimpleGame/proj.linux/Makefile
index ecfd0d4986..61485ebb7f 100644
--- a/samples/Cpp/SimpleGame/proj.linux/Makefile
+++ b/samples/Cpp/SimpleGame/proj.linux/Makefile
@@ -12,7 +12,7 @@ include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk
 
 SHAREDLIBS += -lcocos2d -lcocosdenshion
 COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libcocosdenshion.so
-INCLUDES += -I$(COCOS_ROOT)/CocosDenshion/include
+INCLUDES += -I$(COCOS_ROOT)/audio/include
 
 $(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST)
 	@mkdir -p $(@D)
diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk
index 87d662be3a..ff687de48a 100644
--- a/samples/Cpp/TestCpp/Android.mk
+++ b/samples/Cpp/TestCpp/Android.mk
@@ -151,7 +151,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
             
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,external/Box2D)
 $(call import-module,external/chipmunk)
 $(call import-module,cocos2dx)
diff --git a/samples/Cpp/TestCpp/proj.android/jni/Android.mk b/samples/Cpp/TestCpp/proj.android/jni/Android.mk
index 98de0c8956..d72618a488 100644
--- a/samples/Cpp/TestCpp/proj.android/jni/Android.mk
+++ b/samples/Cpp/TestCpp/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ include $(BUILD_SHARED_LIBRARY)
 $(call import-module,samples/Cpp/TestCpp)
 $(call import-module,cocos2dx)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,extensions)
 $(call import-module,external/Box2D)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Cpp/TestCpp/proj.linux/Makefile b/samples/Cpp/TestCpp/proj.linux/Makefile
index b066e6606f..4dda11cafe 100644
--- a/samples/Cpp/TestCpp/proj.linux/Makefile
+++ b/samples/Cpp/TestCpp/proj.linux/Makefile
@@ -141,7 +141,7 @@ include ../../../../cocos2dx/proj.linux/cocos2dx.mk
 INCLUDES +=	 -I../ \
 	-I../../ \
 	-I../Classes \
-	-I$(COCOS_ROOT)/CocosDenshion/include \
+	-I$(COCOS_ROOT)/audio/include \
 	-I$(COCOS_ROOT)/extensions/ \
 	-I$(COCOS_ROOT)/external/ \
 	-I$(COCOS_ROOT)/external/chipmunk/include/chipmunk
diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
index 0ab251941c..bc55bdaaf5 100644
--- a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
+++ b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
index 12575cad7a..451b250c37 100644
--- a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
+++ b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
index 1cdcb62cd6..8f89f72ceb 100644
--- a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
+++ b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Android.mk b/samples/Javascript/TestJavascript/proj.android/jni/Android.mk
index 88ce0ac197..5655c291c2 100644
--- a/samples/Javascript/TestJavascript/proj.android/jni/Android.mk
+++ b/samples/Javascript/TestJavascript/proj.android/jni/Android.mk
@@ -23,7 +23,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,extensions)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
index 76b8e7fd1e..fd7d49998d 100644
--- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
+++ b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Lua/HelloLua/proj.android/jni/Android.mk b/samples/Lua/HelloLua/proj.android/jni/Android.mk
index 54e142b5d8..e4aa117413 100644
--- a/samples/Lua/HelloLua/proj.android/jni/Android.mk
+++ b/samples/Lua/HelloLua/proj.android/jni/Android.mk
@@ -20,7 +20,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/lua/proj.android)
 $(call import-module,extensions)
 $(call import-module,cocos2dx/platform/android)
diff --git a/samples/Lua/HelloLua/proj.linux/Makefile b/samples/Lua/HelloLua/proj.linux/Makefile
index f0b63ea010..1ebb038045 100644
--- a/samples/Lua/HelloLua/proj.linux/Makefile
+++ b/samples/Lua/HelloLua/proj.linux/Makefile
@@ -1,7 +1,7 @@
 EXECUTABLE = HelloLua
 
 COCOS_ROOT = ../../../..
-INCLUDES =  -I../ -I../Classes -I$(COCOS_ROOT)/CocosDenshion/include \
+INCLUDES =  -I../ -I../Classes -I$(COCOS_ROOT)/audio/include \
     -I$(COCOS_ROOT)/scripting/lua/lua \
     -I$(COCOS_ROOT)/scripting/lua/tolua \
     -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support \
diff --git a/samples/Lua/TestLua/proj.android/jni/Android.mk b/samples/Lua/TestLua/proj.android/jni/Android.mk
index 189dd81468..6f3a99a518 100644
--- a/samples/Lua/TestLua/proj.android/jni/Android.mk
+++ b/samples/Lua/TestLua/proj.android/jni/Android.mk
@@ -24,7 +24,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/lua/proj.android)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
 $(call import-module,extensions)
diff --git a/samples/Lua/TestLua/proj.linux/Makefile b/samples/Lua/TestLua/proj.linux/Makefile
index cb88cc9a93..a23cc6dda4 100644
--- a/samples/Lua/TestLua/proj.linux/Makefile
+++ b/samples/Lua/TestLua/proj.linux/Makefile
@@ -1,7 +1,7 @@
 EXECUTABLE = TestLua
 
 COCOS_ROOT = ../../../..
-INCLUDES =  -I../ -I../Classes -I$(COCOS_ROOT)/CocosDenshion/include \
+INCLUDES =  -I../ -I../Classes -I$(COCOS_ROOT)/audio/include \
     -I$(COCOS_ROOT)/scripting/lua/lua \
     -I$(COCOS_ROOT)/scripting/lua/tolua \
     -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support
diff --git a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id
index 0be07b5677..131372c79f 100644
--- a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-036581b6dd46245d778816a7258c42ea68c06959
\ No newline at end of file
+0243fae13fc45728b6dfe8d61ab64782e34c145f
\ No newline at end of file
diff --git a/scripting/lua/proj.linux/Makefile b/scripting/lua/proj.linux/Makefile
index 3e49658d56..1aaa6c897e 100644
--- a/scripting/lua/proj.linux/Makefile
+++ b/scripting/lua/proj.linux/Makefile
@@ -1,7 +1,7 @@
 TARGET = liblua.so
 
 INCLUDES += -I.. -I../lua -I../tolua -I../cocos2dx_support -I../../auto-generated/lua-bindings \
-        -I../Classes -I../../../CocosDenshion/include -I../../../extensions -I../../../external/chipmunk/include/chipmunk
+        -I../Classes -I../../../audio/include -I../../../extensions -I../../../external/chipmunk/include/chipmunk
 
 SOURCES = ../lua/lapi.c \
           ../lua/lauxlib.c \
diff --git a/template/multi-platform-cpp/proj.android/jni/Android.mk b/template/multi-platform-cpp/proj.android/jni/Android.mk
index 5430a288ba..97616f1fba 100644
--- a/template/multi-platform-cpp/proj.android/jni/Android.mk
+++ b/template/multi-platform-cpp/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,extensions)
 $(call import-module,external/Box2D)
 $(call import-module,cocos2dx/platform/android)
diff --git a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
index 3cb7edab03..3f7b3750a3 100644
--- a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
+++ b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
@@ -821,7 +821,7 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../../../CocosDenshion/include",
+					"$(SRCROOT)/../../../audio/include",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
 					"\"$(SRCROOT)/../../../extensions\"",
@@ -861,7 +861,7 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../../../CocosDenshion/include",
+					"$(SRCROOT)/../../../audio/include",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
 					"\"$(SRCROOT)/../../../extensions\"",
diff --git a/template/multi-platform-js/proj.android/jni/Android.mk b/template/multi-platform-js/proj.android/jni/Android.mk
index 09cabaea59..3b09a62b57 100644
--- a/template/multi-platform-js/proj.android/jni/Android.mk
+++ b/template/multi-platform-js/proj.android/jni/Android.mk
@@ -22,7 +22,7 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,cocos2dx/platform/android)
diff --git a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
index 9958c7a786..dbc340d66f 100644
--- a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
+++ b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
@@ -923,7 +923,7 @@
 					"\"$(SRCROOT)/../../../cocos2dx\"",
 					"\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",
 					"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios",
-					"\"$(SRCROOT)/../../../CocosDenshion/include\"",
+					"\"$(SRCROOT)/../../../audio/include\"",
 					"$(SRCROOT)/../../../cocos2dx/include",
 					"$(SRCROOT)/../../../cocos2dx/platform/ios",
 					"$(SRCROOT)/../../../external/chipmunk/include/chipmunk",
@@ -965,7 +965,7 @@
 					"\"$(SRCROOT)/../../../cocos2dx\"",
 					"\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",
 					"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios",
-					"\"$(SRCROOT)/../../../CocosDenshion/include\"",
+					"\"$(SRCROOT)/../../../audio/include\"",
 					"$(SRCROOT)/../../../cocos2dx/include",
 					"$(SRCROOT)/../../../cocos2dx/platform/ios",
 					"$(SRCROOT)/../../../external/chipmunk/include/chipmunk",
diff --git a/template/multi-platform-lua/proj.android/jni/Android.mk b/template/multi-platform-lua/proj.android/jni/Android.mk
index 05362699b5..af986970fe 100644
--- a/template/multi-platform-lua/proj.android/jni/Android.mk
+++ b/template/multi-platform-lua/proj.android/jni/Android.mk
@@ -25,7 +25,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
+$(call import-module,audio/android)
 $(call import-module,scripting/lua/proj.android)
 $(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
 $(call import-module,extensions)
diff --git a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
index 8403e89e8a..67d6e16713 100644
--- a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
+++ b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
@@ -992,7 +992,7 @@
 					"\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"",
 					"\"$(SRCROOT)/../../../cocos2dx/platform/ios\"",
 					"\"$(SRCROOT)/../../../cocos2dx/include\"",
-					"\"$(SRCROOT)/../../../CocosDenshion/include\"",
+					"\"$(SRCROOT)/../../../audio/include\"",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
 					"\"$(SRCROOT)/../../../external\"",
@@ -1035,7 +1035,7 @@
 					"\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"",
 					"\"$(SRCROOT)/../../../cocos2dx/platform/ios\"",
 					"\"$(SRCROOT)/../../../cocos2dx/include\"",
-					"\"$(SRCROOT)/../../../CocosDenshion/include\"",
+					"\"$(SRCROOT)/../../../audio/include\"",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"",
 					"\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"",
 					"\"$(SRCROOT)/../../../external\"",
diff --git a/template/multi-platform-lua/proj.linux/Makefile b/template/multi-platform-lua/proj.linux/Makefile
index cbd31994ca..b9cdb5c66c 100644
--- a/template/multi-platform-lua/proj.linux/Makefile
+++ b/template/multi-platform-lua/proj.linux/Makefile
@@ -1,7 +1,7 @@
 EXECUTABLE = HelloLua
 
 COCOS_ROOT = ../../..
-INCLUDES =  -I../ -I../Classes -I$(COCOS_ROOT)/CocosDenshion/include \
+INCLUDES =  -I../ -I../Classes -I$(COCOS_ROOT)/audio/include \
     -I$(COCOS_ROOT)/scripting/lua/lua \
     -I$(COCOS_ROOT)/scripting/lua/tolua \
     -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support
diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini
index 7001e2f1f6..f1075ca4a0 100644
--- a/tools/tojs/cocos2dx.ini
+++ b/tools/tojs/cocos2dx.ini
@@ -22,7 +22,7 @@ cxxgenerator_headers = -I%(cxxgeneratordir)s/targets/spidermonkey/common
 extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s 
 
 # what headers to parse
-headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/CocosDenshion/include/SimpleAudioEngine.h 
+headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/audio/include/SimpleAudioEngine.h 
 
 # what classes to produce code for. You can use regular expressions here. When testing the regular
 # expression, it will be enclosed in "^$", like this: "^Menu*$".
diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini
index 4cff3e48da..cc59df0bdb 100644
--- a/tools/tolua/cocos2dx.ini
+++ b/tools/tolua/cocos2dx.ini
@@ -22,7 +22,7 @@ cxxgenerator_headers = -I%(cxxgeneratordir)s/targets/spidermonkey/common
 extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s 
 
 # what headers to parse
-headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/CocosDenshion/include/SimpleAudioEngine.h 
+headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/audio/include/SimpleAudioEngine.h 
 
 # what classes to produce code for. You can use regular expressions here. When testing the regular
 # expression, it will be enclosed in "^$", like this: "^Menu*$".