diff --git a/packages/components/CHANGELOG.md b/modules/components/CHANGELOG.md
similarity index 100%
rename from packages/components/CHANGELOG.md
rename to modules/components/CHANGELOG.md
diff --git a/packages/components/build.config.ts b/modules/components/build.config.ts
similarity index 100%
rename from packages/components/build.config.ts
rename to modules/components/build.config.ts
diff --git a/packages/components/module.js b/modules/components/module.js
similarity index 100%
rename from packages/components/module.js
rename to modules/components/module.js
diff --git a/packages/components/package.json b/modules/components/package.json
similarity index 100%
rename from packages/components/package.json
rename to modules/components/package.json
diff --git a/packages/components/src/loader.ts b/modules/components/src/loader.ts
similarity index 100%
rename from packages/components/src/loader.ts
rename to modules/components/src/loader.ts
diff --git a/packages/components/src/module.ts b/modules/components/src/module.ts
similarity index 100%
rename from packages/components/src/module.ts
rename to modules/components/src/module.ts
diff --git a/packages/components/src/runtime/components.tmpl.mjs b/modules/components/src/runtime/components.tmpl.mjs
similarity index 100%
rename from packages/components/src/runtime/components.tmpl.mjs
rename to modules/components/src/runtime/components.tmpl.mjs
diff --git a/packages/components/src/scan.ts b/modules/components/src/scan.ts
similarity index 100%
rename from packages/components/src/scan.ts
rename to modules/components/src/scan.ts
diff --git a/packages/components/src/types.ts b/modules/components/src/types.ts
similarity index 100%
rename from packages/components/src/types.ts
rename to modules/components/src/types.ts
diff --git a/packages/global-imports/build.config.ts b/modules/global-imports/build.config.ts
similarity index 100%
rename from packages/global-imports/build.config.ts
rename to modules/global-imports/build.config.ts
diff --git a/packages/global-imports/module.js b/modules/global-imports/module.js
similarity index 100%
rename from packages/global-imports/module.js
rename to modules/global-imports/module.js
diff --git a/packages/global-imports/package.json b/modules/global-imports/package.json
similarity index 100%
rename from packages/global-imports/package.json
rename to modules/global-imports/package.json
diff --git a/packages/global-imports/src/identifiers.ts b/modules/global-imports/src/identifiers.ts
similarity index 100%
rename from packages/global-imports/src/identifiers.ts
rename to modules/global-imports/src/identifiers.ts
diff --git a/packages/global-imports/src/module.ts b/modules/global-imports/src/module.ts
similarity index 100%
rename from packages/global-imports/src/module.ts
rename to modules/global-imports/src/module.ts
diff --git a/packages/global-imports/src/transform.ts b/modules/global-imports/src/transform.ts
similarity index 100%
rename from packages/global-imports/src/transform.ts
rename to modules/global-imports/src/transform.ts
diff --git a/packages/global-imports/src/types.ts b/modules/global-imports/src/types.ts
similarity index 100%
rename from packages/global-imports/src/types.ts
rename to modules/global-imports/src/types.ts
diff --git a/packages/global-imports/test/build.test.ts b/modules/global-imports/test/build.test.ts
similarity index 100%
rename from packages/global-imports/test/build.test.ts
rename to modules/global-imports/test/build.test.ts
diff --git a/packages/meta/build.config.ts b/modules/meta/build.config.ts
similarity index 100%
rename from packages/meta/build.config.ts
rename to modules/meta/build.config.ts
diff --git a/packages/meta/module.js b/modules/meta/module.js
similarity index 100%
rename from packages/meta/module.js
rename to modules/meta/module.js
diff --git a/packages/meta/package.json b/modules/meta/package.json
similarity index 100%
rename from packages/meta/package.json
rename to modules/meta/package.json
diff --git a/packages/meta/src/module.ts b/modules/meta/src/module.ts
similarity index 100%
rename from packages/meta/src/module.ts
rename to modules/meta/src/module.ts
diff --git a/packages/meta/src/runtime/components.ts b/modules/meta/src/runtime/components.ts
similarity index 100%
rename from packages/meta/src/runtime/components.ts
rename to modules/meta/src/runtime/components.ts
diff --git a/packages/meta/src/runtime/composables.ts b/modules/meta/src/runtime/composables.ts
similarity index 100%
rename from packages/meta/src/runtime/composables.ts
rename to modules/meta/src/runtime/composables.ts
diff --git a/packages/meta/src/runtime/index.ts b/modules/meta/src/runtime/index.ts
similarity index 100%
rename from packages/meta/src/runtime/index.ts
rename to modules/meta/src/runtime/index.ts
diff --git a/packages/meta/src/runtime/lib/vue-meta.plugin.ts b/modules/meta/src/runtime/lib/vue-meta.plugin.ts
similarity index 100%
rename from packages/meta/src/runtime/lib/vue-meta.plugin.ts
rename to modules/meta/src/runtime/lib/vue-meta.plugin.ts
diff --git a/packages/meta/src/runtime/lib/vueuse-head.plugin.ts b/modules/meta/src/runtime/lib/vueuse-head.plugin.ts
similarity index 100%
rename from packages/meta/src/runtime/lib/vueuse-head.plugin.ts
rename to modules/meta/src/runtime/lib/vueuse-head.plugin.ts
diff --git a/packages/meta/src/runtime/plugin.ts b/modules/meta/src/runtime/plugin.ts
similarity index 100%
rename from packages/meta/src/runtime/plugin.ts
rename to modules/meta/src/runtime/plugin.ts
diff --git a/packages/meta/types.d.ts b/modules/meta/types.d.ts
similarity index 100%
rename from packages/meta/types.d.ts
rename to modules/meta/types.d.ts
diff --git a/packages/pages/CHANGELOG.md b/modules/pages/CHANGELOG.md
similarity index 100%
rename from packages/pages/CHANGELOG.md
rename to modules/pages/CHANGELOG.md
diff --git a/packages/pages/build.config.ts b/modules/pages/build.config.ts
similarity index 100%
rename from packages/pages/build.config.ts
rename to modules/pages/build.config.ts
diff --git a/packages/pages/module.js b/modules/pages/module.js
similarity index 100%
rename from packages/pages/module.js
rename to modules/pages/module.js
diff --git a/packages/pages/package.json b/modules/pages/package.json
similarity index 100%
rename from packages/pages/package.json
rename to modules/pages/package.json
diff --git a/packages/pages/src/module.ts b/modules/pages/src/module.ts
similarity index 100%
rename from packages/pages/src/module.ts
rename to modules/pages/src/module.ts
diff --git a/packages/pages/src/runtime/app.vue b/modules/pages/src/runtime/app.vue
similarity index 100%
rename from packages/pages/src/runtime/app.vue
rename to modules/pages/src/runtime/app.vue
diff --git a/packages/pages/src/runtime/layout.ts b/modules/pages/src/runtime/layout.ts
similarity index 100%
rename from packages/pages/src/runtime/layout.ts
rename to modules/pages/src/runtime/layout.ts
diff --git a/packages/pages/src/runtime/page.vue b/modules/pages/src/runtime/page.vue
similarity index 100%
rename from packages/pages/src/runtime/page.vue
rename to modules/pages/src/runtime/page.vue
diff --git a/packages/pages/src/runtime/router.ts b/modules/pages/src/runtime/router.ts
similarity index 100%
rename from packages/pages/src/runtime/router.ts
rename to modules/pages/src/runtime/router.ts
diff --git a/packages/pages/src/utils.ts b/modules/pages/src/utils.ts
similarity index 100%
rename from packages/pages/src/utils.ts
rename to modules/pages/src/utils.ts
diff --git a/package.json b/package.json
index 88e7526e9c..0ec3575fb9 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "license": "MIT",
   "workspaces": [
     "packages/*",
+    "modules/*",
     "examples/*",
     "playground"
   ],
