diff --git a/packages/nuqs/.gitignore b/packages/nuqs/.gitignore
index ddb5807a2..f1da60639 100644
--- a/packages/nuqs/.gitignore
+++ b/packages/nuqs/.gitignore
@@ -1 +1,3 @@
 size.json
+**/*.js
+**/*.d.ts
\ No newline at end of file
diff --git a/packages/nuqs/adapters/custom.d.ts b/packages/nuqs/adapters/custom.d.ts
deleted file mode 100644
index 92e0224bd..000000000
--- a/packages/nuqs/adapters/custom.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adapters/custom'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../dist/adapters/custom'
diff --git a/packages/nuqs/adapters/next.d.ts b/packages/nuqs/adapters/next.d.ts
deleted file mode 100644
index ec103aabc..000000000
--- a/packages/nuqs/adapters/next.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adpaters/next'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../dist/adapters/next'
diff --git a/packages/nuqs/adapters/next/app.d.ts b/packages/nuqs/adapters/next/app.d.ts
deleted file mode 100644
index 3ce2dc359..000000000
--- a/packages/nuqs/adapters/next/app.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adpaters/next/app'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../../dist/adapters/next/app'
diff --git a/packages/nuqs/adapters/next/pages.d.ts b/packages/nuqs/adapters/next/pages.d.ts
deleted file mode 100644
index 530f6f369..000000000
--- a/packages/nuqs/adapters/next/pages.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adpaters/next/pages'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../../dist/adapters/next/pages'
diff --git a/packages/nuqs/adapters/react-router.d.ts b/packages/nuqs/adapters/react-router.d.ts
deleted file mode 100644
index c69e44506..000000000
--- a/packages/nuqs/adapters/react-router.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adapters/react-router'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-//
-// Note: this default react-router adapter is for react-router v6.
-// If you are using react-router v7, please import from `nuqs/adapters/react-router/v7`
-
-export * from '../dist/adapters/react-router'
diff --git a/packages/nuqs/adapters/react-router/v6.d.ts b/packages/nuqs/adapters/react-router/v6.d.ts
deleted file mode 100644
index 4986652a7..000000000
--- a/packages/nuqs/adapters/react-router/v6.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adapters/react-router/v6'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../../dist/adapters/react-router/v6'
diff --git a/packages/nuqs/adapters/react-router/v7.d.ts b/packages/nuqs/adapters/react-router/v7.d.ts
deleted file mode 100644
index 4bce83e91..000000000
--- a/packages/nuqs/adapters/react-router/v7.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adapters/react-router/v7'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../../dist/adapters/react-router/v7'
diff --git a/packages/nuqs/adapters/react.d.ts b/packages/nuqs/adapters/react.d.ts
deleted file mode 100644
index 1c9f9da13..000000000
--- a/packages/nuqs/adapters/react.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adapters/react'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../dist/adapters/react'
diff --git a/packages/nuqs/adapters/remix.d.ts b/packages/nuqs/adapters/remix.d.ts
deleted file mode 100644
index 8b2f2a256..000000000
--- a/packages/nuqs/adapters/remix.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adapters/remix'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../dist/adapters/remix'
diff --git a/packages/nuqs/adapters/testing.d.ts b/packages/nuqs/adapters/testing.d.ts
deleted file mode 100644
index 5e7194cec..000000000
--- a/packages/nuqs/adapters/testing.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/adpaters/testing'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from '../dist/adapters/testing'
diff --git a/packages/nuqs/package.json b/packages/nuqs/package.json
index d09fa0c42..abe860c49 100644
--- a/packages/nuqs/package.json
+++ b/packages/nuqs/package.json
@@ -33,81 +33,73 @@
     "provenance": true
   },
   "files": [
-    "dist/",
-    "server.d.ts",
-    "adapters/react.d.ts",
-    "adapters/next.d.ts",
-    "adapters/next/app.d.ts",
-    "adapters/next/pages.d.ts",
-    "adapters/remix.d.ts",
-    "adapters/react-router.d.ts",
-    "adapters/custom.d.ts",
-    "adapters/testing.d.ts",
-    "esm-only.cjs"
+    "esm-only.cjs",
+    "**/*.js",
+    "**/*.d.ts"
   ],
   "type": "module",
   "sideEffects": false,
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "module": "index.js",
+  "types": "index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
+      "types": "./index.d.ts",
+      "import": "./index.js",
       "require": "./esm-only.cjs"
     },
     "./server": {
-      "types": "./dist/server.d.ts",
-      "import": "./dist/server.js",
+      "types": "./server.d.ts",
+      "import": "./server.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/react": {
-      "types": "./dist/adapters/react.d.ts",
-      "import": "./dist/adapters/react.js",
+      "types": "./adapters/react.d.ts",
+      "import": "./adapters/react.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/next": {
-      "types": "./dist/adapters/next.d.ts",
-      "import": "./dist/adapters/next.js",
+      "types": "./adapters/next.d.ts",
+      "import": "./adapters/next.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/next/app": {
-      "types": "./dist/adapters/next/app.d.ts",
-      "import": "./dist/adapters/next/app.js",
+      "types": "./adapters/next/app.d.ts",
+      "import": "./adapters/next/app.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/next/pages": {
-      "types": "./dist/adapters/next/pages.d.ts",
-      "import": "./dist/adapters/next/pages.js",
+      "types": "./adapters/next/pages.d.ts",
+      "import": "./adapters/next/pages.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/remix": {
-      "types": "./dist/adapters/remix.d.ts",
-      "import": "./dist/adapters/remix.js",
+      "types": "./adapters/remix.d.ts",
+      "import": "./adapters/remix.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/react-router": {
-      "types": "./dist/adapters/react-router.d.ts",
-      "import": "./dist/adapters/react-router.js",
+      "types": "./adapters/react-router.d.ts",
+      "import": "./adapters/react-router.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/react-router/v6": {
-      "types": "./dist/adapters/react-router/v6.d.ts",
-      "import": "./dist/adapters/react-router/v6.js",
+      "types": "./adapters/react-router/v6.d.ts",
+      "import": "./adapters/react-router/v6.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/react-router/v7": {
-      "types": "./dist/adapters/react-router/v7.d.ts",
-      "import": "./dist/adapters/react-router/v7.js",
+      "types": "./adapters/react-router/v7.d.ts",
+      "import": "./adapters/react-router/v7.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/custom": {
-      "types": "./dist/adapters/custom.d.ts",
-      "import": "./dist/adapters/custom.js",
+      "types": "./adapters/custom.d.ts",
+      "import": "./adapters/custom.js",
       "require": "./esm-only.cjs"
     },
     "./adapters/testing": {
-      "types": "./dist/adapters/testing.d.ts",
-      "import": "./dist/adapters/testing.js",
+      "types": "./adapters/testing.d.ts",
+      "import": "./adapters/testing.js",
       "require": "./esm-only.cjs"
     }
   },
@@ -176,7 +168,7 @@
   "size-limit": [
     {
       "name": "Client",
-      "path": "dist/index.js",
+      "path": "index.js",
       "limit": "5 kB",
       "ignore": [
         "react",
@@ -185,7 +177,7 @@
     },
     {
       "name": "Server",
-      "path": "dist/server.js",
+      "path": "server.js",
       "limit": "2.5 kB",
       "ignore": [
         "react",
diff --git a/packages/nuqs/scripts/prepack.sh b/packages/nuqs/scripts/prepack.sh
index 08f84826d..024549768 100755
--- a/packages/nuqs/scripts/prepack.sh
+++ b/packages/nuqs/scripts/prepack.sh
@@ -13,8 +13,8 @@ VERSION=$(cat package.json | jq -r '.version')
 
 if [[ "$(uname)" == "Darwin" ]]; then
   # macOS requires an empty string as the backup extension
-  sed -i '' "s/0.0.0-inject-version-here/${VERSION}/g" dist/index.js
+  sed -i '' "s/0.0.0-inject-version-here/${VERSION}/g" index.js
 else
   # Ubuntu (CI/CD) doesn't
-  sed -i "s/0.0.0-inject-version-here/${VERSION}/g" dist/index.js
+  sed -i "s/0.0.0-inject-version-here/${VERSION}/g" index.js
 fi
diff --git a/packages/nuqs/server.d.ts b/packages/nuqs/server.d.ts
deleted file mode 100644
index 11f427311..000000000
--- a/packages/nuqs/server.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is needed for projects that have `moduleResolution` set to `node`
-// in their tsconfig.json to be able to `import {} from 'nuqs/server'`.
-// Other module resolutions strategies will look for the `exports` in `package.json`,
-// but with `node`, TypeScript will look for a .d.ts file with that name at the
-// root of the package.
-
-export * from './dist/server'
diff --git a/packages/nuqs/src/tests/cache.test-d.ts b/packages/nuqs/src/tests/cache.test-d.ts
index 16c53b14b..fbe670423 100644
--- a/packages/nuqs/src/tests/cache.test-d.ts
+++ b/packages/nuqs/src/tests/cache.test-d.ts
@@ -4,7 +4,7 @@ import {
   parseAsBoolean,
   parseAsInteger,
   parseAsString
-} from '../../dist/server'
+} from '../../server'
 
 {
   const cache = createSearchParamsCache({
diff --git a/packages/nuqs/src/tests/parsers.test-d.ts b/packages/nuqs/src/tests/parsers.test-d.ts
index 9087d45e2..da61b7622 100644
--- a/packages/nuqs/src/tests/parsers.test-d.ts
+++ b/packages/nuqs/src/tests/parsers.test-d.ts
@@ -1,6 +1,6 @@
 import { assert, type Equals } from 'tsafe'
 import { expectType } from 'tsd'
-import { parseAsInteger, parseAsString, type inferParserType } from '../../dist'
+import { parseAsInteger, parseAsString, type inferParserType } from '../..'
 
 {
   const p = parseAsString
diff --git a/packages/nuqs/src/tests/serializer.test-d.ts b/packages/nuqs/src/tests/serializer.test-d.ts
index 9e21cba17..cf0d3c2c8 100644
--- a/packages/nuqs/src/tests/serializer.test-d.ts
+++ b/packages/nuqs/src/tests/serializer.test-d.ts
@@ -1,5 +1,5 @@
 import { expectError, expectType } from 'tsd'
-import { createSerializer, parseAsInteger, parseAsString } from '../../dist'
+import { createSerializer, parseAsInteger, parseAsString } from '../..'
 
 // prettier-ignore
 {
diff --git a/packages/nuqs/src/tests/useQueryState.test-d.ts b/packages/nuqs/src/tests/useQueryState.test-d.ts
index 1fb9b5f3f..117d56b23 100644
--- a/packages/nuqs/src/tests/useQueryState.test-d.ts
+++ b/packages/nuqs/src/tests/useQueryState.test-d.ts
@@ -7,7 +7,7 @@ import {
   parseAsString,
   parseAsTimestamp,
   useQueryState
-} from '../../dist'
+} from '../..'
 
 // By default, queries have a `string` state, nullable (when no query parameter is present)
 {
diff --git a/packages/nuqs/src/tests/useQueryStates.test-d.ts b/packages/nuqs/src/tests/useQueryStates.test-d.ts
index 167261efd..8641a2b9d 100644
--- a/packages/nuqs/src/tests/useQueryStates.test-d.ts
+++ b/packages/nuqs/src/tests/useQueryStates.test-d.ts
@@ -6,7 +6,7 @@ import {
   parseAsIsoDateTime,
   parseAsString,
   useQueryStates
-} from '../../dist'
+} from '../..'
 
 {
   const [states, setStates] = useQueryStates(
diff --git a/packages/nuqs/tsup.config.ts b/packages/nuqs/tsup.config.ts
index 2120fa7fc..1aa73c6e1 100644
--- a/packages/nuqs/tsup.config.ts
+++ b/packages/nuqs/tsup.config.ts
@@ -6,7 +6,7 @@ import { defineConfig, type Options } from 'tsup'
 const commonConfig = {
   format: ['esm'],
   experimentalDts: true,
-  outDir: 'dist',
+  outDir: '.',
   external: [
     'next',
     'react',