diff --git a/src/components/layout/Header.svelte b/src/components/layout/Header.svelte
index 81cc04d..33be62a 100644
--- a/src/components/layout/Header.svelte
+++ b/src/components/layout/Header.svelte
@@ -2,7 +2,7 @@
   import { navigation } from '@state/navigation.svelte'
   import { locale } from '@state/locale.svelte'
   import { page } from '@state/page.svelte'
-  import { navigateTo } from '@state/router'
+  import { navigateTo } from '@router'
 
   const isMenuOpen = $derived(navigation.isMenuOpen)
   const currentLang = $derived(locale.current)
diff --git a/src/main.js b/src/main.js
index 78c060e..7ab22da 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import './styles/index.css'
 import App from './App.svelte'
 import { mount } from 'svelte'
-import { initRouter } from './state/router'
+import { initRouter } from './router'
 
 initRouter()
 
diff --git a/src/state/router.js b/src/router/index.js
similarity index 92%
rename from src/state/router.js
rename to src/router/index.js
index 2d0e95c..a3b955f 100644
--- a/src/state/router.js
+++ b/src/router/index.js
@@ -1,8 +1,8 @@
 import navaid from "navaid";
-import { page } from "./page.svelte";
-import { navigation } from "./navigation.svelte";
-import { site } from "./site.svelte";
-import { locale } from "./locale.svelte";
+import { page } from "@state/page.svelte";
+import { navigation } from "@state/navigation.svelte";
+import { site } from "@state/site.svelte";
+import { locale } from "@state/locale.svelte";
 
 export const router = navaid("/", () => {
   // Default handler
diff --git a/src/state/animations.js b/src/utils/animations.js
similarity index 100%
rename from src/state/animations.js
rename to src/utils/animations.js
diff --git a/vite.config.js b/vite.config.js
index cc77d6d..cdf1ec2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,9 @@ export default defineConfig({
     alias: {
       '@components': path.resolve(__dirname, 'src/components'),
       '@views': path.resolve(__dirname, 'src/views'),
-      '@state': path.resolve(__dirname, 'src/state')
+      '@state': path.resolve(__dirname, 'src/state'),
+      '@router': path.resolve(__dirname, 'src/router'),
+      '@utils': path.resolve(__dirname, 'src/utils')
     }
   },
   server: {