diff --git a/README.md b/README.md
index 33c5774d..ad6bcdf0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [POC] Build Next.js app for cf workers
 
-This monorepo includes a POC to see if it is possible to get a Next.js application built via `next build` (in standalone mode) to run in the Cloudflare workerd runtime.
+This monorepo includes a package for adapting a Next.js application built via `next build` (in standalone mode) to run in the Cloudflare workerd runtime.
 
 > [!NOTE]
 > The code here is built based on the amazing work done by @mhart in <https://github.com/mhart/nextjs-commerce>
@@ -9,8 +9,8 @@ This monorepo includes a POC to see if it is possible to get a Next.js applicati
 
 The repository contains two directories:
 
-- `builder` containing a package that can be used to build Cloudflare workers compatible output from Next.js applications
-- `examples` containing Next.js applications that use the above mentioned builder.
+- `packages` containing a cloudflare package that can be used to build Cloudflare workers compatible output from Next.js applications
+- `examples` containing Next.js applications that use the above mentioned cloudflare.
 
 ## How to try out/develop in the repository
 
@@ -23,13 +23,13 @@ pnpm i
 build the worker with:
 
 ```sh
-pnpm --filter builder build
+pnpm --filter cloudflare build
 ```
 
 or in watch mode with:
 
 ```sh
-pnpm --filter builder build:watch
+pnpm --filter cloudflare build:watch
 ```
 
 build and preview the worker for the `api` application:
diff --git a/TODO.md b/TODO.md
index 3d05401d..37ba6fd0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -37,10 +37,10 @@ DONE:
   experimental_assets = { directory = ".worker-next/assets", binding = "ASSETS" }
   ```
 
-- Build the builder
+- Build the cloudflare builder
 
   ```sh
-  pnpm --filter builder build:watch
+  pnpm --filter cloudflare build:watch
   ```
 
 - To build for workers:
@@ -48,13 +48,13 @@ DONE:
   - Build the next app once:
 
     ```sh
-    node /path/to/poc-next/builder/dist/index.mjs && npx wrangler dev
+    node /path/to/poc-next/packages/cloudflare/dist/index.mjs && npx wrangler dev
     ```
 
   - Then you can skip building the next app
 
     ```sh
-    SKIP_NEXT_APP_BUILD=1 node /path/to/poc-next/builder/dist/index.mjs && npx wrangler dev
+    SKIP_NEXT_APP_BUILD=1 node /path/to/poc-next/packages/cloudflare/dist/index.mjs && npx wrangler dev
     ```
 
 ## Open next [example app](https://github.com/sst/open-next/tree/main/example)
diff --git a/examples/create-next-app/package.json b/examples/create-next-app/package.json
index 4455553d..bf798661 100644
--- a/examples/create-next-app/package.json
+++ b/examples/create-next-app/package.json
@@ -7,7 +7,7 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "build:worker": "pnpm cloudflare",
+    "build:worker": "cloudflare",
     "dev:worker": "wrangler dev --port 8771",
     "preview:worker": "pnpm build:worker && pnpm dev:worker",
     "e2e": "playwright test -c e2e/playwright.config.ts"
diff --git a/builder/.gitignore b/packages/cloudflare/.gitignore
similarity index 100%
rename from builder/.gitignore
rename to packages/cloudflare/.gitignore
diff --git a/builder/README.md b/packages/cloudflare/README.md
similarity index 85%
rename from builder/README.md
rename to packages/cloudflare/README.md
index 423e7c8e..599d0322 100644
--- a/builder/README.md
+++ b/packages/cloudflare/README.md
@@ -1,8 +1,10 @@
 # Next.js builder for Cloudflare
 
+How to update a Next.js application to run on Cloudflare.
+
 ## Configure your app
 
-- add the following `devDependency` to the `package.json`:
+- add the following `devDependencies` to the `package.json`:
 
   ```bash
   pnpm add -D wrangler@latest @opennextjs/cloudflare
