diff --git a/README.md b/README.md
index 0dc908d8b1..8d79c0204d 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ The Window Manager subsystem provides basic capabilities of window and display m
 ## Directory Structure
 
 ```text
-foundation/windowmanager/
+foundation/window/window_manager/
 ├── dm                      # Stores Display Manager Client implementation code
 ├── dmserver                # Stores Display Manager Server implementation code
 ├── interfaces              # Stores external APIs
diff --git a/README_zh.md b/README_zh.md
index 4f25bf3ad3..c1798d8eff 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -32,7 +32,7 @@
 
 ## 目录
 ```
-foundation/windowmanager/
+foundation/window/window_manager/
 ├── dm                      # Dislplay Manager Client实现代码
 ├── dmserver                # Dislplay Manager Service实现代码
 ├── interfaces              # 对外接口存放目录
@@ -52,7 +52,7 @@ foundation/windowmanager/
 
 ## 接口说明
 
-- [Window](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/apis/js-apis-window.md)  
+- [Window](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/apis/js-apis-window.md)
 - [Display](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/apis/js-apis-display.md)
 
 ## 相关仓
diff --git a/bundle.json b/bundle.json
index eda535621b..19d159c7cb 100644
--- a/bundle.json
+++ b/bundle.json
@@ -5,7 +5,7 @@
     "license": "Apache License 2.0",
     "publishAs": "code-segment",
     "segment": {
-      "destPath": "foundation/windowmanager"
+      "destPath": "foundation/window/window_manager"
     },
     "dirs": {},
     "scripts": {},
@@ -18,7 +18,7 @@
       "rom": "8000KB",
       "ram": "8000KB",
       "hisysevent_config": [
-        "//foundation/windowmanager/hisysevent.yaml"
+        "//foundation/window/window_manager/hisysevent.yaml"
       ],
       "deps": {
         "components": [
@@ -56,25 +56,25 @@
       },
       "build": {
         "sub_component": [
-          "//foundation/windowmanager/interfaces/kits/js/declaration:window",
-          "//foundation/windowmanager/sa_profile:wms_sa_profile",
-          "//foundation/windowmanager/dm:libdm",
-          "//foundation/windowmanager/dmserver:libdms",
-          "//foundation/windowmanager/extension/extension_connection:libwindow_extension_client",
-          "//foundation/windowmanager/extension/window_extension:libwindow_extension",
-          "//foundation/windowmanager/extension/window_extension:window_extension_module",
-          "//foundation/windowmanager/wm:libwm",
-          "//foundation/windowmanager/wmserver:libwms",
-          "//foundation/windowmanager/utils:libwmutil",
-          "//foundation/windowmanager/snapshot:snapshot_display",
-          "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_stage_napi:windowstage",
-          "//foundation/windowmanager/interfaces/kits/napi:napi_packages",
-          "//foundation/windowmanager/resources:window_resources"
+          "//foundation/window/window_manager/interfaces/kits/js/declaration:window",
+          "//foundation/window/window_manager/sa_profile:wms_sa_profile",
+          "//foundation/window/window_manager/dm:libdm",
+          "//foundation/window/window_manager/dmserver:libdms",
+          "//foundation/window/window_manager/extension/extension_connection:libwindow_extension_client",
+          "//foundation/window/window_manager/extension/window_extension:libwindow_extension",
+          "//foundation/window/window_manager/extension/window_extension:window_extension_module",
+          "//foundation/window/window_manager/wm:libwm",
+          "//foundation/window/window_manager/wmserver:libwms",
+          "//foundation/window/window_manager/utils:libwmutil",
+          "//foundation/window/window_manager/snapshot:snapshot_display",
+          "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_stage_napi:windowstage",
+          "//foundation/window/window_manager/interfaces/kits/napi:napi_packages",
+          "//foundation/window/window_manager/resources:window_resources"
         ],
         "inner_kits": [
           {
             "type": "so",
-            "name": "//foundation/windowmanager/wm:libwm",
+            "name": "//foundation/window/window_manager/wm:libwm",
             "header": {
               "header_files": [
                 "window.h",
@@ -83,12 +83,12 @@
                 "window_scene.h",
                 "wm_common.h"
               ],
-              "header_base": "//foundation/windowmanager/interfaces/innerkits/wm"
+              "header_base": "//foundation/window/window_manager/interfaces/innerkits/wm"
             }
           },
           {
             "type": "so",
-            "name": "//foundation/windowmanager/dm:libdm",
+            "name": "//foundation/window/window_manager/dm:libdm",
             "header": {
               "header_files": [
                 "display.h",
@@ -99,24 +99,24 @@
                 "screen_group.h",
                 "screen_manager.h"
               ],
-              "header_base": "//foundation/windowmanager/interfaces/innerkits/dm"
+              "header_base": "//foundation/window/window_manager/interfaces/innerkits/dm"
             }
           },
           {
             "type": "so",
-            "name": "//foundation/windowmanager/extension/extension_connection:libwindow_extension_client",
+            "name": "//foundation/window/window_manager/extension/extension_connection:libwindow_extension_client",
             "header": {
               "header_files": [
                 "window_extension_connection.h"
               ],
-              "header_base": "//foundation/windowmanager/interfaces/innerkits/extension"
+              "header_base": "//foundation/window/window_manager/interfaces/innerkits/extension"
             }
           }
         ],
         "test": [
-          "//foundation/windowmanager/wm:test",
-          "//foundation/windowmanager/dm:test",
-          "//foundation/windowmanager/extension:test"
+          "//foundation/window/window_manager/wm:test",
+          "//foundation/window/window_manager/dm:test",
+          "//foundation/window/window_manager/extension:test"
         ]
       }
     }
diff --git a/dm/BUILD.gn b/dm/BUILD.gn
index 309c3fb074..6080a0b0c4 100644
--- a/dm/BUILD.gn
+++ b/dm/BUILD.gn
@@ -47,7 +47,7 @@ ohos_shared_library("libdm") {
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/utils:libwmutil",
+    "//foundation/window/window_manager/utils:libwmutil",
   ]
 
   external_deps = [
diff --git a/dm/test/fuzztest/displaymanager_fuzzer/BUILD.gn b/dm/test/fuzztest/displaymanager_fuzzer/BUILD.gn
index 16003c1dc3..e40166441a 100644
--- a/dm/test/fuzztest/displaymanager_fuzzer/BUILD.gn
+++ b/dm/test/fuzztest/displaymanager_fuzzer/BUILD.gn
@@ -18,11 +18,10 @@ module_output_path = "window_manager/dm"
 
 ##############################fuzztest##########################################
 ohos_fuzztest("DisplayManagerFuzzTest") {
-  fuzz_config_file =
-      "//foundation/windowmanager/dm/test/fuzztest/displaymanager_fuzzer"
+  fuzz_config_file = "//foundation/window/window_manager/dm/test/fuzztest/displaymanager_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
     "//utils/native/base/include",
     "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
   ]
@@ -35,7 +34,7 @@ ohos_fuzztest("DisplayManagerFuzzTest") {
   sources = [ "displaymanager_fuzzer.cpp" ]
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
+    "//foundation/window/window_manager/dm:libdm",
     "//utils/native/base:utils",
   ]
 }
diff --git a/dm/test/fuzztest/displaymanageripc_fuzzer/BUILD.gn b/dm/test/fuzztest/displaymanageripc_fuzzer/BUILD.gn
index 156ba03405..ea267a12be 100644
--- a/dm/test/fuzztest/displaymanageripc_fuzzer/BUILD.gn
+++ b/dm/test/fuzztest/displaymanageripc_fuzzer/BUILD.gn
@@ -18,13 +18,12 @@ module_output_path = "window_manager/dm"
 
 ##############################fuzztest##########################################
 ohos_fuzztest("DisplayManagerIPCFuzzTest") {
-  fuzz_config_file =
-      "//foundation/windowmanager/dm/test/fuzztest/displaymanageripc_fuzzer"
+  fuzz_config_file = "//foundation/window/window_manager/dm/test/fuzztest/displaymanageripc_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/dmserver/include",
-    "//foundation/windowmanager/dm/include",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/dmserver/include",
+    "//foundation/window/window_manager/dm/include",
   ]
   cflags = [
     "-g",
@@ -35,7 +34,7 @@ ohos_fuzztest("DisplayManagerIPCFuzzTest") {
   sources = [ "displaymanageripc_fuzzer.cpp" ]
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
+    "//foundation/window/window_manager/dm:libdm",
   ]
   external_deps = [ "samgr_standard:samgr_proxy" ]
 }
diff --git a/dm/test/fuzztest/screen_fuzzer/BUILD.gn b/dm/test/fuzztest/screen_fuzzer/BUILD.gn
index 1a1c17e335..0452061b9d 100644
--- a/dm/test/fuzztest/screen_fuzzer/BUILD.gn
+++ b/dm/test/fuzztest/screen_fuzzer/BUILD.gn
@@ -18,10 +18,11 @@ module_output_path = "window_manager/dm"
 
 ##############################fuzztest##########################################
 ohos_fuzztest("ScreenFuzzTest") {
-  fuzz_config_file = "//foundation/windowmanager/dm/test/fuzztest/screen_fuzzer"
+  fuzz_config_file =
+      "//foundation/window/window_manager/dm/test/fuzztest/screen_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
     "//utils/native/base/include",
     "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
   ]
