diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index 0a86e5ee..b0faf6de 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -16,13 +16,6 @@ set(CC_TINYDIR_SOURCES
   ${CMAKE_CURRENT_LIST_DIR}/tinydir/tinydir.h
 )
 
-set(CC_GAME_ACTIVITY_SOURCES
-  ${CMAKE_CURRENT_LIST_DIR}/gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
-  ${CMAKE_CURRENT_LIST_DIR}/gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
-  ${CMAKE_CURRENT_LIST_DIR}/gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.cpp
-)
-
-
 set(CC_UTILS_SOURCES
   ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
   ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
@@ -56,11 +49,17 @@ include(${CMAKE_CURRENT_LIST_DIR}/boost-source/boost.cmake)
 
 
 if(ANDROID)
-    include(${CMAKE_CURRENT_LIST_DIR}/gamesdk/GameController/CMakeLists.txt)
+    set(CC_GAME_ACTIVITY_SOURCES
+        ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
+        ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.cpp
+    )
+
+    include(${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameController/CMakeLists.txt)
     list(APPEND CC_EXTERNAL_SOURCES
         ${CC_GAME_ACTIVITY_SOURCES}
     )
-    include_directories(${CMAKE_CURRENT_LIST_DIR}/gamesdk/GameActivity/game-activity/include)
+    include_directories(${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include)
 endif()
 
 if(ANDROID OR OHOS)
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp b/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.h b/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.h
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.h
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.h
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c b/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h b/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-text-input/gamecommon.h b/sources/android-gamesdk/GameActivity/game-activity/include/game-text-input/gamecommon.h
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-text-input/gamecommon.h
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-text-input/gamecommon.h
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.cpp b/sources/android-gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.cpp
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.cpp
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.cpp
diff --git a/sources/gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.h b/sources/android-gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.h
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.h
rename to sources/android-gamesdk/GameActivity/game-activity/include/game-text-input/gametextinput.h
diff --git a/sources/gamesdk/GameActivity/game-activity/module.json b/sources/android-gamesdk/GameActivity/game-activity/module.json
similarity index 100%
rename from sources/gamesdk/GameActivity/game-activity/module.json
rename to sources/android-gamesdk/GameActivity/game-activity/module.json
diff --git a/sources/gamesdk/GameController/CMakeLists.txt b/sources/android-gamesdk/GameController/CMakeLists.txt
similarity index 100%
rename from sources/gamesdk/GameController/CMakeLists.txt
rename to sources/android-gamesdk/GameController/CMakeLists.txt
diff --git a/sources/gamesdk/GameController/GameController.cpp b/sources/android-gamesdk/GameController/GameController.cpp
similarity index 100%
rename from sources/gamesdk/GameController/GameController.cpp
rename to sources/android-gamesdk/GameController/GameController.cpp
diff --git a/sources/gamesdk/GameController/GameController.h b/sources/android-gamesdk/GameController/GameController.h
similarity index 100%
rename from sources/gamesdk/GameController/GameController.h
rename to sources/android-gamesdk/GameController/GameController.h
diff --git a/sources/gamesdk/GameController/GameControllerDeviceInfo.cpp b/sources/android-gamesdk/GameController/GameControllerDeviceInfo.cpp
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerDeviceInfo.cpp
rename to sources/android-gamesdk/GameController/GameControllerDeviceInfo.cpp
diff --git a/sources/gamesdk/GameController/GameControllerDeviceInfo.h b/sources/android-gamesdk/GameController/GameControllerDeviceInfo.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerDeviceInfo.h
rename to sources/android-gamesdk/GameController/GameControllerDeviceInfo.h
diff --git a/sources/gamesdk/GameController/GameControllerGameActivityMirror.h b/sources/android-gamesdk/GameController/GameControllerGameActivityMirror.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerGameActivityMirror.h
rename to sources/android-gamesdk/GameController/GameControllerGameActivityMirror.h
diff --git a/sources/gamesdk/GameController/GameControllerInternalConstants.h b/sources/android-gamesdk/GameController/GameControllerInternalConstants.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerInternalConstants.h
rename to sources/android-gamesdk/GameController/GameControllerInternalConstants.h
diff --git a/sources/gamesdk/GameController/GameControllerLog.cpp b/sources/android-gamesdk/GameController/GameControllerLog.cpp
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerLog.cpp
rename to sources/android-gamesdk/GameController/GameControllerLog.cpp
diff --git a/sources/gamesdk/GameController/GameControllerLog.h b/sources/android-gamesdk/GameController/GameControllerLog.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerLog.h
rename to sources/android-gamesdk/GameController/GameControllerLog.h
diff --git a/sources/gamesdk/GameController/GameControllerLogStrings.h b/sources/android-gamesdk/GameController/GameControllerLogStrings.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerLogStrings.h
rename to sources/android-gamesdk/GameController/GameControllerLogStrings.h
diff --git a/sources/gamesdk/GameController/GameControllerManager.cpp b/sources/android-gamesdk/GameController/GameControllerManager.cpp
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerManager.cpp
rename to sources/android-gamesdk/GameController/GameControllerManager.cpp
diff --git a/sources/gamesdk/GameController/GameControllerManager.h b/sources/android-gamesdk/GameController/GameControllerManager.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerManager.h
rename to sources/android-gamesdk/GameController/GameControllerManager.h
diff --git a/sources/gamesdk/GameController/GameControllerMappingUtils.cpp b/sources/android-gamesdk/GameController/GameControllerMappingUtils.cpp
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerMappingUtils.cpp
rename to sources/android-gamesdk/GameController/GameControllerMappingUtils.cpp
diff --git a/sources/gamesdk/GameController/GameControllerMappingUtils.h b/sources/android-gamesdk/GameController/GameControllerMappingUtils.h
similarity index 100%
rename from sources/gamesdk/GameController/GameControllerMappingUtils.h
rename to sources/android-gamesdk/GameController/GameControllerMappingUtils.h
diff --git a/sources/gamesdk/GameController/InternalControllerTable.cpp b/sources/android-gamesdk/GameController/InternalControllerTable.cpp
similarity index 100%
rename from sources/gamesdk/GameController/InternalControllerTable.cpp
rename to sources/android-gamesdk/GameController/InternalControllerTable.cpp
diff --git a/sources/gamesdk/GameController/InternalControllerTable.h b/sources/android-gamesdk/GameController/InternalControllerTable.h
similarity index 100%
rename from sources/gamesdk/GameController/InternalControllerTable.h
rename to sources/android-gamesdk/GameController/InternalControllerTable.h
diff --git a/sources/gamesdk/GameController/Log.h b/sources/android-gamesdk/GameController/Log.h
similarity index 100%
rename from sources/gamesdk/GameController/Log.h
rename to sources/android-gamesdk/GameController/Log.h
diff --git a/sources/gamesdk/GameController/ThreadUtil.h b/sources/android-gamesdk/GameController/ThreadUtil.h
similarity index 100%
rename from sources/gamesdk/GameController/ThreadUtil.h
rename to sources/android-gamesdk/GameController/ThreadUtil.h
diff --git a/sources/gamesdk/GameController/paddleboat/include/paddleboat.h b/sources/android-gamesdk/GameController/paddleboat/include/paddleboat.h
similarity index 100%
rename from sources/gamesdk/GameController/paddleboat/include/paddleboat.h
rename to sources/android-gamesdk/GameController/paddleboat/include/paddleboat.h
diff --git a/sources/gamesdk/GameController/paddleboat_c.cpp b/sources/android-gamesdk/GameController/paddleboat_c.cpp
similarity index 100%
rename from sources/gamesdk/GameController/paddleboat_c.cpp
rename to sources/android-gamesdk/GameController/paddleboat_c.cpp