@@ -21,7 +22,7 @@
     "test": "yarn lint && yarn test:presets",
     "test:presets": "mocha test/presets/*.mjs",
     "test:compat": "TEST_COMPAT=1 yarn test:presets",
-    "test:unit": "mocha -r jiti/register packages/**/test/*.test.*",
+    "test:unit": "mocha -r jiti/register {packages,modules}/**/test/*.test.*",
     "version": "yarn && git add yarn.lock"
   },
   "resolutions": {
diff --git a/scripts/release-edge.sh b/scripts/release-edge.sh
index 95933556e2..a1184f39ca 100755
--- a/scripts/release-edge.sh
+++ b/scripts/release-edge.sh
@@ -21,7 +21,7 @@ if [[ ! -z ${NODE_AUTH_TOKEN} ]] ; then
 fi
 
 # Release packages
-for p in packages/* ; do
+for p in {packages,modules}/* ; do
   pushd $p
   echo "Publishing $p"
   yarn npm publish --access public --tolerate-republish
diff --git a/tsconfig.json b/tsconfig.json
index c45ffb4252..a042167bc9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,5 +17,8 @@
       "@nuxt/nitro"
     ]
   },
-  "exclude": ["./packages/*/dist/*"]
+  "exclude": [
+    "./packages/*/dist/*",
+    "./modules/*/dist/*"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index bcc4b4d551..3451e6e8d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1291,9 +1291,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@nuxt/component-discovery@^0.2.0, @nuxt/component-discovery@workspace:packages/components":
+"@nuxt/component-discovery@^0.2.0, @nuxt/component-discovery@workspace:modules/components":
   version: 0.0.0-use.local
-  resolution: "@nuxt/component-discovery@workspace:packages/components"
+  resolution: "@nuxt/component-discovery@workspace:modules/components"
   dependencies:
     "@nuxt/kit": ^0.6.4
     globby: ^11.0.4
@@ -1335,9 +1335,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nuxt/global-imports@^0.1.0, @nuxt/global-imports@workspace:packages/global-imports":
+"@nuxt/global-imports@^0.1.0, @nuxt/global-imports@workspace:modules/global-imports":
   version: 0.0.0-use.local
-  resolution: "@nuxt/global-imports@workspace:packages/global-imports"
+  resolution: "@nuxt/global-imports@workspace:modules/global-imports"
   dependencies:
     "@nuxt/kit": ^0.6.4
     ufo: ^0.7.7
@@ -1369,9 +1369,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@nuxt/meta@^0.1.0, @nuxt/meta@workspace:packages/meta":
+"@nuxt/meta@^0.1.0, @nuxt/meta@workspace:modules/meta":
   version: 0.0.0-use.local
-  resolution: "@nuxt/meta@workspace:packages/meta"
+  resolution: "@nuxt/meta@workspace:modules/meta"
   dependencies:
     "@nuxt/kit": ^0.6.4
     "@vueuse/head": ^0.6.0
@@ -1454,9 +1454,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@nuxt/pages@^0.3.0, @nuxt/pages@workspace:packages/pages":
+"@nuxt/pages@^0.3.0, @nuxt/pages@workspace:modules/pages":
   version: 0.0.0-use.local
-  resolution: "@nuxt/pages@workspace:packages/pages"
+  resolution: "@nuxt/pages@workspace:modules/pages"
   dependencies:
     "@nuxt/kit": ^0.6.4
     globby: ^11.0.4