diff --git a/packages/client/tsconfig.build.json b/packages/client/tsconfig.build.json
index 509526e2c..5ed6cf5a2 100644
--- a/packages/client/tsconfig.build.json
+++ b/packages/client/tsconfig.build.json
@@ -7,5 +7,5 @@
     "target": "es5"
   },
   "include": ["./src/**/*.ts", "./src/**/*.tsx"],
-  "exclude": ["./src/__tests__/*", "./src/*/demos/*", "./esm/*", "./lib/*"]
+  "exclude": ["./src/__tests__/*", "./src/**/demos/*", "./esm/*", "./lib/*"]
 }
diff --git a/packages/plugin-ui-schema/.npmignore b/packages/plugin-ui-schema-storage/.npmignore
similarity index 100%
rename from packages/plugin-ui-schema/.npmignore
rename to packages/plugin-ui-schema-storage/.npmignore
diff --git a/packages/plugin-ui-schema/package.json b/packages/plugin-ui-schema-storage/package.json
similarity index 91%
rename from packages/plugin-ui-schema/package.json
rename to packages/plugin-ui-schema-storage/package.json
index 9a4c9e780..9d6d43120 100644
--- a/packages/plugin-ui-schema/package.json
+++ b/packages/plugin-ui-schema-storage/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@nocobase/plugin-ui-schema",
+  "name": "@nocobase/plugin-ui-schema-storage",
   "version": "0.6.0-alpha.0",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/packages/plugin-ui-schema/src/__tests__/action.test.ts b/packages/plugin-ui-schema-storage/src/__tests__/action.test.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/__tests__/action.test.ts
rename to packages/plugin-ui-schema-storage/src/__tests__/action.test.ts
diff --git a/packages/plugin-ui-schema/src/__tests__/ui-schema-model.test.ts b/packages/plugin-ui-schema-storage/src/__tests__/ui-schema-model.test.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/__tests__/ui-schema-model.test.ts
rename to packages/plugin-ui-schema-storage/src/__tests__/ui-schema-model.test.ts
diff --git a/packages/plugin-ui-schema/src/__tests__/ui-schema-repository.test.ts b/packages/plugin-ui-schema-storage/src/__tests__/ui-schema-repository.test.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/__tests__/ui-schema-repository.test.ts
rename to packages/plugin-ui-schema-storage/src/__tests__/ui-schema-repository.test.ts
diff --git a/packages/plugin-ui-schema/src/__tests__/ui-schema.test.ts b/packages/plugin-ui-schema-storage/src/__tests__/ui-schema.test.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/__tests__/ui-schema.test.ts
rename to packages/plugin-ui-schema-storage/src/__tests__/ui-schema.test.ts
diff --git a/packages/plugin-ui-schema/src/actions/ui-schema-action.ts b/packages/plugin-ui-schema-storage/src/actions/ui-schema-action.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/actions/ui-schema-action.ts
rename to packages/plugin-ui-schema-storage/src/actions/ui-schema-action.ts
diff --git a/packages/plugin-ui-schema/src/collections/ui_schema_tree_path.ts b/packages/plugin-ui-schema-storage/src/collections/ui_schema_tree_path.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/collections/ui_schema_tree_path.ts
rename to packages/plugin-ui-schema-storage/src/collections/ui_schema_tree_path.ts
diff --git a/packages/plugin-ui-schema/src/collections/ui_schemas.ts b/packages/plugin-ui-schema-storage/src/collections/ui_schemas.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/collections/ui_schemas.ts
rename to packages/plugin-ui-schema-storage/src/collections/ui_schemas.ts
diff --git a/packages/plugin-ui-schema/src/dao/ui_schema_dao.ts b/packages/plugin-ui-schema-storage/src/dao/ui_schema_dao.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/dao/ui_schema_dao.ts
rename to packages/plugin-ui-schema-storage/src/dao/ui_schema_dao.ts
diff --git a/packages/plugin-ui-schema/src/dao/ui_schema_node_dao.ts b/packages/plugin-ui-schema-storage/src/dao/ui_schema_node_dao.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/dao/ui_schema_node_dao.ts
rename to packages/plugin-ui-schema-storage/src/dao/ui_schema_node_dao.ts
diff --git a/packages/plugin-ui-schema/src/helper.ts b/packages/plugin-ui-schema-storage/src/helper.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/helper.ts
rename to packages/plugin-ui-schema-storage/src/helper.ts
diff --git a/packages/plugin-ui-schema/src/index.ts b/packages/plugin-ui-schema-storage/src/index.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/index.ts
rename to packages/plugin-ui-schema-storage/src/index.ts
diff --git a/packages/plugin-ui-schema/src/model.ts b/packages/plugin-ui-schema-storage/src/model.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/model.ts
rename to packages/plugin-ui-schema-storage/src/model.ts
diff --git a/packages/plugin-ui-schema/src/repository.ts b/packages/plugin-ui-schema-storage/src/repository.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/repository.ts
rename to packages/plugin-ui-schema-storage/src/repository.ts
diff --git a/packages/plugin-ui-schema/src/server.ts b/packages/plugin-ui-schema-storage/src/server.ts
similarity index 100%
rename from packages/plugin-ui-schema/src/server.ts
rename to packages/plugin-ui-schema-storage/src/server.ts
diff --git a/packages/plugin-ui-schema/tsconfig.build.json b/packages/plugin-ui-schema-storage/tsconfig.build.json
similarity index 100%
rename from packages/plugin-ui-schema/tsconfig.build.json
rename to packages/plugin-ui-schema-storage/tsconfig.build.json
diff --git a/packages/plugin-ui-schema/tsconfig.json b/packages/plugin-ui-schema-storage/tsconfig.json
similarity index 100%
rename from packages/plugin-ui-schema/tsconfig.json
rename to packages/plugin-ui-schema-storage/tsconfig.json