diff --git a/components.cjs b/components.cjs
new file mode 100644
index 000000000..e69de29bb
diff --git a/components.d.cts b/components.d.cts
new file mode 100644
index 000000000..95e629eac
--- /dev/null
+++ b/components.d.cts
@@ -0,0 +1 @@
+export * from './dist/components/index.js'
diff --git a/components.d.ts b/components.d.ts
new file mode 100644
index 000000000..95e629eac
--- /dev/null
+++ b/components.d.ts
@@ -0,0 +1 @@
+export * from './dist/components/index.js'
diff --git a/composables.cjs b/composables.cjs
new file mode 100644
index 000000000..e69de29bb
diff --git a/composables.d.cts b/composables.d.cts
new file mode 100644
index 000000000..0cfe53c3d
--- /dev/null
+++ b/composables.d.cts
@@ -0,0 +1 @@
+export * from './dist/composables/index.js'
diff --git a/composables.d.ts b/composables.d.ts
new file mode 100644
index 000000000..0cfe53c3d
--- /dev/null
+++ b/composables.d.ts
@@ -0,0 +1 @@
+export * from './dist/composables/index.js'
diff --git a/index.cjs b/index.cjs
new file mode 100644
index 000000000..e69de29bb
diff --git a/index.d.cts b/index.d.cts
new file mode 100644
index 000000000..09e9c9b2a
--- /dev/null
+++ b/index.d.cts
@@ -0,0 +1 @@
+export * from './dist/index.js'
diff --git a/package.json b/package.json
index a8cd79aa6..7bef35b49 100644
--- a/package.json
+++ b/package.json
@@ -5,29 +5,72 @@
   "type": "module",
   "packageManager": "pnpm@8.3.1",
   "author": "Alvaro Saburido <hola@alvarosaburido.dev> (https://github.com/alvarosabu/)",
-  "files": [
-    "dist",
-    "*.d.ts"
-  ],
   "license": "MIT",
-  "main": "./dist/tres.umd.cjs",
-  "module": "./dist/tres.js",
-  "types": "./dist/index.d.ts",
+  "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/tres.js",
-      "require": "./dist/tres.umd.cjs"
+      "require": {
+        "types": "./index.d.cts",
+        "default": "./index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
+    "./*": "./*",
     "./components": {
-      "types": "./dist/types/tres-components.d.ts"
+      "require": {
+        "types": "./components.d.cts",
+        "default": "./components.cjs"
+      },
+      "import": {
+        "types": "./dist/components/index.d.ts",
+        "default": "./dist/components/index.js"
+      }
+    },
+    "./composables": {
+      "require": {
+        "types": "./composables.d.cts",
+        "default": "./composables.cjs"
+      },
+      "import": {
+        "types": "./dist/composables/index.d.ts",
+        "default": "./dist/composables/index.js"
+      }
     },
-    "./*": {
-      "types": "./dist/types/*",
-      "import": "./dist/tres.js",
-      "require": "./dist/tres.umd.cjs"
+    "./types": {
+      "require": {
+        "types": "./types.d.cts"
+      },
+      "import": {
+        "types": "./dist/types/index.d.ts"
+      }
+    },
+    "./utils": {
+      "require": {
+        "types": "./utils.d.cts",
+        "default": "./utils.cjs"
+      },
+      "import": {
+        "types": "./dist/utils/index.d.ts",
+        "default": "./dist/utils/index.js"
+      }
     }
   },
+  "main": "./dist/tres.js",
+  "module": "./dist/tres.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "*.d.ts",
+    "*.d.cts",
+    "components.cjs",
+    "composables.cjs",
+    "index.cjs",
+    "index.d.cts",
+    "utils.cjs"
+  ],
   "publishConfig": {
     "access": "public"
   },
diff --git a/types.cjs b/types.cjs
new file mode 100644
index 000000000..e69de29bb
diff --git a/types.d.cts b/types.d.cts
new file mode 100644
index 000000000..0dad9454a
--- /dev/null
+++ b/types.d.cts
@@ -0,0 +1 @@
+export * from './dist/types/index.js'
diff --git a/types.d.ts b/types.d.ts
new file mode 100644
index 000000000..0dad9454a
--- /dev/null
+++ b/types.d.ts
@@ -0,0 +1 @@
+export * from './dist/types/index.js'
diff --git a/utils.cjs b/utils.cjs
new file mode 100644
index 000000000..e69de29bb
diff --git a/utils.d.cts b/utils.d.cts
new file mode 100644
index 000000000..6dde10dee
--- /dev/null
+++ b/utils.d.cts
@@ -0,0 +1 @@
+export * from './dist/utils/index.js'
diff --git a/utils.d.ts b/utils.d.ts
new file mode 100644
index 000000000..6dde10dee
--- /dev/null
+++ b/utils.d.ts
@@ -0,0 +1 @@
+export * from './dist/utils/index.js'