diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7c0bed..4d6cc49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(TENCENT_NETBAR_SDK ${CMAKE_CURRENT_SOURCE_DIR}/tencent_netbar)
 
+set(ACE_CLIENT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ace_sdk/client)
+set(ACE_SERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ace_sdk/server)
 
 add_subdirectory(bsdiff)
 add_subdirectory(bzip2)
diff --git a/ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-BASE.sys b/ace_sdk/client/dist/AntiCheatExpert/ACE-BASE.sys
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-BASE.sys
rename to ace_sdk/client/dist/AntiCheatExpert/ACE-BASE.sys
diff --git a/ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Base.dat b/ace_sdk/client/dist/AntiCheatExpert/ACE-Base.dat
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Base.dat
rename to ace_sdk/client/dist/AntiCheatExpert/ACE-Base.dat
diff --git a/ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Base64.dll b/ace_sdk/client/dist/AntiCheatExpert/ACE-Base64.dll
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Base64.dll
rename to ace_sdk/client/dist/AntiCheatExpert/ACE-Base64.dll
diff --git a/ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Service64.exe b/ace_sdk/client/dist/AntiCheatExpert/ACE-Service64.exe
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Service64.exe
rename to ace_sdk/client/dist/AntiCheatExpert/ACE-Service64.exe
diff --git a/ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Setup64.exe b/ace_sdk/client/dist/AntiCheatExpert/ACE-Setup64.exe
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/dist/AntiCheatExpert/ACE-Setup64.exe
rename to ace_sdk/client/dist/AntiCheatExpert/ACE-Setup64.exe
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_account.h b/ace_sdk/client/include/ace_sdk_account.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_account.h
rename to ace_sdk/client/include/ace_sdk_account.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_client.h b/ace_sdk/client/include/ace_sdk_client.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_client.h
rename to ace_sdk/client/include/ace_sdk_client.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_client_anti_cheat_core.h b/ace_sdk/client/include/ace_sdk_client_anti_cheat_core.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_client_anti_cheat_core.h
rename to ace_sdk/client/include/ace_sdk_client_anti_cheat_core.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_client_impl.h b/ace_sdk/client/include/ace_sdk_client_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_client_impl.h
rename to ace_sdk/client/include/ace_sdk_client_impl.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_client_light_feature.h b/ace_sdk/client/include/ace_sdk_client_light_feature.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_client_light_feature.h
rename to ace_sdk/client/include/ace_sdk_client_light_feature.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_common.h b/ace_sdk/client/include/ace_sdk_common.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_common.h
rename to ace_sdk/client/include/ace_sdk_common.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_protocol_binding.h b/ace_sdk/client/include/ace_sdk_protocol_binding.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_protocol_binding.h
rename to ace_sdk/client/include/ace_sdk_protocol_binding.h
diff --git a/ace_test/aCommon/ace_sdk/client/include/ace_sdk_protocol_binding_impl.h b/ace_sdk/client/include/ace_sdk_protocol_binding_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/client/include/ace_sdk_protocol_binding_impl.h
rename to ace_sdk/client/include/ace_sdk_protocol_binding_impl.h
diff --git a/ace_test/aCommon/ace_sdk/server/bin/linux_x86_64-bit/libace_sdk.so b/ace_sdk/server/bin/linux_x86_64-bit/libace_sdk.so
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/bin/linux_x86_64-bit/libace_sdk.so
rename to ace_sdk/server/bin/linux_x86_64-bit/libace_sdk.so
diff --git a/ace_test/aCommon/ace_sdk/server/bin/windows_x86_32-bit/ace_sdk.dll b/ace_sdk/server/bin/windows_x86_32-bit/ace_sdk.dll
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/bin/windows_x86_32-bit/ace_sdk.dll
rename to ace_sdk/server/bin/windows_x86_32-bit/ace_sdk.dll
diff --git a/ace_test/aCommon/ace_sdk/server/bin/windows_x86_64-bit/ace_sdk.dll b/ace_sdk/server/bin/windows_x86_64-bit/ace_sdk.dll
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/bin/windows_x86_64-bit/ace_sdk.dll
rename to ace_sdk/server/bin/windows_x86_64-bit/ace_sdk.dll
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_account.h b/ace_sdk/server/include/ace_sdk_account.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_account.h
rename to ace_sdk/server/include/ace_sdk_account.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_common.h b/ace_sdk/server/include/ace_sdk_common.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_common.h
rename to ace_sdk/server/include/ace_sdk_common.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server.h b/ace_sdk/server/include/ace_sdk_server.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server.h
rename to ace_sdk/server/include/ace_sdk_server.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_anti_cheat_core.h b/ace_sdk/server/include/ace_sdk_server_anti_cheat_core.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_anti_cheat_core.h
rename to ace_sdk/server/include/ace_sdk_server_anti_cheat_core.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_anti_cheat_core_impl.h b/ace_sdk/server/include/ace_sdk_server_anti_cheat_core_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_anti_cheat_core_impl.h
rename to ace_sdk/server/include/ace_sdk_server_anti_cheat_core_impl.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_impl.h b/ace_sdk/server/include/ace_sdk_server_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_impl.h
rename to ace_sdk/server/include/ace_sdk_server_impl.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_light_feature.h b/ace_sdk/server/include/ace_sdk_server_light_feature.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_light_feature.h
rename to ace_sdk/server/include/ace_sdk_server_light_feature.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_light_feature_impl.h b/ace_sdk/server/include/ace_sdk_server_light_feature_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_light_feature_impl.h
rename to ace_sdk/server/include/ace_sdk_server_light_feature_impl.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_text_check.h b/ace_sdk/server/include/ace_sdk_server_text_check.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_text_check.h
rename to ace_sdk/server/include/ace_sdk_server_text_check.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_text_check_impl.h b/ace_sdk/server/include/ace_sdk_server_text_check_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_text_check_impl.h
rename to ace_sdk/server/include/ace_sdk_server_text_check_impl.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_ticket.h b/ace_sdk/server/include/ace_sdk_server_ticket.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_ticket.h
rename to ace_sdk/server/include/ace_sdk_server_ticket.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_ticket_impl.h b/ace_sdk/server/include/ace_sdk_server_ticket_impl.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_ticket_impl.h
rename to ace_sdk/server/include/ace_sdk_server_ticket_impl.h
diff --git a/ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_uic.h b/ace_sdk/server/include/ace_sdk_server_uic.h
similarity index 100%
rename from ace_test/aCommon/ace_sdk/server/include/ace_sdk_server_uic.h
rename to ace_sdk/server/include/ace_sdk_server_uic.h
diff --git a/ace_test/CMakeLists.txt b/ace_test/CMakeLists.txt
index 35a2e40..177761d 100644
--- a/ace_test/CMakeLists.txt
+++ b/ace_test/CMakeLists.txt
@@ -14,8 +14,6 @@ set(CURL_DIR $ENV{LIBRARIES_SDK_ROOT}/libcurl/lib/cmake/CURL)
 find_package(CURL CONFIG REQUIRED)
 
 set(GAME_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/aCommon/proto)
-set(ACE_CLIENT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/aCommon/ace_sdk/client)
-set(ACE_SERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/aCommon/ace_sdk/server)
 
 set(Protobuf_DIR $ENV{LIBRARIES_SDK_ROOT}/protobuf/cmake)
 find_package(Protobuf CONFIG REQUIRED)