diff --git a/package.json b/package.json
index 06bc882..07644ae 100644
--- a/package.json
+++ b/package.json
@@ -2,36 +2,34 @@
   "name": "web-worker",
   "version": "1.3.0",
   "description": "Consistent Web Workers in browser and Node.",
-  "main": "./dist/node.cjs",
-  "browser": "./dist/browser.cjs",
-  "types": "./index.d.cts",
+  "main": "./dist/browser/index.cjs",
+  "browser": "./dist/browser/index.cjs",
+  "types": "./types/index.d.cts",
   "type": "module",
   "exports": {
     "import": {
-      "types": "./index.d.ts",
-      "bun": "./browser.js",
-      "browser": "./browser.js",
-      "default": "./node.js"
+      "types": "./types/index.d.ts",
+      "bun": "./src/browser/index.js",
+      "browser": "./src/browser/index.js",
+      "default": "./src/node/index.js"
     },
     "module": {
-      "types": "./index.d.ts",
-      "bun": "./browser.js",
-      "browser": "./browser.js",
-      "default": "./node.js"
+      "types": "./types/index.d.ts",
+      "bun": "./src/browser/index.js",
+      "browser": "./src/browser/index.js",
+      "default": "./src/node/index.js"
     },
     "default": {
-      "types": "./index.d.cts",
-      "bun": "./dist/browser.cjs",
-      "browser": "./dist/browser.cjs",
-      "default": "./dist/node.cjs"
+      "types": "./types/index.d.cts",
+      "bun": "./dist/browser/index.cjs",
+      "browser": "./dist/browser/index.cjs",
+      "default": "./dist/node/index.cjs"
     }
   },
   "files": [
     "dist",
-    "browser.js",
-    "node.js",
-    "index.d.ts",
-    "index.d.cts"
+    "src",
+    "types"
   ],
   "scripts": {
     "prepare": "tsup",
diff --git a/browser.js b/src/browser/index.js
similarity index 100%
rename from browser.js
rename to src/browser/index.js
diff --git a/node.js b/src/node/index.js
similarity index 100%
rename from node.js
rename to src/node/index.js
diff --git a/tsup.config.js b/tsup.config.js
index ce78bce..9cd2ec8 100644
--- a/tsup.config.js
+++ b/tsup.config.js
@@ -4,7 +4,7 @@ export default defineConfig((options) => ({
   target: 'es2020',
   treeshake: false,
   splitting: false,
-  entry: ['browser.js', 'node.js'],
+  entry: ['src/**/*.js'],
   format: ['cjs'],
   dts: false,
   minify: false,
diff --git a/index.d.cts b/types/index.d.cts
similarity index 100%
rename from index.d.cts
rename to types/index.d.cts
diff --git a/index.d.ts b/types/index.d.ts
similarity index 100%
rename from index.d.ts
rename to types/index.d.ts