@@ -34,7 +35,7 @@ ohos_fuzztest("ScreenFuzzTest") {
   sources = [ "screen_fuzzer.cpp" ]
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
+    "//foundation/window/window_manager/dm:libdm",
     "//utils/native/base:utils",
   ]
 }
diff --git a/dm/test/fuzztest/screenmanager_fuzzer/BUILD.gn b/dm/test/fuzztest/screenmanager_fuzzer/BUILD.gn
index 1fae025d5e..5afece746c 100644
--- a/dm/test/fuzztest/screenmanager_fuzzer/BUILD.gn
+++ b/dm/test/fuzztest/screenmanager_fuzzer/BUILD.gn
@@ -19,10 +19,10 @@ module_output_path = "window_manager/dm"
 ##############################fuzztest##########################################
 ohos_fuzztest("ScreenManagerFuzzTest") {
   fuzz_config_file =
-      "//foundation/windowmanager/dm/test/fuzztest/screenmanager_fuzzer"
+      "//foundation/window/window_manager/dm/test/fuzztest/screenmanager_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
     "//utils/native/base/include",
     "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
   ]
@@ -35,7 +35,7 @@ ohos_fuzztest("ScreenManagerFuzzTest") {
   sources = [ "screenmanager_fuzzer.cpp" ]
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
+    "//foundation/window/window_manager/dm:libdm",
     "//utils/native/base:utils",
   ]
 }
diff --git a/dm/test/systemtest/BUILD.gn b/dm/test/systemtest/BUILD.gn
index 25607c7036..109fabbfc1 100644
--- a/dm/test/systemtest/BUILD.gn
+++ b/dm/test/systemtest/BUILD.gn
@@ -75,10 +75,10 @@ ohos_systemtest("dm_screenshot_test") {
 ohos_systemtest("dm_screenshot_cmd_test") {
   module_out_path = module_out_path
 
-  include_dirs = [ "//foundation/windowmanager/snapshot" ]
+  include_dirs = [ "//foundation/window/window_manager/snapshot" ]
 
   sources = [
-    "//foundation/windowmanager/snapshot/snapshot_utils.cpp",
+    "//foundation/window/window_manager/snapshot/snapshot_utils.cpp",
     "screenshot_cmd_test.cpp",
   ]
 
@@ -114,12 +114,12 @@ ohos_systemtest("dm_screen_gamut_test") {
 ## Build dm_systemtest_common.a {{{
 config("dm_systemtest_common_public_config") {
   include_dirs = [
-    "//foundation/windowmanager/dm/include",
-    "//foundation/windowmanager/dmserver/include",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/dm/test/utils/",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/dm/include",
+    "//foundation/window/window_manager/dmserver/include",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/dm/test/utils/",
+    "//foundation/window/window_manager/utils/include",
 
     # RSSurface
     "//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
@@ -141,10 +141,10 @@ ohos_static_library("dm_systemtest_common") {
   public_deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/dm/test/unittest/BUILD.gn b/dm/test/unittest/BUILD.gn
index eef138d760..817d64fffc 100644
--- a/dm/test/unittest/BUILD.gn
+++ b/dm/test/unittest/BUILD.gn
@@ -55,7 +55,7 @@ ohos_unittest("dm_snapshot_utils_test") {
   module_out_path = module_out_path
 
   sources = [
-    "//foundation/windowmanager/snapshot/snapshot_utils.cpp",
+    "//foundation/window/window_manager/snapshot/snapshot_utils.cpp",
     "snapshot_utils_test.cpp",
   ]
 
@@ -102,12 +102,12 @@ ohos_unittest("dm_screen_test") {
 ## Build dm_unittest_common.a {{{
 config("dm_unittest_common_public_config") {
   include_dirs = [
-    "//foundation/windowmanager/dm/include",
-    "//foundation/windowmanager/dmserver/include",
-    "//foundation/windowmanager/snapshot",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/dm/test/utils/",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/dm/include",
+    "//foundation/window/window_manager/dmserver/include",
+    "//foundation/window/window_manager/snapshot",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/dm/test/utils/",
+    "//foundation/window/window_manager/utils/include",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client",  # RSSurface
   ]
 }
@@ -127,11 +127,11 @@ ohos_static_library("dm_unittest_common") {
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",  # PixelMap
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/snapshot:snapshot_display",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/snapshot:snapshot_display",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//third_party/libpng:libpng",  # png
diff --git a/dmserver/BUILD.gn b/dmserver/BUILD.gn
index 846ca4dc88..2ae95926da 100644
--- a/dmserver/BUILD.gn
+++ b/dmserver/BUILD.gn
@@ -17,8 +17,8 @@ import("//build/ohos.gni")
 config("libdms_private_config") {
   include_dirs = [
     "//base/sensors/sensor/interfaces/native/include",
-    "//foundation/windowmanager/dm/include",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/dm/include",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
   ]
 }
 
@@ -48,8 +48,8 @@ ohos_shared_library("libdms") {
   public_configs = [ ":libdms_public_config" ]
 
   deps = [
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/utils:libwmutil",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/utils:libwmutil",
 
     # RSSurface
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
diff --git a/extension/extension_connection/BUILD.gn b/extension/extension_connection/BUILD.gn
index 9016006917..36786d0ebb 100644
--- a/extension/extension_connection/BUILD.gn
+++ b/extension/extension_connection/BUILD.gn
@@ -42,9 +42,9 @@ ohos_shared_library("libwindow_extension_client") {
 
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/extension/window_extension:libwindow_extension",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/extension/window_extension:libwindow_extension",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
diff --git a/extension/test/systemtest/BUILD.gn b/extension/test/systemtest/BUILD.gn
index 45b75e1472..8b3f06d4da 100644
--- a/extension/test/systemtest/BUILD.gn
+++ b/extension/test/systemtest/BUILD.gn
@@ -22,9 +22,9 @@ group("systemtest") {
 
 config("we_systemtest_common_public_config") {
   include_dirs = [
-    "//foundation/windowmanager/extension/extension_connection/include",
-    "//foundation/windowmanager/interfaces/innerkits/extension",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/extension/extension_connection/include",
+    "//foundation/window/window_manager/interfaces/innerkits/extension",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
     "//third_party/googletest/googlemock/include",
   ]
 
@@ -45,7 +45,7 @@ ohos_systemtest("window_extension_connection_test") {
   public_configs = [ ":we_systemtest_common_public_config" ]
 
   public_deps = [
-    "//foundation/windowmanager/extension/extension_connection:libwindow_extension_client",
+    "//foundation/window/window_manager/extension/extension_connection:libwindow_extension_client",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/extension/window_extension/BUILD.gn b/extension/window_extension/BUILD.gn
index 627a5e8f8f..5810afb2f6 100644
--- a/extension/window_extension/BUILD.gn
+++ b/extension/window_extension/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 config("libwindow_extension_private_config") {
   visibility = [ ":*" ]
@@ -45,9 +45,9 @@ ohos_shared_library("libwindow_extension") {
     "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/interfaces/kits/napi/window_runtime:window_native_kit",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/interfaces/kits/napi/window_runtime:window_native_kit",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
@@ -82,8 +82,8 @@ ohos_shared_library("window_extension_module") {
   configs = [ ":window_extension_module_private_config" ]
 
   deps = [
-    "//foundation/windowmanager/extension/window_extension:libwindow_extension",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/extension/window_extension:libwindow_extension",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn
index d6397fac99..fd9837bbf3 100644
--- a/interfaces/innerkits/BUILD.gn
+++ b/interfaces/innerkits/BUILD.gn
@@ -15,13 +15,13 @@ import("//build/ohos.gni")
 
 config("wm_interface_config") {
   visibility = [ ":*" ]
-  include_dirs = [ "//foundation/windowmanager/interfaces/innerkits" ]
+  include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits" ]
 }
 
 ohos_shared_library("wm_interface") {
   public_configs = [ ":wm_interface_config" ]
 
-  include_dirs = [ "//foundation/windowmanager/interfaces/innerkits" ]
+  include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits" ]
 
   public_deps = [
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
diff --git a/interfaces/kits/napi/common/BUILD.gn b/interfaces/kits/napi/common/BUILD.gn
index 51988cbfc8..5d89c431c5 100644
--- a/interfaces/kits/napi/common/BUILD.gn
+++ b/interfaces/kits/napi/common/BUILD.gn
@@ -41,7 +41,7 @@ ohos_static_library("wm_napi_common") {
   public_deps = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//foundation/arkui/napi:ace_napi",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
diff --git a/interfaces/kits/napi/display_runtime/BUILD.gn b/interfaces/kits/napi/display_runtime/BUILD.gn
index b530829225..3b659d5751 100644
--- a/interfaces/kits/napi/display_runtime/BUILD.gn
+++ b/interfaces/kits/napi/display_runtime/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 config("display_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/windowmanager/interfaces/kits/napi/display_runtime",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/interfaces/kits/napi/display_runtime",
+    "//foundation/window/window_manager/utils/include",
   ]
 }
 
@@ -40,8 +40,8 @@ ohos_shared_library("display_napi") {
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "../common:wm_napi_common",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/utils:libwmutil",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/utils:libwmutil",
   ]
 
   external_deps = [
diff --git a/interfaces/kits/napi/screen_recorder/BUILD.gn b/interfaces/kits/napi/screen_recorder/BUILD.gn
index be89b19522..085eb21587 100644
--- a/interfaces/kits/napi/screen_recorder/BUILD.gn
+++ b/interfaces/kits/napi/screen_recorder/BUILD.gn
@@ -13,24 +13,24 @@
 
 import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
 import("//build/ohos.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 config("screen_runtime_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/windowmanager/interfaces/kits/napi/screen_recorder/api",
-    "//foundation/windowmanager/interfaces/kits/napi/screen_recorder/napi",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/utils/include",
-    "//foundation/windowmanager/snapshot",
+    "//foundation/window/window_manager/interfaces/kits/napi/screen_recorder/api",
+    "//foundation/window/window_manager/interfaces/kits/napi/screen_recorder/napi",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/utils/include",
+    "//foundation/window/window_manager/snapshot",
   ]
 }
 
 ohos_shared_library("screenrecorder_napi") {
   sources = [
-    "//foundation/windowmanager/snapshot/snapshot_utils.cpp",
+    "//foundation/window/window_manager/snapshot/snapshot_utils.cpp",
     "napi/js_screen_recorder.cpp",
     "napi/screen_recorder.cpp",
     "napi/screen_recorder_module.cpp",
@@ -42,9 +42,9 @@ ohos_shared_library("screenrecorder_napi") {
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/utils:libwmutil",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/libpng:libpng",  # png
   ]
 
diff --git a/interfaces/kits/napi/screen_runtime/BUILD.gn b/interfaces/kits/napi/screen_runtime/BUILD.gn
index 2077d11176..569df0c77a 100644
--- a/interfaces/kits/napi/screen_runtime/BUILD.gn
+++ b/interfaces/kits/napi/screen_runtime/BUILD.gn
@@ -13,17 +13,17 @@
 
 import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
 import("//build/ohos.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 config("screen_runtime_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/windowmanager/interfaces/kits/napi/screen_runtime/api",
-    "//foundation/windowmanager/interfaces/kits/napi/screen_runtime/napi",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/interfaces/kits/napi/screen_runtime/api",
+    "//foundation/window/window_manager/interfaces/kits/napi/screen_runtime/napi",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/utils/include",
   ]
 }
 
@@ -41,9 +41,9 @@ ohos_shared_library("screen_napi") {
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/utils:libwmutil",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/utils:libwmutil",
   ]
 
   external_deps = [
diff --git a/interfaces/kits/napi/screenshot/BUILD.gn b/interfaces/kits/napi/screenshot/BUILD.gn
index f1aa66f338..1f80381045 100644
--- a/interfaces/kits/napi/screenshot/BUILD.gn
+++ b/interfaces/kits/napi/screenshot/BUILD.gn
@@ -19,9 +19,9 @@ ohos_shared_library("screenshot") {
 
   deps = [
     "../common:wm_napi_common",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
diff --git a/interfaces/kits/napi/window_runtime/BUILD.gn b/interfaces/kits/napi/window_runtime/BUILD.gn
index cf31cde7a2..a9faaedd27 100644
--- a/interfaces/kits/napi/window_runtime/BUILD.gn
+++ b/interfaces/kits/napi/window_runtime/BUILD.gn
@@ -13,18 +13,18 @@
 
 import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
 import("//build/ohos.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 config("window_manager_napi_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_napi",
-    "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_manager_napi",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_napi",
+    "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_manager_napi",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/utils/include",
   ]
 }
 
@@ -32,11 +32,11 @@ config("window_native_kit_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_napi",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/utils/include",
-    "//foundation/windowmanager/wmserver/include",
+    "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_napi",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/utils/include",
+    "//foundation/window/window_manager/wmserver/include",
   ]
 }
 
@@ -51,8 +51,8 @@ ohos_shared_library("window_native_kit") {
   configs = [ ":window_native_kit_config" ]
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
@@ -80,8 +80,8 @@ ohos_shared_library("window_napi") {
     "${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",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
     "//utils/native/base:utils",
   ]
 
@@ -104,11 +104,11 @@ ohos_shared_library("windowstage_kit") {
   sources = [ "window_stage_napi/js_window_stage.cpp" ]
 
   configs = [ ":window_native_kit_config" ]
-  include_dirs = [ "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_stage_napi" ]
+  include_dirs = [ "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_stage_napi" ]
   deps = [
     ":window_native_kit",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
diff --git a/resources/config/BUILD.gn b/resources/config/BUILD.gn
index d7979d976f..c1ffc9b5fd 100644
--- a/resources/config/BUILD.gn
+++ b/resources/config/BUILD.gn
@@ -14,10 +14,10 @@ import("//build/ohos.gni")
 
 ohos_prebuilt_etc("window_manager_config") {
   if (device_name == "rk3568") {
-    source = "//foundation/windowmanager/resources/config/rk3568/window_manager_config.xml"
+    source = "//foundation/window/window_manager/resources/config/rk3568/window_manager_config.xml"
     install_enable = true
   } else {
-    source = "//foundation/windowmanager/resources/config/other/window_manager_config.xml"
+    source = "//foundation/window/window_manager/resources/config/other/window_manager_config.xml"
     install_enable = false
   }
   part_name = "window_manager"
@@ -27,10 +27,10 @@ ohos_prebuilt_etc("window_manager_config") {
 
 ohos_prebuilt_etc("display_manager_config") {
   if (device_name == "rk3568") {
-    source = "//foundation/windowmanager/resources/config/rk3568/display_manager_config.xml"
+    source = "//foundation/window/window_manager/resources/config/rk3568/display_manager_config.xml"
     install_enable = true
   } else {
-    source = "//foundation/windowmanager/resources/config/other/display_manager_config.xml"
+    source = "//foundation/window/window_manager/resources/config/other/display_manager_config.xml"
     install_enable = false
   }
   part_name = "window_manager"
diff --git a/resources/dialog_ui/divider_dialog_ui/js/BUILD.gn b/resources/dialog_ui/divider_dialog_ui/js/BUILD.gn
index 33d56e74bd..037efbe1ab 100644
--- a/resources/dialog_ui/divider_dialog_ui/js/BUILD.gn
+++ b/resources/dialog_ui/divider_dialog_ui/js/BUILD.gn
@@ -14,8 +14,7 @@ import("//build/ohos.gni")
 import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni")
 
 gen_sa_dialog_js("dialog_divider_ui_js_files_etc") {
-  project_path =
-      "//foundation/windowmanager/resources/dialog_ui/divider_dialog_ui/js"
+  project_path = "//foundation/window/window_manager/resources/dialog_ui/divider_dialog_ui/js"
   i18n_files = [
     "i18n/en-US.json",
     "i18n/zh-CN.json",
diff --git a/resources/media/BUILD.gn b/resources/media/BUILD.gn
index adcc1a02c0..34089a6950 100644
--- a/resources/media/BUILD.gn
+++ b/resources/media/BUILD.gn
@@ -13,14 +13,14 @@
 import("//build/ohos.gni")
 
 ohos_prebuilt_etc("window_divider_image") {
-  source = "//foundation/windowmanager/resources/media/img/bg_split_handle.png"
+  source = "//foundation/window/window_manager/resources/media/img/bg_split_handle.png"
   part_name = "window_manager"
   subsystem_name = "window"
   relative_install_dir = "window/resources"
 }
 
 ohos_prebuilt_etc("window_place_holder_image") {
-  source = "//foundation/windowmanager/resources/media/img/bg_place_holder.png"
+  source = "//foundation/window/window_manager/resources/media/img/bg_place_holder.png"
   part_name = "window_manager"
   subsystem_name = "window"
   relative_install_dir = "window/resources"
diff --git a/snapshot/BUILD.gn b/snapshot/BUILD.gn
index a5218dd278..412c926c9b 100644
--- a/snapshot/BUILD.gn
+++ b/snapshot/BUILD.gn
@@ -28,9 +28,9 @@ ohos_executable("snapshot_display") {
   configs = [ ":snapshot_config" ]
 
   deps = [
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
     "//third_party/libpng:libpng",  # png
   ]
 
@@ -55,9 +55,9 @@ ohos_executable("snapshot_virtual_screen") {
 
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
     "//third_party/libpng:libpng",  # png
   ]
 
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index 30ac96d0f8..efcd6901e3 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -15,14 +15,14 @@ import("//build/ohos.gni")
 config("libwmutil_private_config") {
   include_dirs = [
     "include",
-    "//foundation/windowmanager/dmserver/include",
+    "//foundation/window/window_manager/dmserver/include",
     "../interfaces/innerkits/dm",
     "../interfaces/innerkits/wm",
   ]
 }
 
 config("libwmutil_public_config") {
-  include_dirs = [ "//foundation/windowmanager/utils/include" ]
+  include_dirs = [ "//foundation/window/window_manager/utils/include" ]
 }
 
 ## Build libwmutil.so
diff --git a/wm/BUILD.gn b/wm/BUILD.gn
index b8f2ee1842..70759ac9b3 100644
--- a/wm/BUILD.gn
+++ b/wm/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 config("libwm_private_config") {
   visibility = [ ":*" ]
@@ -62,8 +62,8 @@ ohos_shared_library("libwm") {
 
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/utils:libwmutil",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/utils:libwmutil",
 
     # vsync
     "//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
diff --git a/wm/src/window_manager_agent.cpp b/wm/src/window_manager_agent.cpp
index aa00b692d5..8eb90412ab 100644
--- a/wm/src/window_manager_agent.cpp
+++ b/wm/src/window_manager_agent.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "window_manager_agent.h"
-#include "foundation/windowmanager/interfaces/innerkits/wm/window_manager.h"
+#include "foundation/window/window_manager/interfaces/innerkits/wm/window_manager.h"
 #include "singleton_container.h"
 #include "wm_common.h"
 
diff --git a/wm/test/fuzztest/window_fuzzer/BUILD.gn b/wm/test/fuzztest/window_fuzzer/BUILD.gn
index c2fac7209d..bfc6581026 100644
--- a/wm/test/fuzztest/window_fuzzer/BUILD.gn
+++ b/wm/test/fuzztest/window_fuzzer/BUILD.gn
@@ -18,11 +18,12 @@ module_output_path = "window_manager/wm"
 
 ##############################fuzztest##########################################
 ohos_fuzztest("WindowFuzzTest") {
-  fuzz_config_file = "//foundation/windowmanager/wm/test/fuzztest/window_fuzzer"
+  fuzz_config_file =
+      "//foundation/window/window_manager/wm/test/fuzztest/window_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/wmserver/include",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/wmserver/include",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
     "//utils/native/base/include",
   ]
   cflags = [
@@ -33,7 +34,7 @@ ohos_fuzztest("WindowFuzzTest") {
   ]
   sources = [ "window_fuzzer.cpp" ]
   deps = [
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/wm:libwm",
     "//utils/native/base:utils",
   ]
 
diff --git a/wm/test/fuzztest/windowipc_fuzzer/BUILD.gn b/wm/test/fuzztest/windowipc_fuzzer/BUILD.gn
index fddc915cdb..058dbd4aaa 100644
--- a/wm/test/fuzztest/windowipc_fuzzer/BUILD.gn
+++ b/wm/test/fuzztest/windowipc_fuzzer/BUILD.gn
@@ -19,13 +19,13 @@ module_output_path = "window_manager/wm"
 ##############################fuzztest##########################################
 ohos_fuzztest("WindowIPCFuzzTest") {
   fuzz_config_file =
-      "//foundation/windowmanager/wm/test/fuzztest/windowipc_fuzzer"
+      "//foundation/window/window_manager/wm/test/fuzztest/windowipc_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/wmserver/include",
-    "//foundation/windowmanager/wm/include",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/wmserver/include",
+    "//foundation/window/window_manager/wm/include",
   ]
   cflags = [
     "-g",
@@ -37,7 +37,7 @@ ohos_fuzztest("WindowIPCFuzzTest") {
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [
diff --git a/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn b/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn
index 8014926336..3e2fd3af02 100644
--- a/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn
+++ b/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn
@@ -19,11 +19,11 @@ module_output_path = "window_manager/wm"
 ##############################fuzztest##########################################
 ohos_fuzztest("WindowManagerFuzzTest") {
   fuzz_config_file =
-      "//foundation/windowmanager/wm/test/fuzztest/windowmanager_fuzzer"
+      "//foundation/window/window_manager/wm/test/fuzztest/windowmanager_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/wmserver/include",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/wmserver/include",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
     "//utils/native/base/include",
   ]
   cflags = [
@@ -34,7 +34,7 @@ ohos_fuzztest("WindowManagerFuzzTest") {
   ]
   sources = [ "windowmanager_fuzzer.cpp" ]
   deps = [
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/wm:libwm",
     "//utils/native/base:utils",
   ]
 
diff --git a/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn b/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn
index 129b567320..276bed2d45 100644
--- a/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn
+++ b/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn
@@ -19,12 +19,12 @@ module_output_path = "window_manager/wm"
 ##############################fuzztest##########################################
 ohos_fuzztest("WindowSceneFuzzTest") {
   fuzz_config_file =
-      "//foundation/windowmanager/wm/test/fuzztest/windowscene_fuzzer"
+      "//foundation/window/window_manager/wm/test/fuzztest/windowscene_fuzzer"
   module_out_path = module_output_path
   include_dirs = [
-    "//foundation/windowmanager/wmserver/include",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/wmserver/include",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
     "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "//utils/native/base/include",
   ]
@@ -37,8 +37,8 @@ ohos_fuzztest("WindowSceneFuzzTest") {
   sources = [ "windowscene_fuzzer.cpp" ]
   deps = [
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/wm:libwm",
     "//utils/native/base:utils",
   ]
 
diff --git a/wm/test/systemtest/BUILD.gn b/wm/test/systemtest/BUILD.gn
index b1bb29c5a1..910283cf33 100644
--- a/wm/test/systemtest/BUILD.gn
+++ b/wm/test/systemtest/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 
 module_out_path = "window_manager/wm"
 
@@ -256,10 +256,10 @@ ohos_systemtest("wm_window_app_floating_window_test") {
 ## Build wm_systemtest_common.a {{{
 config("wm_systemtest_common_public_config") {
   include_dirs = [
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/wmserver/include",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/wmserver/include",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/utils/include",
     "//utils/native/base/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
@@ -304,10 +304,10 @@ ohos_static_library("wm_systemtest_common") {
     "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/wm/test/unittest/BUILD.gn b/wm/test/unittest/BUILD.gn
index 3da9849298..c3c9a5a3c5 100644
--- a/wm/test/unittest/BUILD.gn
+++ b/wm/test/unittest/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/windowmanager/windowmanager_aafwk.gni")
+import("//foundation/window/window_manager/windowmanager_aafwk.gni")
 module_out_path = "window_manager/wm"
 
 group("unittest") {
@@ -133,11 +133,11 @@ ohos_unittest("wms_window_snapshot_test") {
 ## Build wm_unittest_common.a {{{
 config("wm_unittest_common_public_config") {
   include_dirs = [
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/wmserver/include",
-    "//foundation/windowmanager/wmserver/include/window_snapshot",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/utils/include",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/wmserver/include",
+    "//foundation/window/window_manager/wmserver/include/window_snapshot",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/utils/include",
     "//utils/native/base/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
@@ -181,11 +181,11 @@ ohos_static_library("wm_unittest_common") {
     "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
-    "//foundation/windowmanager/wmserver:libwms",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
+    "//foundation/window/window_manager/wmserver:libwms",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn
index 13f277fb43..05b07ff9c2 100644
--- a/wmserver/BUILD.gn
+++ b/wmserver/BUILD.gn
@@ -19,12 +19,12 @@ config("libwms_config") {
     "include",
     "include/window_snapshot",
     "//utils/system/safwk/native/include",
-    "//foundation/windowmanager/interfaces/innerkits/wm",
-    "//foundation/windowmanager/interfaces/innerkits/dm",
-    "//foundation/windowmanager/wm/include",
-    "//foundation/windowmanager/utils/include",
-    "//foundation/windowmanager/dm/include",
-    "//foundation/windowmanager/dmserver/include",
+    "//foundation/window/window_manager/interfaces/innerkits/wm",
+    "//foundation/window/window_manager/interfaces/innerkits/dm",
+    "//foundation/window/window_manager/wm/include",
+    "//foundation/window/window_manager/utils/include",
+    "//foundation/window/window_manager/dm/include",
+    "//foundation/window/window_manager/dmserver/include",
   ]
 }
 
@@ -70,10 +70,10 @@ ohos_shared_library("libwms") {
     "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr",
     "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
-    "//foundation/windowmanager/dm:libdm",
-    "//foundation/windowmanager/dmserver:libdms",
-    "//foundation/windowmanager/utils:libwmutil",
-    "//foundation/windowmanager/wm:libwm",
+    "//foundation/window/window_manager/dm:libdm",
+    "//foundation/window/window_manager/dmserver:libdms",
+    "//foundation/window/window_manager/utils:libwmutil",
+    "//foundation/window/window_manager/wm:libwm",
   ]
 
   external_deps = [