diff --git a/bundle.json b/bundle.json
index 2154afa720..7040e55201 100644
--- a/bundle.json
+++ b/bundle.json
@@ -82,7 +82,7 @@
           "//foundation/ability/ability_runtime/frameworks/native/ability:ability_context_native",
           "//foundation/ability/ability_runtime/frameworks/native/appkit:app_context",
           "//foundation/ability/ability_runtime/frameworks/native/appkit:appkit_native",
-          "//foundation/ability/ability_runtime/frameworks/kits/wantagent:wantagent_innerkits"
+          "//foundation/ability/ability_runtime/interfaces/inner_api/wantagent:wantagent_innerkits"
         ],
         "inner_kits": [
           {
@@ -101,7 +101,7 @@
                 "want_agent.h"
               ]
             },
-            "name": "//foundation/ability/ability_runtime/frameworks/kits/wantagent:wantagent_innerkits"
+            "name": "//foundation/ability/ability_runtime/interfaces/inner_api/wantagent:wantagent_innerkits"
           },
           {
             "header": {
diff --git a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
index cecf12d07f..7ba6b5ffd1 100644
--- a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
@@ -29,7 +29,6 @@ ohos_unittest("completed_dispatcher_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "${ability_runtime_path}/services/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("completed_dispatcher_test") {
     "ability_base:zuri",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
diff --git a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
index a4290f708b..131d879e07 100644
--- a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
@@ -33,7 +33,6 @@ ohos_unittest("pending_want_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "${ability_runtime_path}/services/abilitymgr:abilityms",
@@ -48,6 +47,7 @@ ohos_unittest("pending_want_test") {
     "ability_base:zuri",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
diff --git a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn
index ebb14260cc..6f058a303e 100644
--- a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn
@@ -29,7 +29,6 @@ ohos_unittest("trigger_Info_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "${ability_runtime_path}/services/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("trigger_Info_test") {
     "ability_base:zuri",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
index 64f52f3441..b22cc25048 100644
--- a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
@@ -33,7 +33,6 @@ ohos_unittest("want_agent_helper_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "${ability_runtime_path}/services/abilitymgr:abilityms",
@@ -48,6 +47,7 @@ ohos_unittest("want_agent_helper_test") {
     "ability_base:zuri",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn
index aee1885b7d..606337cc20 100644
--- a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn
@@ -29,7 +29,6 @@ ohos_unittest("want_agent_info_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "${ability_runtime_path}/services/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("want_agent_info_test") {
     "ability_base:zuri",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn
index 7352fc59e6..325a821161 100644
--- a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn
@@ -29,7 +29,6 @@ ohos_unittest("want_agent_test") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "${ability_runtime_path}/services/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
@@ -43,6 +42,7 @@ ohos_unittest("want_agent_test") {
     "ability_base:zuri",
     "ability_runtime:ability_manager",
     "ability_runtime:abilitykit_native",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn
index 1f99f9451b..ea3b972d04 100644
--- a/frameworks/native/ability/native/BUILD.gn
+++ b/frameworks/native/ability/native/BUILD.gn
@@ -193,7 +193,7 @@ ohos_shared_library("abilitykit_native") {
   public_configs = [
     ":ability_public_config",
     "${ability_runtime_path}/frameworks/native/ability:ability_context_public_config",
-    "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config",
+    "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits_public_config",
   ]
 
   deps = [
diff --git a/frameworks/kits/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn
similarity index 100%
rename from frameworks/kits/wantagent/BUILD.gn
rename to interfaces/inner_api/wantagent/BUILD.gn
diff --git a/frameworks/kits/wantagent/src/completed_dispatcher.cpp b/interfaces/inner_api/wantagent/src/completed_dispatcher.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/completed_dispatcher.cpp
rename to interfaces/inner_api/wantagent/src/completed_dispatcher.cpp
diff --git a/frameworks/kits/wantagent/src/pending_want.cpp b/interfaces/inner_api/wantagent/src/pending_want.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/pending_want.cpp
rename to interfaces/inner_api/wantagent/src/pending_want.cpp
diff --git a/frameworks/kits/wantagent/src/trigger_info.cpp b/interfaces/inner_api/wantagent/src/trigger_info.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/trigger_info.cpp
rename to interfaces/inner_api/wantagent/src/trigger_info.cpp
diff --git a/frameworks/kits/wantagent/src/want_agent.cpp b/interfaces/inner_api/wantagent/src/want_agent.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/want_agent.cpp
rename to interfaces/inner_api/wantagent/src/want_agent.cpp
diff --git a/frameworks/kits/wantagent/src/want_agent_helper.cpp b/interfaces/inner_api/wantagent/src/want_agent_helper.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/want_agent_helper.cpp
rename to interfaces/inner_api/wantagent/src/want_agent_helper.cpp
diff --git a/frameworks/kits/wantagent/src/want_agent_info.cpp b/interfaces/inner_api/wantagent/src/want_agent_info.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/want_agent_info.cpp
rename to interfaces/inner_api/wantagent/src/want_agent_info.cpp
diff --git a/frameworks/kits/wantagent/src/want_agent_log_wrapper.cpp b/interfaces/inner_api/wantagent/src/want_agent_log_wrapper.cpp
similarity index 100%
rename from frameworks/kits/wantagent/src/want_agent_log_wrapper.cpp
rename to interfaces/inner_api/wantagent/src/want_agent_log_wrapper.cpp
diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn
index 89fc87e770..b677b431aa 100644
--- a/services/test/moduletest/panding_want_manager_test/BUILD.gn
+++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn
@@ -46,7 +46,7 @@ ohos_moduletest("PandingWantMgrTest") {
 
   deps = [
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
+    "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/interfaces/inner_api/app_manager:app_manager",
diff --git a/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn b/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn
index 32d849d44b..b5567f9b8f 100644
--- a/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn
+++ b/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn
@@ -36,11 +36,10 @@ ohos_fuzztest("WantAgentHelperStringFuzzTest") {
 
   sources = [ "wantagenthelperstring_fuzzer.cpp" ]
 
-  deps = [ "${ability_runtime_kits_path}/wantagent:wantagent_innerkits" ]
-
   external_deps = [
     "ability_base:base",
     "ability_base:want",
+    "ability_runtime:wantagent_innerkits",
     "ipc:ipc_core",
     "utils_base:utils",
   ]
diff --git a/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn b/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn
index b225b3abb6..5c50a53baa 100644
--- a/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn
+++ b/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn
@@ -36,11 +36,10 @@ ohos_fuzztest("WantAgentHelperTriggerFuzzTest") {
 
   sources = [ "wantagenthelpertrigger_fuzzer.cpp" ]
 
-  deps = [ "${ability_runtime_kits_path}/wantagent:wantagent_innerkits" ]
-
   external_deps = [
     "ability_base:base",
     "ability_base:want",
+    "ability_runtime:wantagent_innerkits",
     "ipc:ipc_core",
     "utils_base:utils",
   ]
diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn
index 7134f6fbc2..8ed00b5247 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn
+++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn
@@ -42,7 +42,6 @@ ohos_shared_library("amsAbilityVisibleTestPageA") {
   ]
   configs = [ ":amsAbilityVisibleTestPageAConfig" ]
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
@@ -55,6 +54,7 @@ ohos_shared_library("amsAbilityVisibleTestPageA") {
   external_deps = [
     "ability_base:want",
     "ability_base:zuri",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
     "common_event_service:cesfwk_innerkits",
diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn
index f6f2d18ac6..cea97da7fe 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn
+++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn
@@ -43,7 +43,6 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") {
   ]
   configs = [ ":amsAbilityVisibleTestServiceBConfig" ]
   deps = [
-    "${ability_runtime_path}/frameworks/kits/wantagent:wantagent_innerkits",
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
@@ -56,6 +55,7 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") {
   external_deps = [
     "ability_base:want",
     "ability_base:zuri",
+    "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_core",
     "common_event_service:cesfwk_core",
     "common_event_service:cesfwk_innerkits",