diff --git a/builder/package.json b/packages/cloudflare/package.json
similarity index 95%
rename from builder/package.json
rename to packages/cloudflare/package.json
index b507f539..3cbd55fe 100644
--- a/builder/package.json
+++ b/packages/cloudflare/package.json
@@ -16,7 +16,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/flarelabs-net/poc-next.git",
-    "directory": "builder"
+    "directory": "packages/cloudflare"
   },
   "keywords": [
     "cloudflare",
diff --git a/builder/src/args.ts b/packages/cloudflare/src/args.ts
similarity index 100%
rename from builder/src/args.ts
rename to packages/cloudflare/src/args.ts
diff --git a/builder/src/build/build-next-app.ts b/packages/cloudflare/src/build/build-next-app.ts
similarity index 100%
rename from builder/src/build/build-next-app.ts
rename to packages/cloudflare/src/build/build-next-app.ts
diff --git a/builder/src/build/build-worker.ts b/packages/cloudflare/src/build/build-worker.ts
similarity index 100%
rename from builder/src/build/build-worker.ts
rename to packages/cloudflare/src/build/build-worker.ts
diff --git a/builder/src/build/build.ts b/packages/cloudflare/src/build/build.ts
similarity index 100%
rename from builder/src/build/build.ts
rename to packages/cloudflare/src/build/build.ts
diff --git a/builder/src/build/patches/investigated/copy-templates.ts b/packages/cloudflare/src/build/patches/investigated/copy-templates.ts
similarity index 100%
rename from builder/src/build/patches/investigated/copy-templates.ts
rename to packages/cloudflare/src/build/patches/investigated/copy-templates.ts
diff --git a/builder/src/build/patches/investigated/patch-require.ts b/packages/cloudflare/src/build/patches/investigated/patch-require.ts
similarity index 100%
rename from builder/src/build/patches/investigated/patch-require.ts
rename to packages/cloudflare/src/build/patches/investigated/patch-require.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.test.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.test.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.test.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.test.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.test.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.test.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.test.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.test.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/index.ts b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/index.ts
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/index.ts
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/index.ts
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/minified-webpacks-file.js b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/minified-webpacks-file.js
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/minified-webpacks-file.js
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/minified-webpacks-file.js
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/unminified-webpacks-file.js b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/unminified-webpacks-file.js
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/unminified-webpacks-file.js
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-fixtures/unminified-webpacks-file.js
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/minified-webpacks-file.js b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/minified-webpacks-file.js
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/minified-webpacks-file.js
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/minified-webpacks-file.js
diff --git a/builder/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/unminified-webpacks-file.js b/packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/unminified-webpacks-file.js
similarity index 100%
rename from builder/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/unminified-webpacks-file.js
rename to packages/cloudflare/src/build/patches/investigated/update-webpack-chunks-file/test-snapshots/unminified-webpacks-file.js
diff --git a/builder/src/build/patches/to-investigate/inline-eval-manifest.ts b/packages/cloudflare/src/build/patches/to-investigate/inline-eval-manifest.ts
similarity index 100%
rename from builder/src/build/patches/to-investigate/inline-eval-manifest.ts
rename to packages/cloudflare/src/build/patches/to-investigate/inline-eval-manifest.ts
diff --git a/builder/src/build/patches/to-investigate/inline-next-require.ts b/packages/cloudflare/src/build/patches/to-investigate/inline-next-require.ts
similarity index 100%
rename from builder/src/build/patches/to-investigate/inline-next-require.ts
rename to packages/cloudflare/src/build/patches/to-investigate/inline-next-require.ts
diff --git a/builder/src/build/patches/to-investigate/patch-find-dir.ts b/packages/cloudflare/src/build/patches/to-investigate/patch-find-dir.ts
similarity index 100%
rename from builder/src/build/patches/to-investigate/patch-find-dir.ts
rename to packages/cloudflare/src/build/patches/to-investigate/patch-find-dir.ts
diff --git a/builder/src/build/patches/to-investigate/patch-read-file.ts b/packages/cloudflare/src/build/patches/to-investigate/patch-read-file.ts
similarity index 100%
rename from builder/src/build/patches/to-investigate/patch-read-file.ts
rename to packages/cloudflare/src/build/patches/to-investigate/patch-read-file.ts
diff --git a/builder/src/build/patches/to-investigate/wrangler-deps.ts b/packages/cloudflare/src/build/patches/to-investigate/wrangler-deps.ts
similarity index 100%
rename from builder/src/build/patches/to-investigate/wrangler-deps.ts
rename to packages/cloudflare/src/build/patches/to-investigate/wrangler-deps.ts
diff --git a/builder/src/build/utils/index.ts b/packages/cloudflare/src/build/utils/index.ts
similarity index 100%
rename from builder/src/build/utils/index.ts
rename to packages/cloudflare/src/build/utils/index.ts
diff --git a/builder/src/build/utils/ts-parse-file.ts b/packages/cloudflare/src/build/utils/ts-parse-file.ts
similarity index 100%
rename from builder/src/build/utils/ts-parse-file.ts
rename to packages/cloudflare/src/build/utils/ts-parse-file.ts
diff --git a/builder/src/index.ts b/packages/cloudflare/src/index.ts
similarity index 100%
rename from builder/src/index.ts
rename to packages/cloudflare/src/index.ts
diff --git a/builder/src/nextjs-paths.ts b/packages/cloudflare/src/nextjs-paths.ts
similarity index 100%
rename from builder/src/nextjs-paths.ts
rename to packages/cloudflare/src/nextjs-paths.ts
diff --git a/builder/src/templates/shims/empty.ts b/packages/cloudflare/src/templates/shims/empty.ts
similarity index 100%
rename from builder/src/templates/shims/empty.ts
rename to packages/cloudflare/src/templates/shims/empty.ts
diff --git a/builder/src/templates/shims/env.ts b/packages/cloudflare/src/templates/shims/env.ts
similarity index 100%
rename from builder/src/templates/shims/env.ts
rename to packages/cloudflare/src/templates/shims/env.ts
diff --git a/builder/src/templates/shims/node-fs.ts b/packages/cloudflare/src/templates/shims/node-fs.ts
similarity index 100%
rename from builder/src/templates/shims/node-fs.ts
rename to packages/cloudflare/src/templates/shims/node-fs.ts
diff --git a/builder/src/templates/shims/throw.ts b/packages/cloudflare/src/templates/shims/throw.ts
similarity index 100%
rename from builder/src/templates/shims/throw.ts
rename to packages/cloudflare/src/templates/shims/throw.ts
diff --git a/builder/src/templates/worker.ts b/packages/cloudflare/src/templates/worker.ts
similarity index 100%
rename from builder/src/templates/worker.ts
rename to packages/cloudflare/src/templates/worker.ts
diff --git a/builder/tsconfig.json b/packages/cloudflare/tsconfig.json
similarity index 100%
rename from builder/tsconfig.json
rename to packages/cloudflare/tsconfig.json
diff --git a/builder/tsup.config.ts b/packages/cloudflare/tsup.config.ts
similarity index 100%
rename from builder/tsup.config.ts
rename to packages/cloudflare/tsup.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 47306c42..09578f1e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -66,31 +66,6 @@ importers:
         specifier: 3.3.3
         version: 3.3.3
 
-  builder:
-    dependencies:
-      ts-morph:
-        specifier: 'catalog:'
-        version: 23.0.0
-    devDependencies:
-      '@types/node':
-        specifier: 'catalog:'
-        version: 22.2.0
-      esbuild:
-        specifier: 'catalog:'
-        version: 0.23.1
-      glob:
-        specifier: 'catalog:'
-        version: 11.0.0
-      tsup:
-        specifier: 'catalog:'
-        version: 8.2.4(jiti@1.21.6)(postcss@8.4.47)(tsx@4.17.0)(typescript@5.5.4)(yaml@2.5.1)
-      typescript:
-        specifier: 'catalog:'
-        version: 5.5.4
-      vitest:
-        specifier: 'catalog:'
-        version: 2.1.1(@types/node@22.2.0)
-
   examples/api:
     dependencies:
       next:
@@ -105,7 +80,7 @@ importers:
     devDependencies:
       '@opennextjs/cloudflare':
         specifier: workspace:*
-        version: link:../../builder
+        version: link:../../packages/cloudflare
       '@playwright/test':
         specifier: 'catalog:'
         version: 1.47.0
@@ -130,7 +105,7 @@ importers:
     devDependencies:
       '@opennextjs/cloudflare':
         specifier: workspace:*
-        version: link:../../builder
+        version: link:../../packages/cloudflare
       '@playwright/test':
         specifier: 'catalog:'
         version: 1.47.0
@@ -162,6 +137,31 @@ importers:
         specifier: 'catalog:'
         version: 3.78.6(@cloudflare/workers-types@4.20240909.0)
 
+  packages/cloudflare:
+    dependencies:
+      ts-morph:
+        specifier: 'catalog:'
+        version: 23.0.0
+    devDependencies:
+      '@types/node':
+        specifier: 'catalog:'
+        version: 22.2.0
+      esbuild:
+        specifier: 'catalog:'
+        version: 0.23.1
+      glob:
+        specifier: 'catalog:'
+        version: 11.0.0
+      tsup:
+        specifier: 'catalog:'
+        version: 8.2.4(jiti@1.21.6)(postcss@8.4.47)(tsx@4.17.0)(typescript@5.5.4)(yaml@2.5.1)
+      typescript:
+        specifier: 'catalog:'
+        version: 5.5.4
+      vitest:
+        specifier: 'catalog:'
+        version: 2.1.1(@types/node@22.2.0)
+
 packages:
 
   '@alloc/quick-lru@5.2.0':
@@ -3881,8 +3881,8 @@ snapshots:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.4)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.0)
+      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)
       eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.0)
       eslint-plugin-react: 7.36.1(eslint@8.57.0)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
@@ -3901,37 +3901,37 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0):
+  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.0):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.3.6
       enhanced-resolve: 5.17.1
       eslint: 8.57.0
-      eslint-module-utils: 2.11.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.11.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.8.0
       is-bun-module: 1.2.1
       is-glob: 4.0.3
     optionalDependencies:
-      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)
     transitivePeerDependencies:
       - '@typescript-eslint/parser'
       - eslint-import-resolver-node
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.11.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
+  eslint-module-utils@2.11.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.4)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.0)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
+  eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.8
@@ -3942,7 +3942,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.11.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.11.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.15.1
       is-glob: 4.0.3
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index edf9e9a5..38c8e766 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,5 @@
 packages:
-  - "builder"
+  - "packages/*"
   - "examples/*"
 
 catalog: