diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn
index f21e787451..e02a75650f 100644
--- a/frameworks/native/ability/native/BUILD.gn
+++ b/frameworks/native/ability/native/BUILD.gn
@@ -142,7 +142,10 @@ ohos_shared_library("abilitykit_utils") {
     "${ability_runtime_native_path}/ability/native/configuration_utils.cpp",
   ]
 
-  deps = [ ":configuration_helper" ]
+  deps = [
+    ":configuration_helper",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
+  ]
 
   configs = [ ":abilitykit_utils_exceptions" ]
 
diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn
index 04c3e610f4..f2c2a247b5 100644
--- a/interfaces/inner_api/ability_manager/BUILD.gn
+++ b/interfaces/inner_api/ability_manager/BUILD.gn
@@ -25,7 +25,9 @@ config("ability_manager_public_config") {
   ]
   include_dirs = [
     "include/",
+    "include/insight_intent",
     "include/status_bar_delegate",
+    "include/ui_extension",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
@@ -81,10 +83,10 @@ ohos_shared_library("ability_manager") {
     "${ability_runtime_services_path}/abilitymgr/src/dialog_session/dialog_session_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/exit_reason.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/extension_running_info.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_callback_proxy.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_callback_stub.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_param.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_callback_proxy.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_callback_stub.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_param.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_result.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/keep_alive/keep_alive_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/launch_param.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/lifecycle_state_info.cpp",
@@ -96,9 +98,9 @@ ohos_shared_library("ability_manager") {
     "${ability_runtime_services_path}/abilitymgr/src/remote_on_listener_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/remote_on_listener_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/system_ability_token_callback_stub.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_ability_connect_info.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_host_info.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_session_info.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/ui_extension_ability_connect_info.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/ui_extension_host_info.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/ui_extension_session_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/user_callback_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/user_callback_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/window_config.cpp",
diff --git a/interfaces/inner_api/ability_manager/include/ability_manager_interface.h b/interfaces/inner_api/ability_manager/include/ability_manager_interface.h
index 7eae3f8171..0856359888 100644
--- a/interfaces/inner_api/ability_manager/include/ability_manager_interface.h
+++ b/interfaces/inner_api/ability_manager/include/ability_manager_interface.h
@@ -37,8 +37,8 @@
 #include "iability_controller.h"
 #include "iability_manager_collaborator.h"
 #include "iacquire_share_data_callback_interface.h"
-#include "insight_intent_execute_param.h"
-#include "insight_intent_execute_result.h"
+#include "insight_intent/insight_intent_execute_param.h"
+#include "insight_intent/insight_intent_execute_result.h"
 #include "iprepare_terminate_callback_interface.h"
 #include "keep_alive_info.h"
 #include "mission_info.h"
@@ -52,9 +52,9 @@
 #include "start_options.h"
 #include "user_callback.h"
 #include "system_memory_attr.h"
-#include "ui_extension_ability_connect_info.h"
-#include "ui_extension_host_info.h"
-#include "ui_extension_session_info.h"
+#include "ui_extension/ui_extension_ability_connect_info.h"
+#include "ui_extension/ui_extension_host_info.h"
+#include "ui_extension/ui_extension_session_info.h"
 #include "ui_extension_window_command.h"
 #include "uri.h"
 #include "want.h"
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_constant.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_constant.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_constant.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_constant.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_execute_callback_interface.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_callback_interface.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_execute_callback_interface.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_callback_interface.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_execute_callback_proxy.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_callback_proxy.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_execute_callback_proxy.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_callback_proxy.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_execute_callback_stub.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_callback_stub.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_execute_callback_stub.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_callback_stub.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_execute_param.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_param.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_execute_param.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_param.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_execute_result.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_result.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_execute_result.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_execute_result.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_utils.h b/interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_utils.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_utils.h
rename to interfaces/inner_api/ability_manager/include/insight_intent/insight_intent_utils.h
diff --git a/interfaces/inner_api/ability_manager/include/ui_extension_ability_connect_info.h b/interfaces/inner_api/ability_manager/include/ui_extension/ui_extension_ability_connect_info.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/ui_extension_ability_connect_info.h
rename to interfaces/inner_api/ability_manager/include/ui_extension/ui_extension_ability_connect_info.h
diff --git a/interfaces/inner_api/ability_manager/include/ui_extension_host_info.h b/interfaces/inner_api/ability_manager/include/ui_extension/ui_extension_host_info.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/ui_extension_host_info.h
rename to interfaces/inner_api/ability_manager/include/ui_extension/ui_extension_host_info.h
diff --git a/interfaces/inner_api/ability_manager/include/ui_extension_session_info.h b/interfaces/inner_api/ability_manager/include/ui_extension/ui_extension_session_info.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/ui_extension_session_info.h
rename to interfaces/inner_api/ability_manager/include/ui_extension/ui_extension_session_info.h
diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn
index 233470af9f..a9f3008821 100644
--- a/interfaces/inner_api/wantagent/BUILD.gn
+++ b/interfaces/inner_api/wantagent/BUILD.gn
@@ -32,6 +32,8 @@ config("wantagent_innerkits_public_config") {
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_innerkits_path}/ability_manager/include/insight_intent",
+    "${ability_runtime_innerkits_path}/ability_manager/include/ui_extension",
     "${ability_runtime_innerkits_path}/wantagent/include",
     "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn
index 483f86f436..e99b7ddf91 100644
--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@@ -33,11 +33,15 @@ config("abilityms_config") {
     "include/",
     "include/data_ability",
     "include/dialog_session/",
+    "include/extension_record",
+    "include/insight_intent",
     "include/mission/",
     "include/rdb/",
     "include/resident_process/",
     "include/keep_alive/",
     "include/screen_lock/",
+    "include/ui_extension",
+    "include/ui_extension_record",
     "include/utils/",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/appdfr/include",
diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni
index 6e59ee6148..7e7214fb8c 100644
--- a/services/abilitymgr/abilitymgr.gni
+++ b/services/abilitymgr/abilitymgr.gni
@@ -14,7 +14,6 @@
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 abilityms_files = [
-  "src/preload_uiext_state_observer.cpp",
   "src/ability_background_connection.cpp",
   "src/ability_cache_manager.cpp",
   "src/ability_connect_manager.cpp",
@@ -44,6 +43,9 @@ abilityms_files = [
   "src/ecological_rule/ability_ecological_rule_mgr_service.cpp",
   "src/extension_config.cpp",
   "src/extension_running_info.cpp",
+  "src/extension_record/extension_record_manager.cpp",
+  "src/extension_record/extension_record.cpp",
+  "src/extension_record/extension_record_factory.cpp",
   "src/caller_info.cpp",
   "src/sub_managers_helper.cpp",
   "src/pending_want_record.cpp",
@@ -52,7 +54,6 @@ abilityms_files = [
   "src/pending_want_common_event.cpp",
   "src/restart_app_manager.cpp",
   "src/ams_configuration_parameter.cpp",
-  "src/insight_intent_profile.cpp",
   "src/recovery_info_timer.cpp",
   "src/modal_system_dialog/modal_system_dialog_ui_extension.cpp",
   "src/interceptor/ability_interceptor_executer.cpp",
@@ -73,11 +74,9 @@ abilityms_files = [
   "src/start_ability_handler/start_ability_sandbox_savefile.cpp",
 
   # new ability manager service here
-  "src/extension_record_manager.cpp",
-  "src/extension_record.cpp",
-  "src/extension_record_factory.cpp",
-  "src/ui_extension_record.cpp",
-  "src/ui_extension_record_factory.cpp",
+  "src/ui_extension/preload_uiext_state_observer.cpp",
+  "src/ui_extension_record/ui_extension_record.cpp",
+  "src/ui_extension_record/ui_extension_record_factory.cpp",
   "src/screen_lock/unlock_screen_manager.cpp",
   "src/start_options.cpp",
   "src/user_callback_proxy.cpp",
@@ -123,8 +122,10 @@ abilityms_files = [
   "src/ability_auto_startup_data_manager.cpp",
   "src/ability_auto_startup_service.cpp",
   "src/auto_startup_info.cpp",
-  "src/insight_intent_execute_manager.cpp",
-  "src/insight_intent_execute_result.cpp",
+  "src/insight_intent/insight_intent_execute_manager.cpp",
+  "src/insight_intent/insight_intent_execute_result.cpp",
+  "src/insight_intent/insight_intent_profile.cpp",
+  "src/insight_intent/insight_intent_utils.cpp",
 
   # keep alive
   "src/keep_alive/ability_keep_alive_data_manager.cpp",
@@ -139,7 +140,6 @@ abilityms_files = [
   "src/utils/app_mgr_util.cpp",
   "src/utils/dump_utils.cpp",
   "src/utils/extension_permissions_util.cpp",
-  "src/utils/insight_intent_utils.cpp",
   "src/utils/keep_alive_utils.cpp",
   "src/utils/main_element_utils.cpp",
   "src/utils/modal_system_dialog_util.cpp",
diff --git a/services/abilitymgr/include/ability_connect_manager.h b/services/abilitymgr/include/ability_connect_manager.h
index af5db74d20..35de27b4ca 100644
--- a/services/abilitymgr/include/ability_connect_manager.h
+++ b/services/abilitymgr/include/ability_connect_manager.h
@@ -33,7 +33,7 @@
 #include "extension_running_info.h"
 #include "connection_record.h"
 #include "element_name.h"
-#include "ui_extension_ability_connect_info.h"
+#include "ui_extension/ui_extension_ability_connect_info.h"
 #include "extension_record_manager.h"
 #include "want.h"
 #include "iremote_object.h"
diff --git a/services/abilitymgr/include/extension_record.h b/services/abilitymgr/include/extension_record/extension_record.h
similarity index 100%
rename from services/abilitymgr/include/extension_record.h
rename to services/abilitymgr/include/extension_record/extension_record.h
diff --git a/services/abilitymgr/include/extension_record_factory.h b/services/abilitymgr/include/extension_record/extension_record_factory.h
similarity index 100%
rename from services/abilitymgr/include/extension_record_factory.h
rename to services/abilitymgr/include/extension_record/extension_record_factory.h
diff --git a/services/abilitymgr/include/extension_record_manager.h b/services/abilitymgr/include/extension_record/extension_record_manager.h
similarity index 98%
rename from services/abilitymgr/include/extension_record_manager.h
rename to services/abilitymgr/include/extension_record/extension_record_manager.h
index bf4e9febeb..68cc9b95dd 100644
--- a/services/abilitymgr/include/extension_record_manager.h
+++ b/services/abilitymgr/include/extension_record/extension_record_manager.h
@@ -24,8 +24,8 @@
 
 #include "ability_record.h"
 #include "extension_record.h"
-#include "ui_extension_host_info.h"
-#include "ui_extension_session_info.h"
+#include "ui_extension/ui_extension_host_info.h"
+#include "ui_extension/ui_extension_session_info.h"
 
 namespace OHOS {
 namespace AbilityRuntime {
diff --git a/services/abilitymgr/include/insight_intent_execute_manager.h b/services/abilitymgr/include/insight_intent/insight_intent_execute_manager.h
similarity index 100%
rename from services/abilitymgr/include/insight_intent_execute_manager.h
rename to services/abilitymgr/include/insight_intent/insight_intent_execute_manager.h
diff --git a/interfaces/inner_api/ability_manager/include/insight_intent_profile.h b/services/abilitymgr/include/insight_intent/insight_intent_profile.h
similarity index 100%
rename from interfaces/inner_api/ability_manager/include/insight_intent_profile.h
rename to services/abilitymgr/include/insight_intent/insight_intent_profile.h
diff --git a/services/abilitymgr/include/preload_uiext_state_observer.h b/services/abilitymgr/include/ui_extension/preload_uiext_state_observer.h
similarity index 100%
rename from services/abilitymgr/include/preload_uiext_state_observer.h
rename to services/abilitymgr/include/ui_extension/preload_uiext_state_observer.h
diff --git a/services/abilitymgr/include/ui_extension_record.h b/services/abilitymgr/include/ui_extension_record/ui_extension_record.h
similarity index 100%
rename from services/abilitymgr/include/ui_extension_record.h
rename to services/abilitymgr/include/ui_extension_record/ui_extension_record.h
diff --git a/services/abilitymgr/include/ui_extension_record_factory.h b/services/abilitymgr/include/ui_extension_record/ui_extension_record_factory.h
similarity index 100%
rename from services/abilitymgr/include/ui_extension_record_factory.h
rename to services/abilitymgr/include/ui_extension_record/ui_extension_record_factory.h
diff --git a/services/abilitymgr/src/extension_record.cpp b/services/abilitymgr/src/extension_record/extension_record.cpp
similarity index 100%
rename from services/abilitymgr/src/extension_record.cpp
rename to services/abilitymgr/src/extension_record/extension_record.cpp
diff --git a/services/abilitymgr/src/extension_record_factory.cpp b/services/abilitymgr/src/extension_record/extension_record_factory.cpp
similarity index 100%
rename from services/abilitymgr/src/extension_record_factory.cpp
rename to services/abilitymgr/src/extension_record/extension_record_factory.cpp
diff --git a/services/abilitymgr/src/extension_record_manager.cpp b/services/abilitymgr/src/extension_record/extension_record_manager.cpp
similarity index 100%
rename from services/abilitymgr/src/extension_record_manager.cpp
rename to services/abilitymgr/src/extension_record/extension_record_manager.cpp
diff --git a/services/abilitymgr/src/insight_intent_execute_callback_proxy.cpp b/services/abilitymgr/src/insight_intent/insight_intent_execute_callback_proxy.cpp
similarity index 100%
rename from services/abilitymgr/src/insight_intent_execute_callback_proxy.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_execute_callback_proxy.cpp
diff --git a/services/abilitymgr/src/insight_intent_execute_callback_stub.cpp b/services/abilitymgr/src/insight_intent/insight_intent_execute_callback_stub.cpp
similarity index 100%
rename from services/abilitymgr/src/insight_intent_execute_callback_stub.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_execute_callback_stub.cpp
diff --git a/services/abilitymgr/src/insight_intent_execute_manager.cpp b/services/abilitymgr/src/insight_intent/insight_intent_execute_manager.cpp
similarity index 100%
rename from services/abilitymgr/src/insight_intent_execute_manager.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_execute_manager.cpp
diff --git a/services/abilitymgr/src/insight_intent_execute_param.cpp b/services/abilitymgr/src/insight_intent/insight_intent_execute_param.cpp
similarity index 100%
rename from services/abilitymgr/src/insight_intent_execute_param.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_execute_param.cpp
diff --git a/services/abilitymgr/src/insight_intent_execute_result.cpp b/services/abilitymgr/src/insight_intent/insight_intent_execute_result.cpp
similarity index 100%
rename from services/abilitymgr/src/insight_intent_execute_result.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_execute_result.cpp
diff --git a/services/abilitymgr/src/insight_intent_profile.cpp b/services/abilitymgr/src/insight_intent/insight_intent_profile.cpp
similarity index 100%
rename from services/abilitymgr/src/insight_intent_profile.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_profile.cpp
diff --git a/services/abilitymgr/src/utils/insight_intent_utils.cpp b/services/abilitymgr/src/insight_intent/insight_intent_utils.cpp
similarity index 100%
rename from services/abilitymgr/src/utils/insight_intent_utils.cpp
rename to services/abilitymgr/src/insight_intent/insight_intent_utils.cpp
diff --git a/services/abilitymgr/src/preload_uiext_state_observer.cpp b/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp
similarity index 100%
rename from services/abilitymgr/src/preload_uiext_state_observer.cpp
rename to services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp
diff --git a/services/abilitymgr/src/ui_extension_ability_connect_info.cpp b/services/abilitymgr/src/ui_extension/ui_extension_ability_connect_info.cpp
similarity index 100%
rename from services/abilitymgr/src/ui_extension_ability_connect_info.cpp
rename to services/abilitymgr/src/ui_extension/ui_extension_ability_connect_info.cpp
diff --git a/services/abilitymgr/src/ui_extension_host_info.cpp b/services/abilitymgr/src/ui_extension/ui_extension_host_info.cpp
similarity index 97%
rename from services/abilitymgr/src/ui_extension_host_info.cpp
rename to services/abilitymgr/src/ui_extension/ui_extension_host_info.cpp
index 25b8db3d90..cf6e012524 100755
--- a/services/abilitymgr/src/ui_extension_host_info.cpp
+++ b/services/abilitymgr/src/ui_extension/ui_extension_host_info.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "ui_extension_host_info.h"
+#include "ui_extension/ui_extension_host_info.h"
 #include "hilog_tag_wrapper.h"
 
 namespace OHOS {
diff --git a/services/abilitymgr/src/ui_extension_session_info.cpp b/services/abilitymgr/src/ui_extension/ui_extension_session_info.cpp
similarity index 97%
rename from services/abilitymgr/src/ui_extension_session_info.cpp
rename to services/abilitymgr/src/ui_extension/ui_extension_session_info.cpp
index 18849a82ba..eec75c9cc2 100755
--- a/services/abilitymgr/src/ui_extension_session_info.cpp
+++ b/services/abilitymgr/src/ui_extension/ui_extension_session_info.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "ui_extension_session_info.h"
+#include "ui_extension/ui_extension_session_info.h"
 
 #include "hilog_tag_wrapper.h"
 
diff --git a/services/abilitymgr/src/ui_extension_record.cpp b/services/abilitymgr/src/ui_extension_record/ui_extension_record.cpp
similarity index 100%
rename from services/abilitymgr/src/ui_extension_record.cpp
rename to services/abilitymgr/src/ui_extension_record/ui_extension_record.cpp
diff --git a/services/abilitymgr/src/ui_extension_record_factory.cpp b/services/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp
similarity index 100%
rename from services/abilitymgr/src/ui_extension_record_factory.cpp
rename to services/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp
diff --git a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn
index ea102e42a9..a2f56cddb9 100644
--- a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn
@@ -40,8 +40,8 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
     "abilitymgrextensionrecord_fuzzer.cpp",
   ]
 
diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn
index 0ded5e3d97..1852cff3a0 100644
--- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn
@@ -39,8 +39,8 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_profile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilitymgrinsightintentexecutemanager_fuzzer.cpp",
   ]
diff --git a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn
index b5f6aa35e7..b8f3ce959d 100644
--- a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn
@@ -39,8 +39,8 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_result.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_profile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilitymgrinsightintentexecuteresult_fuzzer.cpp",
   ]
diff --git a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn
index a44635d814..73b893eee0 100644
--- a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn
@@ -39,8 +39,8 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_result.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_profile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilitymgrinsightintentutils_fuzzer.cpp",
   ]
diff --git a/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn
index 0037340799..03dcdaca60 100644
--- a/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn
@@ -42,8 +42,8 @@ ohos_fuzztest("AbilitymgrPreloadUiextStateObserverFuzzTest") {
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/application_state_observer_stub.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/page_state_data.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_data.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
     "${bundlefwk_inner_api_path}/appexecfwk_base/src/application_info.cpp",
     "abilitymgrpreloaduiextstateobserver_fuzzer.cpp",
   ]
diff --git a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn
index 57ff739d79..39de03fbfa 100644
--- a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn
@@ -40,9 +40,9 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record.cpp",
     "abilitymgruiextensionrecord_fuzzer.cpp",
   ]
 
diff --git a/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn
index 1e3a0b71e1..60c3fb7106 100644
--- a/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn
@@ -35,7 +35,7 @@ ohos_fuzztest("AbilitymgrUiExtensionSessionInfoFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_session_info.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/ui_extension_session_info.cpp",
     "abilitymgruiextensionsessioninfo_fuzzer.cpp",
   ]
 
diff --git a/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/abilitymgruiextensionsessioninfo_fuzzer.cpp b/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/abilitymgruiextensionsessioninfo_fuzzer.cpp
index 2fb0f2f45d..756c56e7c9 100644
--- a/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/abilitymgruiextensionsessioninfo_fuzzer.cpp
+++ b/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/abilitymgruiextensionsessioninfo_fuzzer.cpp
@@ -20,7 +20,7 @@
 #include "securec.h"
 #include <iostream>
 #define private public
-#include "ui_extension_session_info.h"
+#include "ui_extension/ui_extension_session_info.h"
 #undef private
 
 using namespace OHOS::AAFwk;
diff --git a/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn b/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn
index 288ac5cd55..faee2e0c12 100644
--- a/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn
+++ b/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn
@@ -36,7 +36,7 @@ ohos_fuzztest("ExtensionRecordFactoryFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/app_utils.cpp",
     "${ability_runtime_services_path}/common/src/json_utils.cpp",
     "extensionrecordfactory_fuzzer.cpp",
diff --git a/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn b/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn
index 7d94de9186..b7137baf84 100644
--- a/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn
@@ -43,12 +43,12 @@ ohos_fuzztest("ExtensionRecordManagerFuzzTest") {
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/application_state_observer_stub.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/page_state_data.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_data.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/app_utils.cpp",
     "${ability_runtime_services_path}/common/src/json_utils.cpp",
     "extensionrecordmanager_fuzzer.cpp",
diff --git a/test/fuzztest/extensionrecordmanagera_fuzzer/BUILD.gn b/test/fuzztest/extensionrecordmanagera_fuzzer/BUILD.gn
index f5d6e75daf..d81f7ec159 100755
--- a/test/fuzztest/extensionrecordmanagera_fuzzer/BUILD.gn
+++ b/test/fuzztest/extensionrecordmanagera_fuzzer/BUILD.gn
@@ -44,12 +44,12 @@ ohos_fuzztest("ExtensionRecordManageraFuzzTest") {
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/application_state_observer_stub.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/page_state_data.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_data.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/app_utils.cpp",
     "${ability_runtime_services_path}/common/src/json_utils.cpp",
     "extensionrecordmanagera_fuzzer.cpp",
diff --git a/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn b/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn
index 9a593f9bba..4e9d14936b 100644
--- a/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn
+++ b/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn
@@ -36,8 +36,8 @@ ohos_fuzztest("UIExtensionRecordFactoryFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/app_utils.cpp",
     "${ability_runtime_services_path}/common/src/json_utils.cpp",
     "uiextensionrecordfactory_fuzzer.cpp",
diff --git a/test/moduletest/ability_manager_client_test/ability_manager_client_test.cpp b/test/moduletest/ability_manager_client_test/ability_manager_client_test.cpp
index c225d0e6eb..925ba990bb 100644
--- a/test/moduletest/ability_manager_client_test/ability_manager_client_test.cpp
+++ b/test/moduletest/ability_manager_client_test/ability_manager_client_test.cpp
@@ -23,7 +23,7 @@
 #include "ipc_object_stub.h"
 #include "start_options.h"
 #include "status_bar_delegate_proxy.h"
-#include "ui_extension_session_info.h"
+#include "ui_extension/ui_extension_session_info.h"
 #include "want.h"
 
 using namespace testing;
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index bc0a4ca061..b0c8e667d0 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -146,12 +146,13 @@ ohos_source_set("abilityms_test_source") {
     "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/exit_reason.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/free_install_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_interceptor_executer.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_jump_interceptor.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/control_interceptor.cpp",
@@ -173,13 +174,12 @@ ohos_source_set("abilityms_test_source") {
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/task_data_persistence_mgr.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/uri_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/user_controller.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/user_event_handler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/utils/insight_intent_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/want_receiver_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/want_receiver_stub.cpp",
diff --git a/test/unittest/ability_manager_service_fourth_test/BUILD.gn b/test/unittest/ability_manager_service_fourth_test/BUILD.gn
index 15d24b348d..5fd86e1f0b 100644
--- a/test/unittest/ability_manager_service_fourth_test/BUILD.gn
+++ b/test/unittest/ability_manager_service_fourth_test/BUILD.gn
@@ -48,7 +48,7 @@ ohos_unittest("ability_manager_service_fourth_test") {
     "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/auto_startup_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/exit_reason.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/modal_system_dialog/modal_system_dialog_ui_extension.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/modal_system_dialog_util.cpp",
diff --git a/test/unittest/extension_record_factory_test/BUILD.gn b/test/unittest/extension_record_factory_test/BUILD.gn
index a67de19b26..8131396601 100644
--- a/test/unittest/extension_record_factory_test/BUILD.gn
+++ b/test/unittest/extension_record_factory_test/BUILD.gn
@@ -36,7 +36,7 @@ ohos_unittest("extension_record_factory_test") {
   ]
 
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
     "extension_record_factory_test.cpp",
   ]
 
diff --git a/test/unittest/extension_record_test/BUILD.gn b/test/unittest/extension_record_test/BUILD.gn
index e7d8e0b0e4..e2de2d69e8 100644
--- a/test/unittest/extension_record_test/BUILD.gn
+++ b/test/unittest/extension_record_test/BUILD.gn
@@ -37,7 +37,7 @@ ohos_unittest("extension_record_test") {
 
   sources = [
     # add mock file
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp",
     "extension_record_test.cpp",
   ]
diff --git a/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn
index 39741fa9ad..a592074745 100644
--- a/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn
+++ b/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_unittest("insight_intent_execute_manager_test") {
   ]
 
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_execute_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_profile.cpp",
     "insight_intent_execute_manager_test.cpp",
     "insight_intent_utils_mock.cpp",
   ]
diff --git a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn
index e7c88c0b86..69063188c3 100644
--- a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn
+++ b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn
@@ -36,7 +36,7 @@ ohos_unittest("insight_intent_utils_test") {
   sources = [
     "${ability_runtime_path}/frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp",
     "${ability_runtime_path}/interfaces/inner_api/deps_wrapper/src/os_account_manager_wrapper.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/insight_intent/insight_intent_profile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "insight_intent_utils_test.cpp",
   ]
diff --git a/test/unittest/insight_intent_profile_test/insight_intent_profile_test.cpp b/test/unittest/insight_intent_profile_test/insight_intent_profile_test.cpp
index f94559f530..8b891a00bf 100644
--- a/test/unittest/insight_intent_profile_test/insight_intent_profile_test.cpp
+++ b/test/unittest/insight_intent_profile_test/insight_intent_profile_test.cpp
@@ -15,7 +15,7 @@
 
 #include <gtest/gtest.h>
 
-#include "insight_intent_profile.cpp"
+#include "insight_intent/insight_intent_profile.cpp"
 #include "insight_intent_profile.h"
 
 using namespace testing;
@@ -101,7 +101,7 @@ HWTEST_F(InsightIntentProfileTest, TransformToInsightIntentInfo_0100, TestSize.L
     InsightIntentInfo info;
     insightIntent.intentName = "";
     EXPECT_FALSE(TransformToInsightIntentInfo(insightIntent, info));
-    
+
     insightIntent.intentName = "testIntent";
     insightIntent.intentDomain = "testDomain";
     insightIntent.intentVersion = "1.0";
diff --git a/test/unittest/preload_uiext_state_observer_test/BUILD.gn b/test/unittest/preload_uiext_state_observer_test/BUILD.gn
index 99107079b4..85cb073eb0 100644
--- a/test/unittest/preload_uiext_state_observer_test/BUILD.gn
+++ b/test/unittest/preload_uiext_state_observer_test/BUILD.gn
@@ -35,8 +35,8 @@ ohos_unittest("preload_uiext_state_observer_test") {
 
   sources = [
     "${ability_runtime_path}/interfaces/inner_api/app_manager/src/appmgr/application_state_observer_stub.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
     "preload_uiext_state_observer_test.cpp",
   ]
 
diff --git a/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn
index 31c709b530..c44d761ba6 100644
--- a/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn
+++ b/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn
@@ -43,12 +43,12 @@ ohos_unittest("extension_record_manager_second_test") {
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/application_state_observer_stub.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/page_state_data.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_data.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/app_utils.cpp",
     "${ability_runtime_services_path}/common/src/json_utils.cpp",
     "${ability_runtime_test_path}/mock/common/src/mock_native_token.cpp",
diff --git a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
index 7c2692bf65..54324e6ddf 100755
--- a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
+++ b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
@@ -40,12 +40,12 @@ ohos_unittest("extension_record_manager_test") {
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/application_state_observer_stub.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/page_state_data.cpp",
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_data.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/preload_uiext_state_observer.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/app_utils.cpp",
     "${ability_runtime_services_path}/common/src/json_utils.cpp",
     "${ability_runtime_test_path}/mock/common/src/mock_native_token.cpp",
diff --git a/test/unittest/ui_extension_record_factory_test/BUILD.gn b/test/unittest/ui_extension_record_factory_test/BUILD.gn
index b738260f9f..58607a6ff2 100644
--- a/test/unittest/ui_extension_record_factory_test/BUILD.gn
+++ b/test/unittest/ui_extension_record_factory_test/BUILD.gn
@@ -24,9 +24,9 @@ ohos_unittest("ui_extension_record_factory_test") {
     blocklist = "../../cfi_blocklist.txt"
   }
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/lifecycle_deal.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp",
     "ui_extension_record_factory_test.cpp",
   ]
diff --git a/test/unittest/ui_extension_record_test/BUILD.gn b/test/unittest/ui_extension_record_test/BUILD.gn
index 213502d972..465a0f08b4 100644
--- a/test/unittest/ui_extension_record_test/BUILD.gn
+++ b/test/unittest/ui_extension_record_test/BUILD.gn
@@ -28,8 +28,8 @@ ohos_unittest("ui_extension_record_test") {
   include_dirs = [ "${ability_runtime_abilitymgr_path}/include" ]
 
   sources = [
-    "${ability_runtime_abilitymgr_path}/src/extension_record.cpp",
-    "${ability_runtime_abilitymgr_path}/src/ui_extension_record.cpp",
+    "${ability_runtime_abilitymgr_path}/src/extension_record/extension_record.cpp",
+    "${ability_runtime_abilitymgr_path}/src/ui_extension_record/ui_extension_record.cpp",
     "ui_extension_record_test.cpp",
   ]
 
diff --git a/test/unittest/window_focus_changed_listener_test/BUILD.gn b/test/unittest/window_focus_changed_listener_test/BUILD.gn
index 3c373d2544..9563de96db 100644
--- a/test/unittest/window_focus_changed_listener_test/BUILD.gn
+++ b/test/unittest/window_focus_changed_listener_test/BUILD.gn
@@ -27,9 +27,9 @@ ohos_unittest("window_focus_changed_listener_test") {
   sources = [
     "${ability_runtime_path}/services/abilitymgr/src/window_focus_changed_listener.cpp",
     "${ability_runtime_path}/services/common/src/task_handler_wrap.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/lifecycle_deal.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp",
     "${ability_runtime_services_path}/common/src/ffrt_task_handler_wrap.cpp",
     "${ability_runtime_services_path}/common/src/queue_task_handler_wrap.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp",