diff --git a/.gitignore b/.gitignore
index 9b74d88..fd69af3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@ jsconfig.json
 *.css.map
 
 # dummmy file
-assets/bundled/critical.js
+bundled/css/critical.js
diff --git a/.prettierignore b/.prettierignore
index aaa821f..a338b8e 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,5 +3,4 @@ static/
 exmapleSite/
 single.json
 pnpm-lock.yaml
-assets/bundled/
-assets/bundled/
+bundled/
diff --git a/assets/bundled/critical.css b/bundled/css/critical.css
similarity index 100%
rename from assets/bundled/critical.css
rename to bundled/css/critical.css
diff --git a/static/bundled/css/main.css b/bundled/css/main.css
similarity index 100%
rename from static/bundled/css/main.css
rename to bundled/css/main.css
diff --git a/static/bundled/js/0I9ziN.js b/bundled/js/0I9ziN.js
similarity index 100%
rename from static/bundled/js/0I9ziN.js
rename to bundled/js/0I9ziN.js
diff --git a/static/bundled/js/BMxMXX.js b/bundled/js/BMxMXX.js
similarity index 100%
rename from static/bundled/js/BMxMXX.js
rename to bundled/js/BMxMXX.js
diff --git a/static/bundled/js/BP5ETi.js b/bundled/js/BP5ETi.js
similarity index 100%
rename from static/bundled/js/BP5ETi.js
rename to bundled/js/BP5ETi.js
diff --git a/static/bundled/js/DgNkpX.js b/bundled/js/DgNkpX.js
similarity index 100%
rename from static/bundled/js/DgNkpX.js
rename to bundled/js/DgNkpX.js
diff --git a/bundled/js/critical.js b/bundled/js/critical.js
new file mode 100644
index 0000000..e69de29
diff --git a/static/bundled/js/main.js b/bundled/js/main.js
similarity index 100%
rename from static/bundled/js/main.js
rename to bundled/js/main.js
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 62657f2..41cdb9a 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -12,13 +12,7 @@ export default defineConfig([
   tseslint.configs.recommended,
   importPlugin.flatConfigs.recommended,
   solid,
-  globalIgnores([
-    'node_modules/',
-    'static/',
-    'exampleSite/',
-    '*.mjs',
-    'assets/bundled/'
-  ]),
+  globalIgnores(['node_modules/', 'static/', 'exampleSite/', '*.mjs', 'bundled/']),
   {
     ...love,
     ...prettier,
diff --git a/hugo.toml b/hugo.toml
new file mode 100644
index 0000000..fb3ce47
--- /dev/null
+++ b/hugo.toml
@@ -0,0 +1,18 @@
+[[module.mounts]]
+source = 'archetypes'
+target = 'archetypes'
+[[module.mounts]]
+source = 'assets'
+target = 'assets'
+[[module.mounts]]
+source = 'layouts'
+target = 'layouts'
+[[module.mounts]]
+source = 'static'
+target = 'static'
+[[module.mounts]]
+source = "bundled"
+target = "assets/bundled"
+[[module.mounts]]
+source = "bundled"
+target = "static/bundled"
diff --git a/layouts/partials/head/link.html b/layouts/partials/head/link.html
index f4c4d6a..a4fbd91 100644
--- a/layouts/partials/head/link.html
+++ b/layouts/partials/head/link.html
@@ -2,7 +2,7 @@
 {{- $fingerprint := .Scratch.Get "fingerprint" | default "" -}}
 
 {{- /* critical style */ -}}
-{{- $style := dict "Source" "bundled/critical.css" "Fingerprint" $fingerprint -}}
+{{- $style := dict "Source" "bundled/css/critical.css" "Fingerprint" $fingerprint -}}
 {{- $options := dict "enableSourceMap" false -}}
 {{- $style = dict "Context" . "ToCSS" $options "Inline" true "Template" true | merge $style -}}
 {{- partial "plugin/style.html" $style -}}
diff --git a/vite.config.ts b/vite.config.ts
index a5f991f..d6b31de 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,7 +4,7 @@ import solidPlugin from 'vite-plugin-solid'
 export default defineConfig({
   plugins: [solidPlugin()],
   build: {
-    outDir: './',
+    outDir: './bundled',
     watch: process.env.DISABLE_WATCH
       ? null
       : {
@@ -17,15 +17,9 @@ export default defineConfig({
       },
       output: {
         format: 'es',
-        entryFileNames: (chunkInfo) =>
-          chunkInfo.name === 'critical'
-            ? 'assets/bundled/[name].js'
-            : 'static/bundled/js/[name].js',
-        chunkFileNames: 'static/bundled/js/[hash:6].js',
-        assetFileNames: (assetInfo) =>
-          assetInfo.names[0]?.startsWith('critical')
-            ? 'assets/bundled/[name].[ext]'
-            : 'static/bundled/[ext]/[name].[ext]',
+        entryFileNames: 'js/[name].js',
+        chunkFileNames: 'js/[hash:6].js',
+        assetFileNames: '[ext]/[name].[ext]',
         compact: true
       }
     }