diff --git a/packages/memory-driver-duckdb/README.md b/packages/drizzle-duckdb-wasm/README.md
similarity index 100%
rename from packages/memory-driver-duckdb/README.md
rename to packages/drizzle-duckdb-wasm/README.md
diff --git a/packages/memory-driver-duckdb/drizzle.config.ts b/packages/drizzle-duckdb-wasm/drizzle.config.ts
similarity index 100%
rename from packages/memory-driver-duckdb/drizzle.config.ts
rename to packages/drizzle-duckdb-wasm/drizzle.config.ts
diff --git a/packages/memory-driver-duckdb/netlify.toml b/packages/drizzle-duckdb-wasm/netlify.toml
similarity index 100%
rename from packages/memory-driver-duckdb/netlify.toml
rename to packages/drizzle-duckdb-wasm/netlify.toml
diff --git a/packages/memory-driver-duckdb/package.json b/packages/drizzle-duckdb-wasm/package.json
similarity index 57%
rename from packages/memory-driver-duckdb/package.json
rename to packages/drizzle-duckdb-wasm/package.json
index a0032fd8c..a41b0b646 100644
--- a/packages/memory-driver-duckdb/package.json
+++ b/packages/drizzle-duckdb-wasm/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@proj-airi/memory-driver-duckdb",
+  "name": "@proj-airi/drizzle-duckdb-wasm",
   "type": "module",
   "version": "0.1.6",
   "private": true,
@@ -13,36 +13,31 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/moeru-ai/airi.git",
-    "directory": "packages/memory-driver-duckdb"
+    "directory": "packages/drizzle-duckdb-wasm"
   },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "node": "./dist/index.cjs"
     },
