diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
index 6181a252a..3fa16ef5b 100644
--- a/packages/config/tsconfig.json
+++ b/packages/config/tsconfig.json
@@ -1,11 +1,18 @@
 {
   "extends": "@prefabs.tech/tsconfig/react",
   "compilerOptions": {
+    "module": "esnext",
     "moduleResolution": "bundler",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     "paths": {
       "@/*": ["./src/*"]
-    },
+    }
   },
-  "include": ["vite.config.*", "src/**/*"],
+  "include": [
+    "src/**/*",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "src/**/__test__/**/*"
+  ]
 }
diff --git a/packages/config/tsconfig.vitest.json b/packages/config/tsconfig.vitest.json
index 7eed54f8a..52df5a2cc 100644
--- a/packages/config/tsconfig.vitest.json
+++ b/packages/config/tsconfig.vitest.json
@@ -3,7 +3,9 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
-    "types": ["node", "jsdom", "vitest/globals"],
+    "types": ["vite/client", "node", "vitest/globals"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   }
 }
diff --git a/packages/form/tsconfig.json b/packages/form/tsconfig.json
index d22337cd6..3fa16ef5b 100644
--- a/packages/form/tsconfig.json
+++ b/packages/form/tsconfig.json
@@ -1,11 +1,18 @@
 {
   "extends": "@prefabs.tech/tsconfig/react",
   "compilerOptions": {
+    "module": "esnext",
     "moduleResolution": "bundler",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     "paths": {
       "@/*": ["./src/*"]
-    },
+    }
   },
-  "include": ["vite.config.*", "src/**/*", "src/**/*.tsx"],
+  "include": [
+    "src/**/*",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "src/**/__test__/**/*"
+  ]
 }
diff --git a/packages/form/tsconfig.vitest.json b/packages/form/tsconfig.vitest.json
index 7eed54f8a..52df5a2cc 100644
--- a/packages/form/tsconfig.vitest.json
+++ b/packages/form/tsconfig.vitest.json
@@ -3,7 +3,9 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
-    "types": ["node", "jsdom", "vitest/globals"],
+    "types": ["vite/client", "node", "vitest/globals"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   }
 }
diff --git a/packages/i18n/tsconfig.json b/packages/i18n/tsconfig.json
index 6181a252a..3fa16ef5b 100644
--- a/packages/i18n/tsconfig.json
+++ b/packages/i18n/tsconfig.json
@@ -1,11 +1,18 @@
 {
   "extends": "@prefabs.tech/tsconfig/react",
   "compilerOptions": {
+    "module": "esnext",
     "moduleResolution": "bundler",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     "paths": {
       "@/*": ["./src/*"]
-    },
+    }
   },
-  "include": ["vite.config.*", "src/**/*"],
+  "include": [
+    "src/**/*",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "src/**/__test__/**/*"
+  ]
 }
diff --git a/packages/i18n/tsconfig.vitest.json b/packages/i18n/tsconfig.vitest.json
index 7eed54f8a..52df5a2cc 100644
--- a/packages/i18n/tsconfig.vitest.json
+++ b/packages/i18n/tsconfig.vitest.json
@@ -3,7 +3,9 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
-    "types": ["node", "jsdom", "vitest/globals"],
+    "types": ["vite/client", "node", "vitest/globals"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   }
 }
diff --git a/packages/layout/tsconfig.json b/packages/layout/tsconfig.json
index d22337cd6..3fa16ef5b 100644
--- a/packages/layout/tsconfig.json
+++ b/packages/layout/tsconfig.json
@@ -1,11 +1,18 @@
 {
   "extends": "@prefabs.tech/tsconfig/react",
   "compilerOptions": {
+    "module": "esnext",
     "moduleResolution": "bundler",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     "paths": {
       "@/*": ["./src/*"]
-    },
+    }
   },
-  "include": ["vite.config.*", "src/**/*", "src/**/*.tsx"],
+  "include": [
+    "src/**/*",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "src/**/__test__/**/*"
+  ]
 }
diff --git a/packages/layout/tsconfig.vitest.json b/packages/layout/tsconfig.vitest.json
index 7eed54f8a..52df5a2cc 100644
--- a/packages/layout/tsconfig.vitest.json
+++ b/packages/layout/tsconfig.vitest.json
@@ -3,7 +3,9 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
-    "types": ["node", "jsdom", "vitest/globals"],
+    "types": ["vite/client", "node", "vitest/globals"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   }
 }
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index c094f5568..3fa16ef5b 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -1,11 +1,18 @@
 {
   "extends": "@prefabs.tech/tsconfig/react",
   "compilerOptions": {
+    "module": "esnext",
     "moduleResolution": "bundler",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     "paths": {
       "@/*": ["./src/*"]
-    },
+    }
   },
-  "include": ["vite.config.*", "src/**/*", "src/**/*.tsx", "./setup-test.ts"],
+  "include": [
+    "src/**/*",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "src/**/__test__/**/*"
+  ]
 }
diff --git a/packages/ui/tsconfig.vitest.json b/packages/ui/tsconfig.vitest.json
index c4ef5ddf2..edf582f3f 100644
--- a/packages/ui/tsconfig.vitest.json
+++ b/packages/ui/tsconfig.vitest.json
@@ -3,7 +3,9 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
-    "types": ["node", "jsdom", "vitest/globals", "@testing-library/jest-dom"],
-  },
+    "types": ["vite/client", "node", "vitest/globals", "@testing-library/jest-dom"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  }
 }
diff --git a/packages/user/tsconfig.json b/packages/user/tsconfig.json
index 2962fd610..3fa16ef5b 100644
--- a/packages/user/tsconfig.json
+++ b/packages/user/tsconfig.json
@@ -1,12 +1,18 @@
 {
   "extends": "@prefabs.tech/tsconfig/react",
   "compilerOptions": {
-    "baseUrl": ".",
+    "module": "esnext",
     "moduleResolution": "bundler",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     "paths": {
       "@/*": ["./src/*"]
-    },
+    }
   },
-  "include": ["vite.config.*", "src/**/*", "src/**/*.tsx"],
+  "include": [
+    "src/**/*",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "src/**/__test__/**/*"
+  ]
 }
diff --git a/packages/user/tsconfig.vitest.json b/packages/user/tsconfig.vitest.json
index 7eed54f8a..52df5a2cc 100644
--- a/packages/user/tsconfig.vitest.json
+++ b/packages/user/tsconfig.vitest.json
@@ -3,7 +3,9 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
-    "types": ["node", "jsdom", "vitest/globals"],
+    "types": ["vite/client", "node", "vitest/globals"],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   }
 }