-    "./drizzle-orm": {
-      "types": "./dist/drizzle-orm/index.d.ts",
-      "import": "./dist/drizzle-orm/index.mjs",
-      "node": "./dist/drizzle-orm/index.cjs"
+    "./bundles/default-browser": {
+      "types": "./dist/bundles/default-browser.d.ts",
+      "import": "./dist/bundles/default-browser.mjs"
     },
-    "./drizzle-orm/bundles/default-browser": {
-      "types": "./dist/drizzle-orm/bundles/default-browser.d.ts",
-      "import": "./dist/drizzle-orm/bundles/default-browser.mjs"
+    "./bundles/default-node": {
+      "types": "./dist/bundles/default-node.d.ts",
+      "import": "./dist/bundles/default-node.mjs",
+      "node": "./dist/bundles/default-node.cjs"
     },
-    "./drizzle-orm/bundles/default-node": {
-      "types": "./dist/drizzle-orm/bundles/default-node.d.ts",
-      "import": "./dist/drizzle-orm/bundles/default-node.mjs",
-      "node": "./dist/drizzle-orm/bundles/default-node.cjs"
+    "./bundles/import-url-browser": {
+      "types": "./dist/bundles/import-url-browser.d.ts",
+      "import": "./dist/bundles/import-url-browser.mjs"
     },
-    "./drizzle-orm/bundles/import-url-browser": {
-      "types": "./dist/drizzle-orm/bundles/import-url-browser.d.ts",
-      "import": "./dist/drizzle-orm/bundles/import-url-browser.mjs"
-    },
-    "./drizzle-orm/bundles/import-url-node": {
-      "types": "./dist/drizzle-orm/bundles/import-url-node.d.ts",
-      "import": "./dist/drizzle-orm/bundles/import-url-node.mjs",
-      "node": "./dist/drizzle-orm/bundles/import-url-node.cjs"
+    "./bundles/import-url-node": {
+      "types": "./dist/bundles/import-url-node.d.ts",
+      "import": "./dist/bundles/import-url-node.mjs",
+      "node": "./dist/bundles/import-url-node.cjs"
     }
   },
   "main": "./dist/index.cjs",
diff --git a/packages/memory-driver-duckdb/playground/db/schema.ts b/packages/drizzle-duckdb-wasm/playground/db/schema.ts
similarity index 100%
rename from packages/memory-driver-duckdb/playground/db/schema.ts
rename to packages/drizzle-duckdb-wasm/playground/db/schema.ts
diff --git a/packages/memory-driver-duckdb/playground/drizzle/0000_cute_kulan_gath.sql b/packages/drizzle-duckdb-wasm/playground/drizzle/0000_cute_kulan_gath.sql
similarity index 100%
rename from packages/memory-driver-duckdb/playground/drizzle/0000_cute_kulan_gath.sql
rename to packages/drizzle-duckdb-wasm/playground/drizzle/0000_cute_kulan_gath.sql
diff --git a/packages/memory-driver-duckdb/playground/drizzle/meta/0000_snapshot.json b/packages/drizzle-duckdb-wasm/playground/drizzle/meta/0000_snapshot.json
similarity index 100%
rename from packages/memory-driver-duckdb/playground/drizzle/meta/0000_snapshot.json
rename to packages/drizzle-duckdb-wasm/playground/drizzle/meta/0000_snapshot.json
diff --git a/packages/memory-driver-duckdb/playground/drizzle/meta/_journal.json b/packages/drizzle-duckdb-wasm/playground/drizzle/meta/_journal.json
similarity index 100%
rename from packages/memory-driver-duckdb/playground/drizzle/meta/_journal.json
rename to packages/drizzle-duckdb-wasm/playground/drizzle/meta/_journal.json
diff --git a/packages/memory-driver-duckdb/playground/index.html b/packages/drizzle-duckdb-wasm/playground/index.html
similarity index 100%
rename from packages/memory-driver-duckdb/playground/index.html
rename to packages/drizzle-duckdb-wasm/playground/index.html
diff --git a/packages/memory-driver-duckdb/playground/public/favicon-96x96.png b/packages/drizzle-duckdb-wasm/playground/public/favicon-96x96.png
similarity index 100%
rename from packages/memory-driver-duckdb/playground/public/favicon-96x96.png
rename to packages/drizzle-duckdb-wasm/playground/public/favicon-96x96.png
diff --git a/packages/memory-driver-duckdb/playground/public/favicon.svg b/packages/drizzle-duckdb-wasm/playground/public/favicon.svg
similarity index 100%
rename from packages/memory-driver-duckdb/playground/public/favicon.svg
rename to packages/drizzle-duckdb-wasm/playground/public/favicon.svg
diff --git a/packages/memory-driver-duckdb/playground/src/App.vue b/packages/drizzle-duckdb-wasm/playground/src/App.vue
similarity index 95%
rename from packages/memory-driver-duckdb/playground/src/App.vue
rename to packages/drizzle-duckdb-wasm/playground/src/App.vue
index 9061bb20c..004e6c7cf 100644
--- a/packages/memory-driver-duckdb/playground/src/App.vue
+++ b/packages/drizzle-duckdb-wasm/playground/src/App.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { DuckDBWasmDrizzleDatabase } from '../../src/drizzle-orm'
+import type { DuckDBWasmDrizzleDatabase } from '../../src'
 
 import { useDebounceFn } from '@vueuse/core'
 import { serialize } from 'superjson'
 import { onMounted, onUnmounted, ref, watch } from 'vue'
 
-import { drizzle } from '../../src/drizzle-orm'
+import { drizzle } from '../../src'
 import * as schema from '../db/schema'
 import { users } from '../db/schema'
 import migration1 from '../drizzle/0000_cute_kulan_gath.sql?raw'
diff --git a/packages/memory-driver-duckdb/playground/src/main.ts b/packages/drizzle-duckdb-wasm/playground/src/main.ts
similarity index 100%
rename from packages/memory-driver-duckdb/playground/src/main.ts
rename to packages/drizzle-duckdb-wasm/playground/src/main.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/bundles/default-browser.ts b/packages/drizzle-duckdb-wasm/src/bundles/default-browser.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/bundles/default-browser.ts
rename to packages/drizzle-duckdb-wasm/src/bundles/default-browser.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/bundles/default-node.ts b/packages/drizzle-duckdb-wasm/src/bundles/default-node.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/bundles/default-node.ts
rename to packages/drizzle-duckdb-wasm/src/bundles/default-node.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/bundles/import-url-browser.ts b/packages/drizzle-duckdb-wasm/src/bundles/import-url-browser.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/bundles/import-url-browser.ts
rename to packages/drizzle-duckdb-wasm/src/bundles/import-url-browser.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/bundles/import-url-node.ts b/packages/drizzle-duckdb-wasm/src/bundles/import-url-node.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/bundles/import-url-node.ts
rename to packages/drizzle-duckdb-wasm/src/bundles/import-url-node.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-common.ts b/packages/drizzle-duckdb-wasm/src/dialect/duckdb-common.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-common.ts
rename to packages/drizzle-duckdb-wasm/src/dialect/duckdb-common.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-format.ts b/packages/drizzle-duckdb-wasm/src/dialect/duckdb-format.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-format.ts
rename to packages/drizzle-duckdb-wasm/src/dialect/duckdb-format.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-types.ts b/packages/drizzle-duckdb-wasm/src/dialect/duckdb-types.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb-types.ts
rename to packages/drizzle-duckdb-wasm/src/dialect/duckdb-types.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb.ts b/packages/drizzle-duckdb-wasm/src/dialect/duckdb.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/dialect/duckdb.ts
rename to packages/drizzle-duckdb-wasm/src/dialect/duckdb.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/dialect/index.ts b/packages/drizzle-duckdb-wasm/src/dialect/index.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/dialect/index.ts
rename to packages/drizzle-duckdb-wasm/src/dialect/index.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/driver.ts b/packages/drizzle-duckdb-wasm/src/driver.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/driver.ts
rename to packages/drizzle-duckdb-wasm/src/driver.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/index.test.ts b/packages/drizzle-duckdb-wasm/src/index.test.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/index.test.ts
rename to packages/drizzle-duckdb-wasm/src/index.test.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/index.ts b/packages/drizzle-duckdb-wasm/src/index.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/index.ts
rename to packages/drizzle-duckdb-wasm/src/index.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/migrator.ts b/packages/drizzle-duckdb-wasm/src/migrator.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/migrator.ts
rename to packages/drizzle-duckdb-wasm/src/migrator.ts
diff --git a/packages/memory-driver-duckdb/src/drizzle-orm/session.ts b/packages/drizzle-duckdb-wasm/src/session.ts
similarity index 100%
rename from packages/memory-driver-duckdb/src/drizzle-orm/session.ts
rename to packages/drizzle-duckdb-wasm/src/session.ts
diff --git a/packages/memory-driver-duckdb/tsconfig.json b/packages/drizzle-duckdb-wasm/tsconfig.json
similarity index 100%
rename from packages/memory-driver-duckdb/tsconfig.json
rename to packages/drizzle-duckdb-wasm/tsconfig.json
diff --git a/packages/memory-driver-duckdb/uno.config.ts b/packages/drizzle-duckdb-wasm/uno.config.ts
similarity index 100%
rename from packages/memory-driver-duckdb/uno.config.ts
rename to packages/drizzle-duckdb-wasm/uno.config.ts
diff --git a/packages/memory-driver-duckdb/vite.config.ts b/packages/drizzle-duckdb-wasm/vite.config.ts
similarity index 100%
rename from packages/memory-driver-duckdb/vite.config.ts
rename to packages/drizzle-duckdb-wasm/vite.config.ts
diff --git a/packages/memory-driver-duckdb/src/index.ts b/packages/memory-driver-duckdb/src/index.ts
deleted file mode 100644
index cfe153bd1..000000000
--- a/packages/memory-driver-duckdb/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-console.warn('Please import @proj-airi/memory-driver-duckdb/drizzle-orm instead')
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1a84e33ea..7eecb5702 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -144,7 +144,7 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
 
-  packages/memory-driver-duckdb:
+  packages/memory-driver-duckdb-wasm:
     dependencies:
       '@date-fns/tz':
         specifier: ^1.2.0
@@ -1032,7 +1032,7 @@ importers:
         version: 1.35.0
       '@gcornut/valibot-json-schema':
         specifier: ^0.42.0
-        version: 0.42.0(esbuild@0.25.0)(typescript@5.7.3)
+        version: 0.42.0(esbuild@0.19.12)(typescript@5.7.3)
       '@grammyjs/files':
         specifier: ^1.1.1
         version: 1.1.1(grammy@1.34.1(encoding@0.1.13))
@@ -1041,7 +1041,7 @@ importers:
         version: 1.0.7
       '@typeschema/valibot':
         specifier: ^0.14.0
-        version: 0.14.0(@gcornut/valibot-json-schema@0.42.0(esbuild@0.25.0)(typescript@5.7.3))(@types/json-schema@7.0.15)(valibot@1.0.0-beta.9(typescript@5.7.3))
+        version: 0.14.0(@gcornut/valibot-json-schema@0.42.0(esbuild@0.19.12)(typescript@5.7.3))(@types/json-schema@7.0.15)(valibot@1.0.0-beta.9(typescript@5.7.3))
       '@xsai/generate-text':
         specifier: 'catalog:'
         version: 0.1.0-beta.2
@@ -10114,10 +10114,6 @@ packages:
     resolution: {integrity: sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==}
     engines: {node: '>= 8.0'}
 
-  superjson@2.2.1:
-    resolution: {integrity: sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==}
-    engines: {node: '>=16'}
-
   superjson@2.2.2:
     resolution: {integrity: sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==}
     engines: {node: '>=16'}
@@ -13094,6 +13090,16 @@ snapshots:
 
   '@formkit/auto-animate@0.8.2': {}
 
+  '@gcornut/valibot-json-schema@0.42.0(esbuild@0.19.12)(typescript@5.7.3)':
+    dependencies:
+      valibot: 0.42.1(typescript@5.7.3)
+    optionalDependencies:
+      '@types/json-schema': 7.0.15
+      esbuild-runner: 2.2.2(esbuild@0.19.12)
+    transitivePeerDependencies:
+      - esbuild
+      - typescript
+
   '@gcornut/valibot-json-schema@0.42.0(esbuild@0.25.0)(typescript@5.7.3)':
     dependencies:
       valibot: 0.42.1(typescript@5.7.3)
@@ -14605,11 +14611,20 @@ snapshots:
     dependencies:
       '@typeschema/core': 0.14.0(@types/json-schema@7.0.15)
     optionalDependencies:
-      '@typeschema/valibot': 0.14.0(@gcornut/valibot-json-schema@0.42.0(esbuild@0.25.0)(typescript@5.7.3))(@types/json-schema@7.0.15)(valibot@1.0.0-beta.9(typescript@5.7.3))
+      '@typeschema/valibot': 0.14.0(@gcornut/valibot-json-schema@0.42.0(esbuild@0.19.12)(typescript@5.7.3))(@types/json-schema@7.0.15)(valibot@1.0.0-beta.9(typescript@5.7.3))
       '@typeschema/zod': 0.14.0(@types/json-schema@7.0.15)(zod-to-json-schema@3.24.1(zod@3.24.1))(zod@3.24.1)
     transitivePeerDependencies:
       - '@types/json-schema'
 
+  '@typeschema/valibot@0.14.0(@gcornut/valibot-json-schema@0.42.0(esbuild@0.19.12)(typescript@5.7.3))(@types/json-schema@7.0.15)(valibot@1.0.0-beta.9(typescript@5.7.3))':
+    dependencies:
+      '@typeschema/core': 0.14.0(@types/json-schema@7.0.15)
+    optionalDependencies:
+      '@gcornut/valibot-json-schema': 0.42.0(esbuild@0.19.12)(typescript@5.7.3)
+      valibot: 1.0.0-beta.9(typescript@5.7.3)
+    transitivePeerDependencies:
+      - '@types/json-schema'
+
   '@typeschema/valibot@0.14.0(@gcornut/valibot-json-schema@0.42.0(esbuild@0.25.0)(typescript@5.7.3))(@types/json-schema@7.0.15)(valibot@1.0.0-beta.9(typescript@5.7.3))':
     dependencies:
       '@typeschema/core': 0.14.0(@types/json-schema@7.0.15)
@@ -15351,7 +15366,7 @@ snapshots:
       mitt: 3.0.1
       perfect-debounce: 1.0.0
       speakingurl: 14.0.1
-      superjson: 2.2.1
+      superjson: 2.2.2
 
   '@vue/devtools-shared@7.7.1':
     dependencies:
@@ -17221,6 +17236,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  esbuild-runner@2.2.2(esbuild@0.19.12):
+    dependencies:
+      esbuild: 0.19.12
+      source-map-support: 0.5.21
+      tslib: 2.4.0
+    optional: true
+
   esbuild-runner@2.2.2(esbuild@0.25.0):
     dependencies:
       esbuild: 0.25.0
@@ -22162,10 +22184,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  superjson@2.2.1:
-    dependencies:
-      copy-anything: 3.0.5
-
   superjson@2.2.2:
     dependencies:
       copy-anything: 3.0.5