diff --git a/src/lib/components/EditRecipe.svelte b/src/lib/components/EditRecipe.svelte
deleted file mode 100644
index 95cd892..0000000
--- a/src/lib/components/EditRecipe.svelte
+++ /dev/null
@@ -1,326 +0,0 @@
-<script lang='ts'>
-	import Check from '$lib/assets/icons/Check.svelte';
-	import Cross from '$lib/assets/icons/Cross.svelte';
-	import SeasonSelect from '$lib/components/SeasonSelect.svelte';
-	import '$lib/css/action_button.css'
-	import '$lib/css/nordtheme.css'
-	import '$lib/css/shake.css'
-	import { redirect } from '@sveltejs/kit';
-	import { RecipeModelType } from '../../types/types';
-	import type { PageData } from './$types';
-	import CardAdd from '$lib/components/CardAdd.svelte';
-	import CreateIngredientList from '$lib/components/CreateIngredientList.svelte';
-	import CreateStepList from '$lib/components/CreateStepList.svelte';
-
-	let {
-		data,
-		actions,
-		title,
-		card_data = $bindable({
-			icon: data.icon,
-			category: data.category,
-			name: data.name,
-			description: data.description,
-			tags: data.tags,
-		}),
-		add_info = $bindable({
-			preparation: data.preparation,
-			fermentation: {
-				bulk: data.fermentation.bulk,
-				final: data.fermentation.final,
-			},
-			baking: {
-				length: data.baking.length,
-				temperature: data.baking.temperature,
-				mode: data.baking.mode,
-			},
-			total_time: data.total_time,
-		}),
-		portions = $bindable(data.portions),
-		ingredients = $bindable(data.ingredients),
-		instructions = $bindable(data.instructions)
-	}: {
-		data: PageData,
-		actions: [String],
-		title: string,
-		card_data?: any,
-		add_info?: any,
-		portions?: any,
-		ingredients?: any,
-		instructions?: any
-	} = $props();
-
-	let preamble = $state(data.preamble);
-	let addendum = $state(data.addendum);
-
-	import { season } from '$lib/js/season_store';
-	season.update(() => data.season)
-	let season_local = $state();
-	season.subscribe((s) => {
-		season_local = s
-	});
-
-	let old_short_name = $state(data.short_name);
-	let images = $state(data.images);
-	let short_name = $state(data.short_name);
-	let password = $state();
-	let datecreated = $state(data.datecreated);
-	let datemodified = $state(new Date());
-
-
-	function get_season(){
-		let season = []
-		const el = document.getElementById("labels");
-		for(var i = 0; i < el.children.length; i++){
-			if(el.children[i].children[0].children[0].checked){
-				season.push(i+1)
-			}
-		}
-		return season
-	}
-	function write_season(season){
-		const el = document.getElementById("labels");
-		for(var i = 0; i < season.length; i++){
-			el.children[i].children[0].children[0].checked = true
-		}
-	}
-
-	async function doDelete(){
-		const response = confirm("Bist du dir sicher, dass du das Rezept löschen willst?")
-		if(!response){
-			return
-		}
-		const res = await fetch('/api/delete', {
-			method: 'POST',
-			body: JSON.stringify({
-				old_short_name,
-			headers: {
-       				'content-type': 'application/json',
-				bearer: password,
-     				}
-			})
-
-		})
-	}
-	async function doEdit() {
-		const res = await fetch('/api/edit', {
-			method: 'POST',
-			body: JSON.stringify({
-				: {
-					...card_data,
-					...add_info,
-					images, // TODO
-					season: season_local,
-					short_name,
-					datecreated,
-					datemodified,
-					instructions,
-					ingredients,
-					addendum,
-					preamble
-				},
-				old_short_name,
-			headers: {
-       				'content-type': 'application/json',
-				bearer: password,
-     				}
-			})
-		})
-		const item = await res.json();
-	}
-	async function doAdd () {
-		const res = await fetch('/api/add', {
-			method: 'POST',
-			body: JSON.stringify({
-				recipe: {
-					...card_data,
-					...add_info,
-					images: {mediapath: short_name + '.webp', alt: "", caption: ""}, // TODO
-					season: season_local,
-					short_name,
-					datecreated,
-					datemodified,
-					instructions,
-					ingredients,
-					preamble,
-					addendum,
-				},
-			headers: {
-       				'content-type': 'application/json',
-				bearer: password,
-     				}
-			})
-		})
-
-	}
-</script>
-
-<style>
-input{
-	display: block;
-	border: unset;
-	margin: 1rem auto;
-	padding: 0.5em 1em;
-	border-radius: 1000px;
-	background-color: var(--nord4);
-	font-size: 1.1rem;
-	transition: 100ms;
-
-}
-input:hover,
-input:focus-visible
-{
-	scale: 1.05 1.05;
-}
-.list_wrapper{
-	margin-inline: auto;
-	display: flex;
-	flex-direction: row;
-	max-width: 1000px;
-	gap: 2rem;
-	justify-content: center;
-}
-@media screen and (max-width: 700px){
-	.list_wrapper{
-		flex-direction: column;
-	}
-}
-input[type=password]{
-	box-sizing: border-box;
-	font-size: 1.5rem;
-	padding-block: 0.5em;
-	display: inline;
-	width: 100%;
-}
-.submit_wrapper{
-	position: relative;
-	margin-inline: auto;
-	width: max(300px, 50vw)
-}
-.submit_wrapper button{
-	position: absolute;
-	right:-1em;
-	bottom: -0.5em;
-}
-.submit_wrapper h2{
-	margin-bottom: 0;
-}
-h1{
-	text-align: center;
-	margin-bottom: 2rem;
-}
-.title_container{
-	max-width: 1000px;
-	display: flex;
-	flex-direction: column;
-	margin-inline: auto;
-}
-.title{
-	position: relative;
-	width: min(800px, 80vw);
-	margin-block: 2rem;
-	margin-inline: auto;
-	background-color: var(--nord6);
-	background-color: red;
-	padding: 1rem 2rem;
-}
-.title p{
-	border: 2px solid var(--nord1);
-	border-radius: 10000px;
-	padding: 0.5em 1em;
-	font-size: 1.1rem;
-	transition: 200ms;
-}
-.title p:hover,
-.title p:focus-within{
-	scale: 1.02 1.02;
-}
-.addendum{
-	font-size: 1.1rem;
-	max-width: 90%;
-	margin-inline: auto;
-	border: 2px solid var(--nord1);
-	border-radius: 45px;
-	padding: 1em 1em;
-	transition: 100ms;
-}
-.addendum:hover,
-.addendum:focus-within
-{
-	scale: 1.02 1.02;
-}
-.addendum_wrapper{
-	max-width: 1000px;
-	margin-inline: auto;
-}
-h3{
-	text-align: center;
-}
-.delete{
-	position: fixed;
-	right: 0;
-	bottom: 0;
-	margin: 2rem;
-}
-@media (prefers-color-scheme: dark){
-	.title{
-		background-color: var(--nord6-dark);
-		background-color: green;
-	}
-}
-</style>
-<h1>{title}</h1>
-
-<CardAdd {card_data}></CardAdd>
-
-<h3>Kurzname (für URL):</h3>
-<input bind:value={short_name} placeholder="Kurzname"/>
-
-<div class=title_container>
-<div class=title>
-<h4>Eine etwas längere Beschreibung:</h4>
-<p bind:innerText={preamble} contenteditable></p>
-<div class=tags>
-<h4>Saison:</h4>
-<SeasonSelect></SeasonSelect>
-</div>
-
-</div>
-</div>
-
-<div class=list_wrapper>
-<div>
-<CreateIngredientList {ingredients} {portions}></CreateIngredientList>
-</div>
-<div>
-<CreateStepList {instructions} {add_info}></CreateStepList>
-</div>
-</div>
-
-<div class=addendum_wrapper>
-<h3>Nachtrag:</h3>
-<div class=addendum bind:innerText={addendum} contenteditable></div>
-</div>
-
-{#if actions.includes('add')}
-<div class=submit_wrapper>
-<h2>Neues Rezept hinzufügen:</h2>
-<input type="password" placeholder=Passwort bind:value={password}>
-<button class=action_button onclick={doAdd}><Check fill=white width=2rem height=2rem></Check></button>
-</div>
-{/if}
-{#if actions.includes('edit')}
-<div class=submit_wrapper>
-<h2>Editiertes Rezept abspeichern:</h2>
-<input type="password" placeholder=Passwort bind:value={password}>
-<button class=action_button onclick={doEdit}><Check fill=white width=2rem height=2rem></Check></button>
-</div>
-{/if}
-
-{#if actions.includes('delete')}
-<div class=submit_wrapper>
-<h2>Rezept löschen:</h2>
-<input type="password" placeholder=Passwort bind:value={password}>
-<button class=action_button onclick={doDelete}><Cross fill=white width=2rem height=2rem></Cross></button>
-</div>
-{/if}
diff --git a/src/lib/components/BarChart.svelte b/src/lib/components/cospend/BarChart.svelte
similarity index 100%
rename from src/lib/components/BarChart.svelte
rename to src/lib/components/cospend/BarChart.svelte
diff --git a/src/lib/components/DebtBreakdown.svelte b/src/lib/components/cospend/DebtBreakdown.svelte
similarity index 100%
rename from src/lib/components/DebtBreakdown.svelte
rename to src/lib/components/cospend/DebtBreakdown.svelte
diff --git a/src/lib/components/EnhancedBalance.svelte b/src/lib/components/cospend/EnhancedBalance.svelte
similarity index 100%
rename from src/lib/components/EnhancedBalance.svelte
rename to src/lib/components/cospend/EnhancedBalance.svelte
diff --git a/src/lib/components/PaymentModal.svelte b/src/lib/components/cospend/PaymentModal.svelte
similarity index 99%
rename from src/lib/components/PaymentModal.svelte
rename to src/lib/components/cospend/PaymentModal.svelte
index caca979..262e607 100644
--- a/src/lib/components/PaymentModal.svelte
+++ b/src/lib/components/cospend/PaymentModal.svelte
@@ -3,7 +3,7 @@
   import { goto } from '$app/navigation';
   import { page } from '$app/stores';
   import ProfilePicture from './ProfilePicture.svelte';
-  import EditButton from './EditButton.svelte';
+  import EditButton from '$lib/components/EditButton.svelte';
   import { getCategoryEmoji, getCategoryName } from '$lib/utils/categories';
   import { formatCurrency as formatCurrencyUtil } from '$lib/utils/formatters';
 
diff --git a/src/lib/components/ProfilePicture.svelte b/src/lib/components/cospend/ProfilePicture.svelte
similarity index 100%
rename from src/lib/components/ProfilePicture.svelte
rename to src/lib/components/cospend/ProfilePicture.svelte
diff --git a/src/lib/components/SplitMethodSelector.svelte b/src/lib/components/cospend/SplitMethodSelector.svelte
similarity index 100%
rename from src/lib/components/SplitMethodSelector.svelte
rename to src/lib/components/cospend/SplitMethodSelector.svelte
diff --git a/src/lib/components/UsersList.svelte b/src/lib/components/cospend/UsersList.svelte
similarity index 100%
rename from src/lib/components/UsersList.svelte
rename to src/lib/components/cospend/UsersList.svelte
diff --git a/src/lib/components/BenedictusMedal.svelte b/src/lib/components/faith/BenedictusMedal.svelte
similarity index 100%
rename from src/lib/components/BenedictusMedal.svelte
rename to src/lib/components/faith/BenedictusMedal.svelte
diff --git a/src/lib/components/BibleModal.svelte b/src/lib/components/faith/BibleModal.svelte
similarity index 100%
rename from src/lib/components/BibleModal.svelte
rename to src/lib/components/faith/BibleModal.svelte
diff --git a/src/lib/components/FireEffect.svelte b/src/lib/components/faith/FireEffect.svelte
similarity index 100%
rename from src/lib/components/FireEffect.svelte
rename to src/lib/components/faith/FireEffect.svelte
diff --git a/src/lib/components/LanguageToggle.svelte b/src/lib/components/faith/LanguageToggle.svelte
similarity index 96%
rename from src/lib/components/LanguageToggle.svelte
rename to src/lib/components/faith/LanguageToggle.svelte
index 951e036..053873c 100644
--- a/src/lib/components/LanguageToggle.svelte
+++ b/src/lib/components/faith/LanguageToggle.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { onMount } from 'svelte';
 	import { getLanguageContext } from '$lib/contexts/languageContext.js';
-	import Toggle from './Toggle.svelte';
+	import Toggle from '$lib/components/Toggle.svelte';
 
 	export let initialLatin = undefined;
 	export let hasUrlLatin = false;
diff --git a/src/lib/components/MysteryIcon.svelte b/src/lib/components/faith/MysteryIcon.svelte
similarity index 100%
rename from src/lib/components/MysteryIcon.svelte
rename to src/lib/components/faith/MysteryIcon.svelte
diff --git a/src/lib/components/PipImage.svelte b/src/lib/components/faith/PipImage.svelte
similarity index 100%
rename from src/lib/components/PipImage.svelte
rename to src/lib/components/faith/PipImage.svelte
diff --git a/src/lib/components/StickyImage.svelte b/src/lib/components/faith/StickyImage.svelte
similarity index 98%
rename from src/lib/components/StickyImage.svelte
rename to src/lib/components/faith/StickyImage.svelte
index bae0675..51a59e1 100644
--- a/src/lib/components/StickyImage.svelte
+++ b/src/lib/components/faith/StickyImage.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { onMount } from 'svelte';
 	import { createPip } from '$lib/js/pip.svelte';
-	import PipImage from '$lib/components/PipImage.svelte';
+	import PipImage from '$lib/components/faith/PipImage.svelte';
 
 	/**
 	 * @param {'layout' | 'overlay'} mode
diff --git a/src/lib/components/StreakAura.svelte b/src/lib/components/faith/StreakAura.svelte
similarity index 100%
rename from src/lib/components/StreakAura.svelte
rename to src/lib/components/faith/StreakAura.svelte
diff --git a/src/lib/components/StreakCounter.svelte b/src/lib/components/faith/StreakCounter.svelte
similarity index 97%
rename from src/lib/components/StreakCounter.svelte
rename to src/lib/components/faith/StreakCounter.svelte
index 14979dd..2a1443a 100644
--- a/src/lib/components/StreakCounter.svelte
+++ b/src/lib/components/faith/StreakCounter.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { browser } from '$app/environment';
 import { getRosaryStreak } from '$lib/stores/rosaryStreak.svelte';
-import StreakAura from '$lib/components/StreakAura.svelte';
+import StreakAura from '$lib/components/faith/StreakAura.svelte';
 import { tick, onMount } from 'svelte';
 
 let burst = $state(false);
diff --git a/src/lib/components/prayers/AblassGebete.svelte b/src/lib/components/faith/prayers/AblassGebete.svelte
similarity index 100%
rename from src/lib/components/prayers/AblassGebete.svelte
rename to src/lib/components/faith/prayers/AblassGebete.svelte
diff --git a/src/lib/components/prayers/AveMaria.svelte b/src/lib/components/faith/prayers/AveMaria.svelte
similarity index 100%
rename from src/lib/components/prayers/AveMaria.svelte
rename to src/lib/components/faith/prayers/AveMaria.svelte
diff --git a/src/lib/components/prayers/BruderKlausGebet.svelte b/src/lib/components/faith/prayers/BruderKlausGebet.svelte
similarity index 100%
rename from src/lib/components/prayers/BruderKlausGebet.svelte
rename to src/lib/components/faith/prayers/BruderKlausGebet.svelte
diff --git a/src/lib/components/prayers/Confiteor.svelte b/src/lib/components/faith/prayers/Confiteor.svelte
similarity index 100%
rename from src/lib/components/prayers/Confiteor.svelte
rename to src/lib/components/faith/prayers/Confiteor.svelte
diff --git a/src/lib/components/prayers/Credo.svelte b/src/lib/components/faith/prayers/Credo.svelte
similarity index 100%
rename from src/lib/components/prayers/Credo.svelte
rename to src/lib/components/faith/prayers/Credo.svelte
diff --git a/src/lib/components/prayers/FatimaGebet.svelte b/src/lib/components/faith/prayers/FatimaGebet.svelte
similarity index 100%
rename from src/lib/components/prayers/FatimaGebet.svelte
rename to src/lib/components/faith/prayers/FatimaGebet.svelte
diff --git a/src/lib/components/prayers/Gloria.svelte b/src/lib/components/faith/prayers/Gloria.svelte
similarity index 100%
rename from src/lib/components/prayers/Gloria.svelte
rename to src/lib/components/faith/prayers/Gloria.svelte
diff --git a/src/lib/components/prayers/GloriaPatri.svelte b/src/lib/components/faith/prayers/GloriaPatri.svelte
similarity index 100%
rename from src/lib/components/prayers/GloriaPatri.svelte
rename to src/lib/components/faith/prayers/GloriaPatri.svelte
diff --git a/src/lib/components/prayers/JosephGebet.svelte b/src/lib/components/faith/prayers/JosephGebet.svelte
similarity index 100%
rename from src/lib/components/prayers/JosephGebet.svelte
rename to src/lib/components/faith/prayers/JosephGebet.svelte
diff --git a/src/lib/components/prayers/Kreuzzeichen.svelte b/src/lib/components/faith/prayers/Kreuzzeichen.svelte
similarity index 100%
rename from src/lib/components/prayers/Kreuzzeichen.svelte
rename to src/lib/components/faith/prayers/Kreuzzeichen.svelte
diff --git a/src/lib/components/prayers/MichaelGebet.svelte b/src/lib/components/faith/prayers/MichaelGebet.svelte
similarity index 100%
rename from src/lib/components/prayers/MichaelGebet.svelte
rename to src/lib/components/faith/prayers/MichaelGebet.svelte
diff --git a/src/lib/components/prayers/Paternoster.svelte b/src/lib/components/faith/prayers/Paternoster.svelte
similarity index 100%
rename from src/lib/components/prayers/Paternoster.svelte
rename to src/lib/components/faith/prayers/Paternoster.svelte
diff --git a/src/lib/components/prayers/Prayer.svelte b/src/lib/components/faith/prayers/Prayer.svelte
similarity index 100%
rename from src/lib/components/prayers/Prayer.svelte
rename to src/lib/components/faith/prayers/Prayer.svelte
diff --git a/src/lib/components/prayers/RosaryFinalPrayer.svelte b/src/lib/components/faith/prayers/RosaryFinalPrayer.svelte
similarity index 100%
rename from src/lib/components/prayers/RosaryFinalPrayer.svelte
rename to src/lib/components/faith/prayers/RosaryFinalPrayer.svelte
diff --git a/src/lib/components/prayers/SalveRegina.svelte b/src/lib/components/faith/prayers/SalveRegina.svelte
similarity index 100%
rename from src/lib/components/prayers/SalveRegina.svelte
rename to src/lib/components/faith/prayers/SalveRegina.svelte
diff --git a/src/lib/components/BaseRecipeSelector.svelte b/src/lib/components/recipes/BaseRecipeSelector.svelte
similarity index 98%
rename from src/lib/components/BaseRecipeSelector.svelte
rename to src/lib/components/recipes/BaseRecipeSelector.svelte
index d443c61..d4dc658 100644
--- a/src/lib/components/BaseRecipeSelector.svelte
+++ b/src/lib/components/recipes/BaseRecipeSelector.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { onMount } from 'svelte';
 import { browser } from '$app/environment';
-import { do_on_key } from '$lib/components/do_on_key.js'
+import { do_on_key } from '$lib/components/recipes/do_on_key.js'
 import Check from '$lib/assets/icons/Check.svelte'
 
 let {
diff --git a/src/lib/components/Card.svelte b/src/lib/components/recipes/Card.svelte
similarity index 100%
rename from src/lib/components/Card.svelte
rename to src/lib/components/recipes/Card.svelte
diff --git a/src/lib/components/CardAdd.svelte b/src/lib/components/recipes/CardAdd.svelte
similarity index 100%
rename from src/lib/components/CardAdd.svelte
rename to src/lib/components/recipes/CardAdd.svelte
diff --git a/src/lib/components/CategoryFilter.svelte b/src/lib/components/recipes/CategoryFilter.svelte
similarity index 98%
rename from src/lib/components/CategoryFilter.svelte
rename to src/lib/components/recipes/CategoryFilter.svelte
index 183dd27..ea4f84e 100644
--- a/src/lib/components/CategoryFilter.svelte
+++ b/src/lib/components/recipes/CategoryFilter.svelte
@@ -1,6 +1,6 @@
 <script>
 	import "$lib/css/nordtheme.css";
-	import TagChip from './TagChip.svelte';
+	import TagChip from '$lib/components/recipes/TagChip.svelte';
 
 	let {
 		categories = [],
diff --git a/src/lib/components/CreateIngredientList.svelte b/src/lib/components/recipes/CreateIngredientList.svelte
similarity index 99%
rename from src/lib/components/CreateIngredientList.svelte
rename to src/lib/components/recipes/CreateIngredientList.svelte
index a312023..3eebc8a 100644
--- a/src/lib/components/CreateIngredientList.svelte
+++ b/src/lib/components/recipes/CreateIngredientList.svelte
@@ -8,9 +8,9 @@ import Check from '$lib/assets/icons/Check.svelte'
 
 import "$lib/css/action_button.css"
 
-import { do_on_key } from '$lib/components/do_on_key.js'
+import { do_on_key } from '$lib/components/recipes/do_on_key.js'
 import { portions } from '$lib/js/portions_store.js'
-import BaseRecipeSelector from '$lib/components/BaseRecipeSelector.svelte'
+import BaseRecipeSelector from '$lib/components/recipes/BaseRecipeSelector.svelte'
 
 let portions_local = $state()
 portions.subscribe((p) => {
diff --git a/src/lib/components/CreateStepList.svelte b/src/lib/components/recipes/CreateStepList.svelte
similarity index 99%
rename from src/lib/components/CreateStepList.svelte
rename to src/lib/components/recipes/CreateStepList.svelte
index ca089fe..08bd783 100644
--- a/src/lib/components/CreateStepList.svelte
+++ b/src/lib/components/recipes/CreateStepList.svelte
@@ -8,8 +8,8 @@ import Check from '$lib/assets/icons/Check.svelte'
 import '$lib/css/nordtheme.css'
 import "$lib/css/action_button.css"
 
-import { do_on_key } from '$lib/components/do_on_key.js'
-import BaseRecipeSelector from '$lib/components/BaseRecipeSelector.svelte'
+import { do_on_key } from '$lib/components/recipes/do_on_key.js'
+import BaseRecipeSelector from '$lib/components/recipes/BaseRecipeSelector.svelte'
 
 let { lang = 'de' as 'de' | 'en', instructions = $bindable(), add_info = $bindable() } = $props<{ lang?: 'de' | 'en', instructions: any, add_info: any }>();
 
diff --git a/src/lib/components/EditRecipeNote.svelte b/src/lib/components/recipes/EditRecipeNote.svelte
similarity index 100%
rename from src/lib/components/EditRecipeNote.svelte
rename to src/lib/components/recipes/EditRecipeNote.svelte
diff --git a/src/lib/components/EditableIngredients.svelte b/src/lib/components/recipes/EditableIngredients.svelte
similarity index 100%
rename from src/lib/components/EditableIngredients.svelte
rename to src/lib/components/recipes/EditableIngredients.svelte
diff --git a/src/lib/components/EditableInstructions.svelte b/src/lib/components/recipes/EditableInstructions.svelte
similarity index 100%
rename from src/lib/components/EditableInstructions.svelte
rename to src/lib/components/recipes/EditableInstructions.svelte
diff --git a/src/lib/components/FavoritesFilter.svelte b/src/lib/components/recipes/FavoritesFilter.svelte
similarity index 95%
rename from src/lib/components/FavoritesFilter.svelte
rename to src/lib/components/recipes/FavoritesFilter.svelte
index 6885241..c964a97 100644
--- a/src/lib/components/FavoritesFilter.svelte
+++ b/src/lib/components/recipes/FavoritesFilter.svelte
@@ -1,6 +1,6 @@
 <script>
 	import "$lib/css/nordtheme.css";
-	import Toggle from './Toggle.svelte';
+	import Toggle from '$lib/components/Toggle.svelte';
 
 	let {
 		enabled = false,
diff --git a/src/lib/components/FilterPanel.svelte b/src/lib/components/recipes/FilterPanel.svelte
similarity index 100%
rename from src/lib/components/FilterPanel.svelte
rename to src/lib/components/recipes/FilterPanel.svelte
diff --git a/src/lib/components/GenerateAltTextButton.svelte b/src/lib/components/recipes/GenerateAltTextButton.svelte
similarity index 100%
rename from src/lib/components/GenerateAltTextButton.svelte
rename to src/lib/components/recipes/GenerateAltTextButton.svelte
diff --git a/src/lib/components/HefeSwapper.svelte b/src/lib/components/recipes/HefeSwapper.svelte
similarity index 100%
rename from src/lib/components/HefeSwapper.svelte
rename to src/lib/components/recipes/HefeSwapper.svelte
diff --git a/src/lib/components/Icon.svelte b/src/lib/components/recipes/Icon.svelte
similarity index 100%
rename from src/lib/components/Icon.svelte
rename to src/lib/components/recipes/Icon.svelte
diff --git a/src/lib/components/IconFilter.svelte b/src/lib/components/recipes/IconFilter.svelte
similarity index 98%
rename from src/lib/components/IconFilter.svelte
rename to src/lib/components/recipes/IconFilter.svelte
index b4df3ec..22b2660 100644
--- a/src/lib/components/IconFilter.svelte
+++ b/src/lib/components/recipes/IconFilter.svelte
@@ -1,6 +1,6 @@
 <script>
 	import "$lib/css/nordtheme.css";
-	import TagChip from './TagChip.svelte';
+	import TagChip from '$lib/components/recipes/TagChip.svelte';
 
 	let {
 		availableIcons = [],
diff --git a/src/lib/components/IconLayout.svelte b/src/lib/components/recipes/IconLayout.svelte
similarity index 96%
rename from src/lib/components/IconLayout.svelte
rename to src/lib/components/recipes/IconLayout.svelte
index 179c357..a41daa8 100644
--- a/src/lib/components/IconLayout.svelte
+++ b/src/lib/components/recipes/IconLayout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import type { Snippet } from 'svelte';
     import '$lib/css/nordtheme.css';
-    import Recipes from '$lib/components/Recipes.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
     import Search from './Search.svelte';
 
     let {
diff --git a/src/lib/components/IngredientListList.svelte b/src/lib/components/recipes/IngredientListList.svelte
similarity index 100%
rename from src/lib/components/IngredientListList.svelte
rename to src/lib/components/recipes/IngredientListList.svelte
diff --git a/src/lib/components/IngredientsPage.svelte b/src/lib/components/recipes/IngredientsPage.svelte
similarity index 100%
rename from src/lib/components/IngredientsPage.svelte
rename to src/lib/components/recipes/IngredientsPage.svelte
diff --git a/src/lib/components/InstructionsPage.svelte b/src/lib/components/recipes/InstructionsPage.svelte
similarity index 100%
rename from src/lib/components/InstructionsPage.svelte
rename to src/lib/components/recipes/InstructionsPage.svelte
diff --git a/src/lib/components/LogicModeToggle.svelte b/src/lib/components/recipes/LogicModeToggle.svelte
similarity index 100%
rename from src/lib/components/LogicModeToggle.svelte
rename to src/lib/components/recipes/LogicModeToggle.svelte
diff --git a/src/lib/components/MediaScroller.svelte b/src/lib/components/recipes/MediaScroller.svelte
similarity index 100%
rename from src/lib/components/MediaScroller.svelte
rename to src/lib/components/recipes/MediaScroller.svelte
diff --git a/src/lib/components/RecipeEditor.svelte b/src/lib/components/recipes/RecipeEditor.svelte
similarity index 75%
rename from src/lib/components/RecipeEditor.svelte
rename to src/lib/components/recipes/RecipeEditor.svelte
index ab5a3bc..ce04910 100644
--- a/src/lib/components/RecipeEditor.svelte
+++ b/src/lib/components/recipes/RecipeEditor.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import CardAdd from '$lib/components/CardAdd.svelte';
-    	import MediaScroller from '$lib/components/MediaScroller.svelte';
-    	import Card from '$lib/components/Card.svelte';
-    	import Search from '$lib/components/Search.svelte';
-	import SeasonSelect from '$lib/components/SeasonSelect.svelte';
-	import CreateIngredientList from '$lib/components/CreateIngredientList.svelte';
-	import CreateStepList from '$lib/components/CreateStepList.svelte';
+	import CardAdd from '$lib/components/recipes/CardAdd.svelte';
+    	import MediaScroller from '$lib/components/recipes/MediaScroller.svelte';
+    	import Card from '$lib/components/recipes/Card.svelte';
+    	import Search from '$lib/components/recipes/Search.svelte';
+	import SeasonSelect from '$lib/components/recipes/SeasonSelect.svelte';
+	import CreateIngredientList from '$lib/components/recipes/CreateIngredientList.svelte';
+	import CreateStepList from '$lib/components/recipes/CreateStepList.svelte';
 
 	let {
 		card_data = $bindable({}),
diff --git a/src/lib/components/RecipeLanguageSwitcher.svelte b/src/lib/components/recipes/RecipeLanguageSwitcher.svelte
similarity index 100%
rename from src/lib/components/RecipeLanguageSwitcher.svelte
rename to src/lib/components/recipes/RecipeLanguageSwitcher.svelte
diff --git a/src/lib/components/RecipeNote.svelte b/src/lib/components/recipes/RecipeNote.svelte
similarity index 100%
rename from src/lib/components/RecipeNote.svelte
rename to src/lib/components/recipes/RecipeNote.svelte
diff --git a/src/lib/components/Recipes.svelte b/src/lib/components/recipes/Recipes.svelte
similarity index 100%
rename from src/lib/components/Recipes.svelte
rename to src/lib/components/recipes/Recipes.svelte
diff --git a/src/lib/components/Search.svelte b/src/lib/components/recipes/Search.svelte
similarity index 100%
rename from src/lib/components/Search.svelte
rename to src/lib/components/recipes/Search.svelte
diff --git a/src/lib/components/SeasonFilter.svelte b/src/lib/components/recipes/SeasonFilter.svelte
similarity index 98%
rename from src/lib/components/SeasonFilter.svelte
rename to src/lib/components/recipes/SeasonFilter.svelte
index 6f14556..9dc00b6 100644
--- a/src/lib/components/SeasonFilter.svelte
+++ b/src/lib/components/recipes/SeasonFilter.svelte
@@ -1,6 +1,6 @@
 <script>
 	import "$lib/css/nordtheme.css";
-	import TagChip from './TagChip.svelte';
+	import TagChip from '$lib/components/recipes/TagChip.svelte';
 
 	let {
 		selectedSeasons = [],
diff --git a/src/lib/components/SeasonLayout.svelte b/src/lib/components/recipes/SeasonLayout.svelte
similarity index 96%
rename from src/lib/components/SeasonLayout.svelte
rename to src/lib/components/recipes/SeasonLayout.svelte
index 4e7d338..13f6d99 100644
--- a/src/lib/components/SeasonLayout.svelte
+++ b/src/lib/components/recipes/SeasonLayout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import type { Snippet } from 'svelte';
     import '$lib/css/nordtheme.css';
-    import Recipes from '$lib/components/Recipes.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
     import Search from './Search.svelte';
 
     let {
diff --git a/src/lib/components/SeasonSelect.svelte b/src/lib/components/recipes/SeasonSelect.svelte
similarity index 100%
rename from src/lib/components/SeasonSelect.svelte
rename to src/lib/components/recipes/SeasonSelect.svelte
diff --git a/src/lib/components/TagChip.svelte b/src/lib/components/recipes/TagChip.svelte
similarity index 100%
rename from src/lib/components/TagChip.svelte
rename to src/lib/components/recipes/TagChip.svelte
diff --git a/src/lib/components/TagFilter.svelte b/src/lib/components/recipes/TagFilter.svelte
similarity index 98%
rename from src/lib/components/TagFilter.svelte
rename to src/lib/components/recipes/TagFilter.svelte
index 13ab7fc..f4312da 100644
--- a/src/lib/components/TagFilter.svelte
+++ b/src/lib/components/recipes/TagFilter.svelte
@@ -1,6 +1,6 @@
 <script>
 	import "$lib/css/nordtheme.css";
-	import TagChip from './TagChip.svelte';
+	import TagChip from '$lib/components/recipes/TagChip.svelte';
 
 	let {
 		availableTags = [],
diff --git a/src/lib/components/TitleImgParallax.svelte b/src/lib/components/recipes/TitleImgParallax.svelte
similarity index 98%
rename from src/lib/components/TitleImgParallax.svelte
rename to src/lib/components/recipes/TitleImgParallax.svelte
index 979098e..79318c6 100644
--- a/src/lib/components/TitleImgParallax.svelte
+++ b/src/lib/components/recipes/TitleImgParallax.svelte
@@ -31,7 +31,7 @@
 	import Cross from "$lib/assets/icons/Cross.svelte";
 	import "$lib/css/action_button.css";
 	import "$lib/css/shake.css";
-	import { do_on_key } from "./do_on_key";
+	import { do_on_key } from "$lib/components/recipes/do_on_key";
 </script>
 <style>
 :root {
diff --git a/src/lib/components/TranslationApproval.svelte b/src/lib/components/recipes/TranslationApproval.svelte
similarity index 99%
rename from src/lib/components/TranslationApproval.svelte
rename to src/lib/components/recipes/TranslationApproval.svelte
index 5ceac80..2912131 100644
--- a/src/lib/components/TranslationApproval.svelte
+++ b/src/lib/components/recipes/TranslationApproval.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import type { TranslatedRecipeType } from '$types/types';
 	import TranslationFieldComparison from './TranslationFieldComparison.svelte';
-	import CreateIngredientList from './CreateIngredientList.svelte';
-	import CreateStepList from './CreateStepList.svelte';
+	import CreateIngredientList from '$lib/components/recipes/CreateIngredientList.svelte';
+	import CreateStepList from '$lib/components/recipes/CreateStepList.svelte';
 	import GenerateAltTextButton from './GenerateAltTextButton.svelte';
 
 	interface Props {
diff --git a/src/lib/components/TranslationFieldComparison.svelte b/src/lib/components/recipes/TranslationFieldComparison.svelte
similarity index 100%
rename from src/lib/components/TranslationFieldComparison.svelte
rename to src/lib/components/recipes/TranslationFieldComparison.svelte
diff --git a/src/lib/components/do_on_key.js b/src/lib/components/recipes/do_on_key.js
similarity index 100%
rename from src/lib/components/do_on_key.js
rename to src/lib/components/recipes/do_on_key.js
diff --git a/src/lib/offline/db.ts b/src/lib/offline/db.ts
index ee31c19..6ce00b1 100644
--- a/src/lib/offline/db.ts
+++ b/src/lib/offline/db.ts
@@ -1,4 +1,4 @@
-import type { BriefRecipeType, RecipeModelType } from '../../types/types';
+import type { BriefRecipeType, RecipeModelType } from '$types/types';
 
 const DB_NAME = 'bocken-recipes';
 const DB_VERSION = 2; // Bumped to force recreation of stores
diff --git a/src/lib/offline/sync.ts b/src/lib/offline/sync.ts
index bc83a6e..71e7a99 100644
--- a/src/lib/offline/sync.ts
+++ b/src/lib/offline/sync.ts
@@ -1,5 +1,5 @@
 import { saveAllRecipes } from './db';
-import type { BriefRecipeType, RecipeModelType } from '../../types/types';
+import type { BriefRecipeType, RecipeModelType } from '$types/types';
 
 // Discover glaube routes at build time using Vite's glob import
 const glaubePageModules = import.meta.glob('/src/routes/glaube/**/+page.svelte');
diff --git a/src/lib/server/scheduler.ts b/src/lib/server/scheduler.ts
index b4964bd..a3da107 100644
--- a/src/lib/server/scheduler.ts
+++ b/src/lib/server/scheduler.ts
@@ -1,9 +1,9 @@
 import cron from 'node-cron';
-import { RecurringPayment } from '../../models/RecurringPayment';
-import { Payment } from '../../models/Payment';
-import { PaymentSplit } from '../../models/PaymentSplit';
-import { dbConnect, dbDisconnect } from '../../utils/db';
-import { calculateNextExecutionDate } from '../utils/recurring';
+import { RecurringPayment } from '$models/RecurringPayment';
+import { Payment } from '$models/Payment';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { dbConnect, dbDisconnect } from '$utils/db';
+import { calculateNextExecutionDate } from '$lib/utils/recurring';
 
 class RecurringPaymentScheduler {
   private isRunning = false;
diff --git a/src/lib/utils/currency.ts b/src/lib/utils/currency.ts
index c3ce617..3d8ef79 100644
--- a/src/lib/utils/currency.ts
+++ b/src/lib/utils/currency.ts
@@ -1,5 +1,5 @@
-import { ExchangeRate } from '../../models/ExchangeRate';
-import { dbConnect, dbDisconnect } from '../../utils/db';
+import { ExchangeRate } from '$models/ExchangeRate';
+import { dbConnect, dbDisconnect } from '$utils/db';
 
 /**
  * Convert amount from foreign currency to CHF using direct database/API access
diff --git a/src/lib/utils/recurring.ts b/src/lib/utils/recurring.ts
index e325ae6..07d16e4 100644
--- a/src/lib/utils/recurring.ts
+++ b/src/lib/utils/recurring.ts
@@ -1,4 +1,4 @@
-import type { IRecurringPayment } from '../../models/RecurringPayment';
+import type { IRecurringPayment } from '$models/RecurringPayment';
 
 export interface CronJobFields {
   minute: string;
diff --git a/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/+page.svelte b/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/+page.svelte
index 98d904f..dbbc9de 100644
--- a/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/+page.svelte
+++ b/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/+page.svelte
@@ -5,22 +5,22 @@
 	import "$lib/css/christ.css";
 	import "$lib/css/nordtheme.css";
 	import Gebet from "./Gebet.svelte";
-	import LanguageToggle from "$lib/components/LanguageToggle.svelte";
+	import LanguageToggle from "$lib/components/faith/LanguageToggle.svelte";
 	import SearchInput from "$lib/components/SearchInput.svelte";
-	import Kreuzzeichen from "$lib/components/prayers/Kreuzzeichen.svelte";
-	import GloriaPatri from "$lib/components/prayers/GloriaPatri.svelte";
-	import Paternoster from "$lib/components/prayers/Paternoster.svelte";
-	import Credo from "$lib/components/prayers/Credo.svelte";
-	import AveMaria from "$lib/components/prayers/AveMaria.svelte";
-	import SalveRegina from "$lib/components/prayers/SalveRegina.svelte";
-	import FatimaGebet from "$lib/components/prayers/FatimaGebet.svelte";
-	import Gloria from "$lib/components/prayers/Gloria.svelte";
-	import MichaelGebet from "$lib/components/prayers/MichaelGebet.svelte";
-	import BruderKlausGebet from "$lib/components/prayers/BruderKlausGebet.svelte";
-	import JosephGebet from "$lib/components/prayers/JosephGebet.svelte";
-	import Confiteor from "$lib/components/prayers/Confiteor.svelte";
-	import AblassGebete from "$lib/components/prayers/AblassGebete.svelte";
-	import Prayer from "$lib/components/prayers/Prayer.svelte";
+	import Kreuzzeichen from "$lib/components/faith/prayers/Kreuzzeichen.svelte";
+	import GloriaPatri from "$lib/components/faith/prayers/GloriaPatri.svelte";
+	import Paternoster from "$lib/components/faith/prayers/Paternoster.svelte";
+	import Credo from "$lib/components/faith/prayers/Credo.svelte";
+	import AveMaria from "$lib/components/faith/prayers/AveMaria.svelte";
+	import SalveRegina from "$lib/components/faith/prayers/SalveRegina.svelte";
+	import FatimaGebet from "$lib/components/faith/prayers/FatimaGebet.svelte";
+	import Gloria from "$lib/components/faith/prayers/Gloria.svelte";
+	import MichaelGebet from "$lib/components/faith/prayers/MichaelGebet.svelte";
+	import BruderKlausGebet from "$lib/components/faith/prayers/BruderKlausGebet.svelte";
+	import JosephGebet from "$lib/components/faith/prayers/JosephGebet.svelte";
+	import Confiteor from "$lib/components/faith/prayers/Confiteor.svelte";
+	import AblassGebete from "$lib/components/faith/prayers/AblassGebete.svelte";
+	import Prayer from "$lib/components/faith/prayers/Prayer.svelte";
 
 	let { data } = $props();
 
diff --git a/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/[prayer]/+page.svelte b/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/[prayer]/+page.svelte
index eb93029..6ab80ef 100644
--- a/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/[prayer]/+page.svelte
+++ b/src/routes/[faithLang=faithLang]/[prayers=prayersLang]/[prayer]/+page.svelte
@@ -3,21 +3,21 @@
 	import { createLanguageContext } from "$lib/contexts/languageContext.js";
 	import "$lib/css/christ.css";
 	import "$lib/css/nordtheme.css";
-	import LanguageToggle from "$lib/components/LanguageToggle.svelte";
-	import Kreuzzeichen from "$lib/components/prayers/Kreuzzeichen.svelte";
-	import GloriaPatri from "$lib/components/prayers/GloriaPatri.svelte";
-	import Paternoster from "$lib/components/prayers/Paternoster.svelte";
-	import Credo from "$lib/components/prayers/Credo.svelte";
-	import AveMaria from "$lib/components/prayers/AveMaria.svelte";
-	import SalveRegina from "$lib/components/prayers/SalveRegina.svelte";
-	import FatimaGebet from "$lib/components/prayers/FatimaGebet.svelte";
-	import Gloria from "$lib/components/prayers/Gloria.svelte";
-	import MichaelGebet from "$lib/components/prayers/MichaelGebet.svelte";
-	import BruderKlausGebet from "$lib/components/prayers/BruderKlausGebet.svelte";
-	import JosephGebet from "$lib/components/prayers/JosephGebet.svelte";
-	import Confiteor from "$lib/components/prayers/Confiteor.svelte";
-	import AblassGebete from "$lib/components/prayers/AblassGebete.svelte";
-	import StickyImage from "$lib/components/StickyImage.svelte";
+	import LanguageToggle from "$lib/components/faith/LanguageToggle.svelte";
+	import Kreuzzeichen from "$lib/components/faith/prayers/Kreuzzeichen.svelte";
+	import GloriaPatri from "$lib/components/faith/prayers/GloriaPatri.svelte";
+	import Paternoster from "$lib/components/faith/prayers/Paternoster.svelte";
+	import Credo from "$lib/components/faith/prayers/Credo.svelte";
+	import AveMaria from "$lib/components/faith/prayers/AveMaria.svelte";
+	import SalveRegina from "$lib/components/faith/prayers/SalveRegina.svelte";
+	import FatimaGebet from "$lib/components/faith/prayers/FatimaGebet.svelte";
+	import Gloria from "$lib/components/faith/prayers/Gloria.svelte";
+	import MichaelGebet from "$lib/components/faith/prayers/MichaelGebet.svelte";
+	import BruderKlausGebet from "$lib/components/faith/prayers/BruderKlausGebet.svelte";
+	import JosephGebet from "$lib/components/faith/prayers/JosephGebet.svelte";
+	import Confiteor from "$lib/components/faith/prayers/Confiteor.svelte";
+	import AblassGebete from "$lib/components/faith/prayers/AblassGebete.svelte";
+	import StickyImage from "$lib/components/faith/StickyImage.svelte";
 
 	let { data } = $props();
 
diff --git a/src/routes/[faithLang=faithLang]/[rosary=rosaryLang]/+page.svelte b/src/routes/[faithLang=faithLang]/[rosary=rosaryLang]/+page.svelte
index 49dd20d..48c6144 100644
--- a/src/routes/[faithLang=faithLang]/[rosary=rosaryLang]/+page.svelte
+++ b/src/routes/[faithLang=faithLang]/[rosary=rosaryLang]/+page.svelte
@@ -2,24 +2,24 @@
 import { onMount, tick } from "svelte";
 import { createLanguageContext } from "$lib/contexts/languageContext.js";
 import { createPip } from "$lib/js/pip.svelte";
-import PipImage from "$lib/components/PipImage.svelte";
+import PipImage from "$lib/components/faith/PipImage.svelte";
 import "$lib/css/christ.css";
 import "$lib/css/action_button.css";
-import Kreuzzeichen from "$lib/components/prayers/Kreuzzeichen.svelte";
-import Credo from "$lib/components/prayers/Credo.svelte";
-import Paternoster from "$lib/components/prayers/Paternoster.svelte";
-import AveMaria from "$lib/components/prayers/AveMaria.svelte";
-import GloriaPatri from "$lib/components/prayers/GloriaPatri.svelte";
-import FatimaGebet from "$lib/components/prayers/FatimaGebet.svelte";
-import SalveRegina from "$lib/components/prayers/SalveRegina.svelte";
-import RosaryFinalPrayer from "$lib/components/prayers/RosaryFinalPrayer.svelte";
-import MichaelGebet from "$lib/components/prayers/MichaelGebet.svelte";
+import Kreuzzeichen from "$lib/components/faith/prayers/Kreuzzeichen.svelte";
+import Credo from "$lib/components/faith/prayers/Credo.svelte";
+import Paternoster from "$lib/components/faith/prayers/Paternoster.svelte";
+import AveMaria from "$lib/components/faith/prayers/AveMaria.svelte";
+import GloriaPatri from "$lib/components/faith/prayers/GloriaPatri.svelte";
+import FatimaGebet from "$lib/components/faith/prayers/FatimaGebet.svelte";
+import SalveRegina from "$lib/components/faith/prayers/SalveRegina.svelte";
+import RosaryFinalPrayer from "$lib/components/faith/prayers/RosaryFinalPrayer.svelte";
+import MichaelGebet from "$lib/components/faith/prayers/MichaelGebet.svelte";
 import CounterButton from "$lib/components/CounterButton.svelte";
-import BibleModal from "$lib/components/BibleModal.svelte";
+import BibleModal from "$lib/components/faith/BibleModal.svelte";
 import Toggle from "$lib/components/Toggle.svelte";
-import LanguageToggle from "$lib/components/LanguageToggle.svelte";
-import StreakCounter from "$lib/components/StreakCounter.svelte";
-import MysteryIcon from "$lib/components/MysteryIcon.svelte";
+import LanguageToggle from "$lib/components/faith/LanguageToggle.svelte";
+import StreakCounter from "$lib/components/faith/StreakCounter.svelte";
+import MysteryIcon from "$lib/components/faith/MysteryIcon.svelte";
 let { data } = $props();
 
 // Mystery variations for each type of rosary
diff --git a/src/routes/[faithLang=faithLang]/angelus/+page.svelte b/src/routes/[faithLang=faithLang]/angelus/+page.svelte
index 6d6f49d..83073a5 100644
--- a/src/routes/[faithLang=faithLang]/angelus/+page.svelte
+++ b/src/routes/[faithLang=faithLang]/angelus/+page.svelte
@@ -1,9 +1,9 @@
 <script>
 	import { onMount } from 'svelte';
 	import { createLanguageContext } from "$lib/contexts/languageContext.js";
-	import LanguageToggle from "$lib/components/LanguageToggle.svelte";
-	import Prayer from '$lib/components/prayers/Prayer.svelte';
-	import AveMaria from '$lib/components/prayers/AveMaria.svelte';
+	import LanguageToggle from "$lib/components/faith/LanguageToggle.svelte";
+	import Prayer from '$lib/components/faith/prayers/Prayer.svelte';
+	import AveMaria from '$lib/components/faith/prayers/AveMaria.svelte';
 	import "$lib/css/christ.css";
 	import "$lib/css/rosenkranz.css";
 
diff --git a/src/routes/[recipeLang=recipeLang]/+page.svelte b/src/routes/[recipeLang=recipeLang]/+page.svelte
index f666109..e341e3c 100644
--- a/src/routes/[recipeLang=recipeLang]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import type { PageData } from './$types';
-    	import MediaScroller from '$lib/components/MediaScroller.svelte';
+    	import MediaScroller from '$lib/components/recipes/MediaScroller.svelte';
     	import AddButton from '$lib/components/AddButton.svelte';
-    	import Card from '$lib/components/Card.svelte';
-    	import Search from '$lib/components/Search.svelte';
+    	import Card from '$lib/components/recipes/Card.svelte';
+    	import Search from '$lib/components/recipes/Search.svelte';
 	import LazyCategory from '$lib/components/LazyCategory.svelte';
 	import { getCategories } from '$lib/js/categories';
     	let { data } = $props<{ data: PageData }>();
diff --git a/src/routes/[recipeLang=recipeLang]/[name]/+page.svelte b/src/routes/[recipeLang=recipeLang]/[name]/+page.svelte
index f70ce5b..47f6180 100644
--- a/src/routes/[recipeLang=recipeLang]/[name]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/[name]/+page.svelte
@@ -5,12 +5,12 @@
 	import type { PageData } from './$types';
     	import "$lib/css/nordtheme.css"
 	import EditButton from '$lib/components/EditButton.svelte';
-	import InstructionsPage from '$lib/components/InstructionsPage.svelte';
-	import IngredientsPage from '$lib/components/IngredientsPage.svelte';
-	import TitleImgParallax from '$lib/components/TitleImgParallax.svelte';
+	import InstructionsPage from '$lib/components/recipes/InstructionsPage.svelte';
+	import IngredientsPage from '$lib/components/recipes/IngredientsPage.svelte';
+	import TitleImgParallax from '$lib/components/recipes/TitleImgParallax.svelte';
 	import { afterNavigate } from '$app/navigation';
     	import {season} from '$lib/js/season_store';
-	import RecipeNote from '$lib/components/RecipeNote.svelte';
+	import RecipeNote from '$lib/components/recipes/RecipeNote.svelte';
 	import FavoriteButton from '$lib/components/FavoriteButton.svelte';
 	import { onDestroy } from 'svelte';
 	import { recipeTranslationStore } from '$lib/stores/recipeTranslation';
diff --git a/src/routes/[recipeLang=recipeLang]/add/+page.svelte b/src/routes/[recipeLang=recipeLang]/add/+page.svelte
index 51b7341..e7b5ca5 100644
--- a/src/routes/[recipeLang=recipeLang]/add/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/add/+page.svelte
@@ -3,11 +3,11 @@
 	import { tick } from 'svelte';
 	import type { ActionData, PageData } from './$types';
 	import Check from '$lib/assets/icons/Check.svelte';
-	import SeasonSelect from '$lib/components/SeasonSelect.svelte';
-	import TranslationApproval from '$lib/components/TranslationApproval.svelte';
-	import CardAdd from '$lib/components/CardAdd.svelte';
-	import CreateIngredientList from '$lib/components/CreateIngredientList.svelte';
-	import CreateStepList from '$lib/components/CreateStepList.svelte';
+	import SeasonSelect from '$lib/components/recipes/SeasonSelect.svelte';
+	import TranslationApproval from '$lib/components/recipes/TranslationApproval.svelte';
+	import CardAdd from '$lib/components/recipes/CardAdd.svelte';
+	import CreateIngredientList from '$lib/components/recipes/CreateIngredientList.svelte';
+	import CreateStepList from '$lib/components/recipes/CreateStepList.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
 	import '$lib/css/action_button.css';
 	import '$lib/css/nordtheme.css';
diff --git a/src/routes/[recipeLang=recipeLang]/admin/untranslated/+page.svelte b/src/routes/[recipeLang=recipeLang]/admin/untranslated/+page.svelte
index 8830392..66ef8ef 100644
--- a/src/routes/[recipeLang=recipeLang]/admin/untranslated/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/admin/untranslated/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import type { PageData } from './$types';
 	import '$lib/css/nordtheme.css';
-	import Recipes from '$lib/components/Recipes.svelte';
-	import Card from '$lib/components/Card.svelte';
+	import Recipes from '$lib/components/recipes/Recipes.svelte';
+	import Card from '$lib/components/recipes/Card.svelte';
 
 	let { data } = $props<{ data: PageData }>();
 	let current_month = new Date().getMonth() + 1;
diff --git a/src/routes/[recipeLang=recipeLang]/category/[category]/+page.svelte b/src/routes/[recipeLang=recipeLang]/category/[category]/+page.svelte
index 4591071..5f1bdfc 100644
--- a/src/routes/[recipeLang=recipeLang]/category/[category]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/category/[category]/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import type { PageData } from './$types';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import Search from '$lib/components/Search.svelte';
-    import Card from '$lib/components/Card.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
+    import Card from '$lib/components/recipes/Card.svelte';
     import { rand_array } from '$lib/js/randomize';
     import { createSearchFilter } from '$lib/js/searchFilter.svelte';
 
diff --git a/src/routes/[recipeLang=recipeLang]/edit/[name]/+page.svelte b/src/routes/[recipeLang=recipeLang]/edit/[name]/+page.svelte
index 17e6a5e..7e87cae 100644
--- a/src/routes/[recipeLang=recipeLang]/edit/[name]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/edit/[name]/+page.svelte
@@ -4,13 +4,13 @@
 	import type { ActionData, PageData } from './$types';
 	import Check from '$lib/assets/icons/Check.svelte';
 	import Cross from '$lib/assets/icons/Cross.svelte';
-	import SeasonSelect from '$lib/components/SeasonSelect.svelte';
-	import TranslationApproval from '$lib/components/TranslationApproval.svelte';
-	import GenerateAltTextButton from '$lib/components/GenerateAltTextButton.svelte';
-	import EditRecipeNote from '$lib/components/EditRecipeNote.svelte';
-	import CardAdd from '$lib/components/CardAdd.svelte';
-	import CreateIngredientList from '$lib/components/CreateIngredientList.svelte';
-	import CreateStepList from '$lib/components/CreateStepList.svelte';
+	import SeasonSelect from '$lib/components/recipes/SeasonSelect.svelte';
+	import TranslationApproval from '$lib/components/recipes/TranslationApproval.svelte';
+	import GenerateAltTextButton from '$lib/components/recipes/GenerateAltTextButton.svelte';
+	import EditRecipeNote from '$lib/components/recipes/EditRecipeNote.svelte';
+	import CardAdd from '$lib/components/recipes/CardAdd.svelte';
+	import CreateIngredientList from '$lib/components/recipes/CreateIngredientList.svelte';
+	import CreateStepList from '$lib/components/recipes/CreateStepList.svelte';
 	import Toggle from '$lib/components/Toggle.svelte';
 	import { season } from '$lib/js/season_store';
 	import { portions } from '$lib/js/portions_store';
diff --git a/src/routes/[recipeLang=recipeLang]/favorites/+page.svelte b/src/routes/[recipeLang=recipeLang]/favorites/+page.svelte
index 97360b3..c1daab4 100644
--- a/src/routes/[recipeLang=recipeLang]/favorites/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/favorites/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import type { PageData } from './$types';
     import '$lib/css/nordtheme.css';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import Card from '$lib/components/Card.svelte';
-    import Search from '$lib/components/Search.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import Card from '$lib/components/recipes/Card.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
     import { createSearchFilter } from '$lib/js/searchFilter.svelte';
 
     let { data } = $props<{ data: PageData }>();
diff --git a/src/routes/[recipeLang=recipeLang]/icon/+page.svelte b/src/routes/[recipeLang=recipeLang]/icon/+page.svelte
index 02f9b44..92c9323 100644
--- a/src/routes/[recipeLang=recipeLang]/icon/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/icon/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import type { PageData } from './$types';
     import '$lib/css/nordtheme.css';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import MediaScroller from '$lib/components/MediaScroller.svelte';
-    import SeasonLayout from '$lib/components/SeasonLayout.svelte'
-    import Card from '$lib/components/Card.svelte';
-    import Search from '$lib/components/Search.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import MediaScroller from '$lib/components/recipes/MediaScroller.svelte';
+    import SeasonLayout from '$lib/components/recipes/SeasonLayout.svelte'
+    import Card from '$lib/components/recipes/Card.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
     let { data } = $props<{ data: PageData }>();
 
     const isEnglish = $derived(data.lang === 'en');
diff --git a/src/routes/[recipeLang=recipeLang]/icon/[icon]/+page.svelte b/src/routes/[recipeLang=recipeLang]/icon/[icon]/+page.svelte
index 9f8672b..babe0b5 100644
--- a/src/routes/[recipeLang=recipeLang]/icon/[icon]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/icon/[icon]/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import type { PageData } from './$types';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import IconLayout from '$lib/components/IconLayout.svelte';
-    import MediaScroller from '$lib/components/MediaScroller.svelte';
-    import Card from '$lib/components/Card.svelte';
-    import Search from '$lib/components/Search.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import IconLayout from '$lib/components/recipes/IconLayout.svelte';
+    import MediaScroller from '$lib/components/recipes/MediaScroller.svelte';
+    import Card from '$lib/components/recipes/Card.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
     let { data } = $props<{ data: PageData }>();
     import { rand_array } from '$lib/js/randomize';
 
diff --git a/src/routes/[recipeLang=recipeLang]/search/+page.svelte b/src/routes/[recipeLang=recipeLang]/search/+page.svelte
index 0e20a39..790f150 100644
--- a/src/routes/[recipeLang=recipeLang]/search/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/search/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import type { PageData } from './$types';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import Search from '$lib/components/Search.svelte';
-    import Card from '$lib/components/Card.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
+    import Card from '$lib/components/recipes/Card.svelte';
     let { data } = $props<{ data: PageData }>();
     let current_month = new Date().getMonth() + 1;
 
diff --git a/src/routes/[recipeLang=recipeLang]/season/+page.svelte b/src/routes/[recipeLang=recipeLang]/season/+page.svelte
index b2a018b..0c29857 100644
--- a/src/routes/[recipeLang=recipeLang]/season/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/season/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import type { PageData } from './$types';
     import '$lib/css/nordtheme.css';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import MediaScroller from '$lib/components/MediaScroller.svelte';
-    import SeasonLayout from '$lib/components/SeasonLayout.svelte'
-    import Card from '$lib/components/Card.svelte';
-    import Search from '$lib/components/Search.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import MediaScroller from '$lib/components/recipes/MediaScroller.svelte';
+    import SeasonLayout from '$lib/components/recipes/SeasonLayout.svelte'
+    import Card from '$lib/components/recipes/Card.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
     let { data } = $props<{ data: PageData }>();
     let current_month = new Date().getMonth() + 1
     import { rand_array } from '$lib/js/randomize';
diff --git a/src/routes/[recipeLang=recipeLang]/season/[month]/+page.svelte b/src/routes/[recipeLang=recipeLang]/season/[month]/+page.svelte
index 99f3a71..f83ca13 100644
--- a/src/routes/[recipeLang=recipeLang]/season/[month]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/season/[month]/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import type { PageData } from './$types';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import SeasonLayout from '$lib/components/SeasonLayout.svelte';
-    import MediaScroller from '$lib/components/MediaScroller.svelte';
-    import Card from '$lib/components/Card.svelte';
-    import Search from '$lib/components/Search.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import SeasonLayout from '$lib/components/recipes/SeasonLayout.svelte';
+    import MediaScroller from '$lib/components/recipes/MediaScroller.svelte';
+    import Card from '$lib/components/recipes/Card.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
     let { data } = $props<{ data: PageData }>();
 
     const isEnglish = $derived(data.lang === 'en');
diff --git a/src/routes/[recipeLang=recipeLang]/tag/[tag]/+page.svelte b/src/routes/[recipeLang=recipeLang]/tag/[tag]/+page.svelte
index 963fd2b..aa003dd 100644
--- a/src/routes/[recipeLang=recipeLang]/tag/[tag]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/tag/[tag]/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import type { PageData } from './$types';
-    import Recipes from '$lib/components/Recipes.svelte';
-    import Card from '$lib/components/Card.svelte';
-    import Search from '$lib/components/Search.svelte';
+    import Recipes from '$lib/components/recipes/Recipes.svelte';
+    import Card from '$lib/components/recipes/Card.svelte';
+    import Search from '$lib/components/recipes/Search.svelte';
     import { rand_array } from '$lib/js/randomize';
     import { createSearchFilter } from '$lib/js/searchFilter.svelte';
 
diff --git a/src/routes/api/cospend/balance/+server.ts b/src/routes/api/cospend/balance/+server.ts
index 38719eb..14ac655 100644
--- a/src/routes/api/cospend/balance/+server.ts
+++ b/src/routes/api/cospend/balance/+server.ts
@@ -1,7 +1,7 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { PaymentSplit } from '../../../../models/PaymentSplit';
-import { Payment } from '../../../../models/Payment'; // Need to import Payment for populate to work
-import { dbConnect } from '../../../../utils/db';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { Payment } from '$models/Payment'; // Need to import Payment for populate to work
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
 import cache from '$lib/server/cache';
 
diff --git a/src/routes/api/cospend/debts/+server.ts b/src/routes/api/cospend/debts/+server.ts
index 67d58b4..89a3469 100644
--- a/src/routes/api/cospend/debts/+server.ts
+++ b/src/routes/api/cospend/debts/+server.ts
@@ -1,7 +1,7 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { PaymentSplit } from '../../../../models/PaymentSplit';
-import { Payment } from '../../../../models/Payment';
-import { dbConnect } from '../../../../utils/db';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { Payment } from '$models/Payment';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
 import cache from '$lib/server/cache';
 
diff --git a/src/routes/api/cospend/exchange-rates/+server.ts b/src/routes/api/cospend/exchange-rates/+server.ts
index f3c47cd..ececc6c 100644
--- a/src/routes/api/cospend/exchange-rates/+server.ts
+++ b/src/routes/api/cospend/exchange-rates/+server.ts
@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { ExchangeRate } from '../../../../models/ExchangeRate';
-import { dbConnect } from '../../../../utils/db';
+import { ExchangeRate } from '$models/ExchangeRate';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async ({ locals, url }) => {
diff --git a/src/routes/api/cospend/monthly-expenses/+server.ts b/src/routes/api/cospend/monthly-expenses/+server.ts
index cb955e8..fe7d1c6 100644
--- a/src/routes/api/cospend/monthly-expenses/+server.ts
+++ b/src/routes/api/cospend/monthly-expenses/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
-import { Payment } from '../../../../models/Payment';
-import { dbConnect } from '../../../../utils/db';
+import { Payment } from '$models/Payment';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({ url, locals }) => {
   const session = await locals.auth();
diff --git a/src/routes/api/cospend/payments/+server.ts b/src/routes/api/cospend/payments/+server.ts
index ff8a6c9..39ac208 100644
--- a/src/routes/api/cospend/payments/+server.ts
+++ b/src/routes/api/cospend/payments/+server.ts
@@ -1,8 +1,8 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Payment } from '../../../../models/Payment';
-import { PaymentSplit } from '../../../../models/PaymentSplit';
-import { dbConnect } from '../../../../utils/db';
-import { convertToCHF, isValidCurrencyCode } from '../../../../lib/utils/currency';
+import { Payment } from '$models/Payment';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { dbConnect } from '$utils/db';
+import { convertToCHF, isValidCurrencyCode } from '$lib/utils/currency';
 import { error, json } from '@sveltejs/kit';
 import cache, { invalidateCospendCaches } from '$lib/server/cache';
 
diff --git a/src/routes/api/cospend/payments/[id]/+server.ts b/src/routes/api/cospend/payments/[id]/+server.ts
index c1905b4..cc02ef0 100644
--- a/src/routes/api/cospend/payments/[id]/+server.ts
+++ b/src/routes/api/cospend/payments/[id]/+server.ts
@@ -1,7 +1,7 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Payment } from '../../../../../models/Payment';
-import { PaymentSplit } from '../../../../../models/PaymentSplit';
-import { dbConnect } from '../../../../../utils/db';
+import { Payment } from '$models/Payment';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
 import cache, { invalidateCospendCaches } from '$lib/server/cache';
 
diff --git a/src/routes/api/cospend/recurring-payments/+server.ts b/src/routes/api/cospend/recurring-payments/+server.ts
index 5224cd6..dc1086d 100644
--- a/src/routes/api/cospend/recurring-payments/+server.ts
+++ b/src/routes/api/cospend/recurring-payments/+server.ts
@@ -1,8 +1,8 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { RecurringPayment } from '../../../../models/RecurringPayment';
-import { dbConnect } from '../../../../utils/db';
+import { RecurringPayment } from '$models/RecurringPayment';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
-import { calculateNextExecutionDate, validateCronExpression } from '../../../../lib/utils/recurring';
+import { calculateNextExecutionDate, validateCronExpression } from '$lib/utils/recurring';
 
 export const GET: RequestHandler = async ({ locals, url }) => {
   const auth = await locals.auth();
diff --git a/src/routes/api/cospend/recurring-payments/[id]/+server.ts b/src/routes/api/cospend/recurring-payments/[id]/+server.ts
index 697467f..2aaa771 100644
--- a/src/routes/api/cospend/recurring-payments/[id]/+server.ts
+++ b/src/routes/api/cospend/recurring-payments/[id]/+server.ts
@@ -1,8 +1,8 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { RecurringPayment } from '../../../../../models/RecurringPayment';
-import { dbConnect } from '../../../../../utils/db';
+import { RecurringPayment } from '$models/RecurringPayment';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
-import { calculateNextExecutionDate, validateCronExpression } from '../../../../../lib/utils/recurring';
+import { calculateNextExecutionDate, validateCronExpression } from '$lib/utils/recurring';
 import mongoose from 'mongoose';
 
 export const GET: RequestHandler = async ({ params, locals }) => {
diff --git a/src/routes/api/cospend/recurring-payments/cron-execute/+server.ts b/src/routes/api/cospend/recurring-payments/cron-execute/+server.ts
index 6a88fff..86eaa5d 100644
--- a/src/routes/api/cospend/recurring-payments/cron-execute/+server.ts
+++ b/src/routes/api/cospend/recurring-payments/cron-execute/+server.ts
@@ -1,10 +1,10 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { RecurringPayment } from '../../../../../models/RecurringPayment';
-import { Payment } from '../../../../../models/Payment';
-import { PaymentSplit } from '../../../../../models/PaymentSplit';
-import { dbConnect } from '../../../../../utils/db';
+import { RecurringPayment } from '$models/RecurringPayment';
+import { Payment } from '$models/Payment';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
-import { calculateNextExecutionDate } from '../../../../../lib/utils/recurring';
+import { calculateNextExecutionDate } from '$lib/utils/recurring';
 import { invalidateCospendCaches } from '$lib/server/cache';
 
 // This endpoint is designed to be called by a cron job or external scheduler
diff --git a/src/routes/api/cospend/recurring-payments/execute/+server.ts b/src/routes/api/cospend/recurring-payments/execute/+server.ts
index 7163dd7..e4cebcf 100644
--- a/src/routes/api/cospend/recurring-payments/execute/+server.ts
+++ b/src/routes/api/cospend/recurring-payments/execute/+server.ts
@@ -1,11 +1,11 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { RecurringPayment } from '../../../../../models/RecurringPayment';
-import { Payment } from '../../../../../models/Payment';
-import { PaymentSplit } from '../../../../../models/PaymentSplit';
-import { dbConnect } from '../../../../../utils/db';
+import { RecurringPayment } from '$models/RecurringPayment';
+import { Payment } from '$models/Payment';
+import { PaymentSplit } from '$models/PaymentSplit';
+import { dbConnect } from '$utils/db';
 import { error, json } from '@sveltejs/kit';
-import { calculateNextExecutionDate } from '../../../../../lib/utils/recurring';
-import { convertToCHF } from '../../../../../lib/utils/currency';
+import { calculateNextExecutionDate } from '$lib/utils/recurring';
+import { convertToCHF } from '$lib/utils/currency';
 import { invalidateCospendCaches } from '$lib/server/cache';
 
 export const POST: RequestHandler = async ({ locals }) => {
diff --git a/src/routes/api/cospend/recurring-payments/scheduler/+server.ts b/src/routes/api/cospend/recurring-payments/scheduler/+server.ts
index 5bd7b3b..17601f4 100644
--- a/src/routes/api/cospend/recurring-payments/scheduler/+server.ts
+++ b/src/routes/api/cospend/recurring-payments/scheduler/+server.ts
@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
 import { error, json } from '@sveltejs/kit';
-import { recurringPaymentScheduler } from '../../../../../lib/server/scheduler';
+import { recurringPaymentScheduler } from '$lib/server/scheduler';
 
 export const GET: RequestHandler = async ({ locals }) => {
   const auth = await locals.auth();
diff --git a/src/routes/api/fitness/exercises/+server.ts b/src/routes/api/fitness/exercises/+server.ts
index bf05767..44ba38e 100644
--- a/src/routes/api/fitness/exercises/+server.ts
+++ b/src/routes/api/fitness/exercises/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { Exercise } from '../../../../models/Exercise';
+import { Exercise } from '$models/Exercise';
 
 // GET /api/fitness/exercises - Search and filter exercises
 export const GET: RequestHandler = async ({ url, locals }) => {
diff --git a/src/routes/api/fitness/exercises/[id]/+server.ts b/src/routes/api/fitness/exercises/[id]/+server.ts
index 6733850..a86ca0b 100644
--- a/src/routes/api/fitness/exercises/[id]/+server.ts
+++ b/src/routes/api/fitness/exercises/[id]/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { Exercise } from '../../../../../models/Exercise';
+import { Exercise } from '$models/Exercise';
 
 // GET /api/fitness/exercises/[id] - Get detailed exercise information
 export const GET: RequestHandler = async ({ params, locals }) => {
diff --git a/src/routes/api/fitness/exercises/filters/+server.ts b/src/routes/api/fitness/exercises/filters/+server.ts
index 6365b78..e831202 100644
--- a/src/routes/api/fitness/exercises/filters/+server.ts
+++ b/src/routes/api/fitness/exercises/filters/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { Exercise } from '../../../../../models/Exercise';
+import { Exercise } from '$models/Exercise';
 
 // GET /api/fitness/exercises/filters - Get available filter options
 export const GET: RequestHandler = async ({ locals }) => {
diff --git a/src/routes/api/fitness/seed-example/+server.ts b/src/routes/api/fitness/seed-example/+server.ts
index 0d90834..6c20ccc 100644
--- a/src/routes/api/fitness/seed-example/+server.ts
+++ b/src/routes/api/fitness/seed-example/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { WorkoutTemplate } from '../../../../models/WorkoutTemplate';
+import { WorkoutTemplate } from '$models/WorkoutTemplate';
 
 // POST /api/fitness/seed-example - Create the example workout template
 export const POST: RequestHandler = async ({ locals }) => {
diff --git a/src/routes/api/fitness/sessions/+server.ts b/src/routes/api/fitness/sessions/+server.ts
index b5d120e..72f199e 100644
--- a/src/routes/api/fitness/sessions/+server.ts
+++ b/src/routes/api/fitness/sessions/+server.ts
@@ -1,8 +1,8 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { WorkoutSession } from '../../../../models/WorkoutSession';
-import { WorkoutTemplate } from '../../../../models/WorkoutTemplate';
+import { WorkoutSession } from '$models/WorkoutSession';
+import { WorkoutTemplate } from '$models/WorkoutTemplate';
 
 // GET /api/fitness/sessions - Get all workout sessions for the user
 export const GET: RequestHandler = async ({ url, locals }) => {
diff --git a/src/routes/api/fitness/sessions/[id]/+server.ts b/src/routes/api/fitness/sessions/[id]/+server.ts
index 4349bce..4a49474 100644
--- a/src/routes/api/fitness/sessions/[id]/+server.ts
+++ b/src/routes/api/fitness/sessions/[id]/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { WorkoutSession } from '../../../../../models/WorkoutSession';
+import { WorkoutSession } from '$models/WorkoutSession';
 import mongoose from 'mongoose';
 
 // GET /api/fitness/sessions/[id] - Get a specific workout session
diff --git a/src/routes/api/fitness/templates/+server.ts b/src/routes/api/fitness/templates/+server.ts
index 9d35b92..3e8d25d 100644
--- a/src/routes/api/fitness/templates/+server.ts
+++ b/src/routes/api/fitness/templates/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { WorkoutTemplate } from '../../../../models/WorkoutTemplate';
+import { WorkoutTemplate } from '$models/WorkoutTemplate';
 
 // GET /api/fitness/templates - Get all workout templates for the user
 export const GET: RequestHandler = async ({ url, locals }) => {
diff --git a/src/routes/api/fitness/templates/[id]/+server.ts b/src/routes/api/fitness/templates/[id]/+server.ts
index 0ce51cd..7b6e492 100644
--- a/src/routes/api/fitness/templates/[id]/+server.ts
+++ b/src/routes/api/fitness/templates/[id]/+server.ts
@@ -1,7 +1,7 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { dbConnect } from '$utils/db';
-import { WorkoutTemplate } from '../../../../../models/WorkoutTemplate';
+import { WorkoutTemplate } from '$models/WorkoutTemplate';
 import mongoose from 'mongoose';
 
 // GET /api/fitness/templates/[id] - Get a specific workout template
diff --git a/src/routes/api/glaube/rosary-streak/+server.ts b/src/routes/api/glaube/rosary-streak/+server.ts
index 298e7c6..553b83b 100644
--- a/src/routes/api/glaube/rosary-streak/+server.ts
+++ b/src/routes/api/glaube/rosary-streak/+server.ts
@@ -1,6 +1,6 @@
 import { json, error, type RequestHandler } from '@sveltejs/kit';
-import { RosaryStreak } from '../../../../models/RosaryStreak';
-import { dbConnect } from '../../../../utils/db';
+import { RosaryStreak } from '$models/RosaryStreak';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({ locals }) => {
   const session = await locals.auth();
diff --git a/src/routes/api/recipes/favorites/recipes/+server.ts b/src/routes/api/recipes/favorites/recipes/+server.ts
index e17c220..d51233d 100644
--- a/src/routes/api/recipes/favorites/recipes/+server.ts
+++ b/src/routes/api/recipes/favorites/recipes/+server.ts
@@ -1,8 +1,8 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { UserFavorites } from '../../../../../models/UserFavorites';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
-import type { RecipeModelType } from '../../../../../types/types';
+import { UserFavorites } from '$models/UserFavorites';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type { RecipeModelType } from '$types/types';
 import { error } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async ({ locals }) => {
diff --git a/src/routes/api/recipes/items/[name]/+server.ts b/src/routes/api/recipes/items/[name]/+server.ts
index 3589d23..efd5acb 100644
--- a/src/routes/api/recipes/items/[name]/+server.ts
+++ b/src/routes/api/recipes/items/[name]/+server.ts
@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { error } from '@sveltejs/kit';
 
 /**
diff --git a/src/routes/api/recipes/items/all_brief/+server.ts b/src/routes/api/recipes/items/all_brief/+server.ts
index 295472e..ca6ae94 100644
--- a/src/routes/api/recipes/items/all_brief/+server.ts
+++ b/src/routes/api/recipes/items/all_brief/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import type { BriefRecipeType } from '../../../../../types/types';
-import { Recipe } from '../../../../../models/Recipe'
-import { dbConnect } from '../../../../../utils/db';
+import type { BriefRecipeType } from '$types/types';
+import { Recipe } from '$models/Recipe'
+import { dbConnect } from '$utils/db';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/recipes/items/category/+server.ts b/src/routes/api/recipes/items/category/+server.ts
index 2d3059a..ed7314a 100644
--- a/src/routes/api/recipes/items/category/+server.ts
+++ b/src/routes/api/recipes/items/category/+server.ts
@@ -1,6 +1,6 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({params}) => {
   await dbConnect();
diff --git a/src/routes/api/recipes/items/category/[category]/+server.ts b/src/routes/api/recipes/items/category/[category]/+server.ts
index db363cf..c442f05 100644
--- a/src/routes/api/recipes/items/category/[category]/+server.ts
+++ b/src/routes/api/recipes/items/category/[category]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/recipes/items/icon/[icon]/+server.ts b/src/routes/api/recipes/items/icon/[icon]/+server.ts
index 46e49e5..1fe0ce1 100644
--- a/src/routes/api/recipes/items/icon/[icon]/+server.ts
+++ b/src/routes/api/recipes/items/icon/[icon]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/recipes/items/in_season/[month]/+server.ts b/src/routes/api/recipes/items/in_season/[month]/+server.ts
index 68ccaff..9ee289f 100644
--- a/src/routes/api/recipes/items/in_season/[month]/+server.ts
+++ b/src/routes/api/recipes/items/in_season/[month]/+server.ts
@@ -1,6 +1,6 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe'
-import { dbConnect } from '../../../../../../utils/db';
+import { Recipe } from '$models/Recipe'
+import { dbConnect } from '$utils/db';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/recipes/items/tag/+server.ts b/src/routes/api/recipes/items/tag/+server.ts
index c85026a..9470088 100644
--- a/src/routes/api/recipes/items/tag/+server.ts
+++ b/src/routes/api/recipes/items/tag/+server.ts
@@ -1,6 +1,6 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({params}) => {
   await dbConnect();
diff --git a/src/routes/api/recipes/items/tag/[tag]/+server.ts b/src/routes/api/recipes/items/tag/[tag]/+server.ts
index ad6a5f2..7271a57 100644
--- a/src/routes/api/recipes/items/tag/[tag]/+server.ts
+++ b/src/routes/api/recipes/items/tag/[tag]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/recipes/search/+server.ts b/src/routes/api/recipes/search/+server.ts
index 97f8705..4f90c31 100644
--- a/src/routes/api/recipes/search/+server.ts
+++ b/src/routes/api/recipes/search/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import type { BriefRecipeType } from '../../../../types/types';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
+import type { BriefRecipeType } from '$types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({ url, locals }) => {
   await dbConnect();
diff --git a/src/routes/api/rezepte/add/+server.ts b/src/routes/api/rezepte/add/+server.ts
index a846053..f717f7a 100644
--- a/src/routes/api/rezepte/add/+server.ts
+++ b/src/routes/api/rezepte/add/+server.ts
@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { error } from '@sveltejs/kit';
 import { invalidateRecipeCaches } from '$lib/server/cache';
 // header: use for bearer token for now
diff --git a/src/routes/api/rezepte/base-recipes/+server.ts b/src/routes/api/rezepte/base-recipes/+server.ts
index 7f4e5ab..4d49f70 100644
--- a/src/routes/api/rezepte/base-recipes/+server.ts
+++ b/src/routes/api/rezepte/base-recipes/+server.ts
@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { json } from '@sveltejs/kit';
 
 // GET: List all base recipes for selector UI
diff --git a/src/routes/api/rezepte/check-references/[id]/+server.ts b/src/routes/api/rezepte/check-references/[id]/+server.ts
index c5d7720..c362bc8 100644
--- a/src/routes/api/rezepte/check-references/[id]/+server.ts
+++ b/src/routes/api/rezepte/check-references/[id]/+server.ts
@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { json } from '@sveltejs/kit';
 
 // GET: Check which recipes reference this recipe
diff --git a/src/routes/api/rezepte/delete/+server.ts b/src/routes/api/rezepte/delete/+server.ts
index 814bec6..a31ca9a 100644
--- a/src/routes/api/rezepte/delete/+server.ts
+++ b/src/routes/api/rezepte/delete/+server.ts
@@ -1,8 +1,8 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../models/Recipe';
-import { UserFavorites } from '../../../../models/UserFavorites';
-import { dbConnect } from '../../../../utils/db';
-import type {RecipeModelType} from '../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { UserFavorites } from '$models/UserFavorites';
+import { dbConnect } from '$utils/db';
+import type {RecipeModelType} from '$types/types';
 import { error } from '@sveltejs/kit';
 import { invalidateRecipeCaches } from '$lib/server/cache';
 // header: use for bearer token for now
diff --git a/src/routes/api/rezepte/edit/+server.ts b/src/routes/api/rezepte/edit/+server.ts
index 433550e..df976d2 100644
--- a/src/routes/api/rezepte/edit/+server.ts
+++ b/src/routes/api/rezepte/edit/+server.ts
@@ -1,7 +1,7 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
-import type {RecipeModelType} from '../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {RecipeModelType} from '$types/types';
 import { error } from '@sveltejs/kit';
 import { rename } from 'fs/promises';
 import { join } from 'path';
diff --git a/src/routes/api/rezepte/favorites/+server.ts b/src/routes/api/rezepte/favorites/+server.ts
index 63e9cb5..6c31997 100644
--- a/src/routes/api/rezepte/favorites/+server.ts
+++ b/src/routes/api/rezepte/favorites/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { UserFavorites } from '../../../../models/UserFavorites';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
+import { UserFavorites } from '$models/UserFavorites';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { error } from '@sveltejs/kit';
 import mongoose from 'mongoose';
 
diff --git a/src/routes/api/rezepte/favorites/check/[shortName]/+server.ts b/src/routes/api/rezepte/favorites/check/[shortName]/+server.ts
index a152dff..87a28d7 100644
--- a/src/routes/api/rezepte/favorites/check/[shortName]/+server.ts
+++ b/src/routes/api/rezepte/favorites/check/[shortName]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { UserFavorites } from '../../../../../../models/UserFavorites';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
+import { UserFavorites } from '$models/UserFavorites';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { error } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async ({ locals, params }) => {
diff --git a/src/routes/api/rezepte/favorites/recipes/+server.ts b/src/routes/api/rezepte/favorites/recipes/+server.ts
index b0c25a5..6cb5870 100644
--- a/src/routes/api/rezepte/favorites/recipes/+server.ts
+++ b/src/routes/api/rezepte/favorites/recipes/+server.ts
@@ -1,8 +1,8 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { UserFavorites } from '../../../../../models/UserFavorites';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
-import type { RecipeModelType } from '../../../../../types/types';
+import { UserFavorites } from '$models/UserFavorites';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type { RecipeModelType } from '$types/types';
 import { error } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async ({ locals }) => {
diff --git a/src/routes/api/rezepte/items/[name]/+server.ts b/src/routes/api/rezepte/items/[name]/+server.ts
index eb9d76a..db9f828 100644
--- a/src/routes/api/rezepte/items/[name]/+server.ts
+++ b/src/routes/api/rezepte/items/[name]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
-import type {RecipeModelType} from '../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {RecipeModelType} from '$types/types';
 import { error } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/rezepte/items/all_brief/+server.ts b/src/routes/api/rezepte/items/all_brief/+server.ts
index 4ff2e08..8f697ea 100644
--- a/src/routes/api/rezepte/items/all_brief/+server.ts
+++ b/src/routes/api/rezepte/items/all_brief/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import type { BriefRecipeType } from '../../../../../types/types';
-import { Recipe } from '../../../../../models/Recipe'
-import { dbConnect } from '../../../../../utils/db';
+import type { BriefRecipeType } from '$types/types';
+import { Recipe } from '$models/Recipe'
+import { dbConnect } from '$utils/db';
 import { rand_array } from '$lib/js/randomize';
 import cache from '$lib/server/cache';
 
diff --git a/src/routes/api/rezepte/items/category/+server.ts b/src/routes/api/rezepte/items/category/+server.ts
index 66da78c..b6d56ee 100644
--- a/src/routes/api/rezepte/items/category/+server.ts
+++ b/src/routes/api/rezepte/items/category/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 
 export const GET: RequestHandler = async ({params}) => {
   await dbConnect();
diff --git a/src/routes/api/rezepte/items/category/[category]/+server.ts b/src/routes/api/rezepte/items/category/[category]/+server.ts
index e47bb5d..ac4a2e9 100644
--- a/src/routes/api/rezepte/items/category/[category]/+server.ts
+++ b/src/routes/api/rezepte/items/category/[category]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/rezepte/items/icon/+server.ts b/src/routes/api/rezepte/items/icon/+server.ts
index ffb77df..96f7e07 100644
--- a/src/routes/api/rezepte/items/icon/+server.ts
+++ b/src/routes/api/rezepte/items/icon/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 
 export const GET: RequestHandler = async ({params}) => {
   await dbConnect();
diff --git a/src/routes/api/rezepte/items/icon/[icon]/+server.ts b/src/routes/api/rezepte/items/icon/[icon]/+server.ts
index e03f942..fe06380 100644
--- a/src/routes/api/rezepte/items/icon/[icon]/+server.ts
+++ b/src/routes/api/rezepte/items/icon/[icon]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 import { rand_array } from '$lib/js/randomize';
 
 export const GET: RequestHandler = async ({params}) => {
diff --git a/src/routes/api/rezepte/items/in_season/[month]/+server.ts b/src/routes/api/rezepte/items/in_season/[month]/+server.ts
index 9da0877..53e3356 100644
--- a/src/routes/api/rezepte/items/in_season/[month]/+server.ts
+++ b/src/routes/api/rezepte/items/in_season/[month]/+server.ts
@@ -1,7 +1,7 @@
 import type {rand_array} from '$lib/js/randomize';
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe'
-import { dbConnect } from '../../../../../../utils/db';
+import { Recipe } from '$models/Recipe'
+import { dbConnect } from '$utils/db';
 import { rand_array } from '$lib/js/randomize';
 import cache from '$lib/server/cache';
 
diff --git a/src/routes/api/rezepte/items/tag/+server.ts b/src/routes/api/rezepte/items/tag/+server.ts
index 061b1f8..70c0ffe 100644
--- a/src/routes/api/rezepte/items/tag/+server.ts
+++ b/src/routes/api/rezepte/items/tag/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 
 export const GET: RequestHandler = async ({params}) => {
   await dbConnect();
diff --git a/src/routes/api/rezepte/items/tag/[tag]/+server.ts b/src/routes/api/rezepte/items/tag/[tag]/+server.ts
index 48d90a6..4de1191 100644
--- a/src/routes/api/rezepte/items/tag/[tag]/+server.ts
+++ b/src/routes/api/rezepte/items/tag/[tag]/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../../models/Recipe';
-import { dbConnect } from '../../../../../../utils/db';
-import type {BriefRecipeType} from '../../../../../../types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
+import type {BriefRecipeType} from '$types/types';
 import { rand_array } from '$lib/js/randomize';
 import cache from '$lib/server/cache';
 
diff --git a/src/routes/api/rezepte/json-ld/[name]/+server.ts b/src/routes/api/rezepte/json-ld/[name]/+server.ts
index f221f3d..ffb996a 100644
--- a/src/routes/api/rezepte/json-ld/[name]/+server.ts
+++ b/src/routes/api/rezepte/json-ld/[name]/+server.ts
@@ -1,8 +1,8 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 import { generateRecipeJsonLd } from '$lib/js/recipeJsonLd';
-import type { RecipeModelType } from '../../../../../types/types';
+import type { RecipeModelType } from '$types/types';
 import { error } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async ({ params, setHeaders }) => {
diff --git a/src/routes/api/rezepte/offline-db/+server.ts b/src/routes/api/rezepte/offline-db/+server.ts
index 9488671..da5534f 100644
--- a/src/routes/api/rezepte/offline-db/+server.ts
+++ b/src/routes/api/rezepte/offline-db/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import type { BriefRecipeType, RecipeModelType } from '../../../../types/types';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
+import type { BriefRecipeType, RecipeModelType } from '$types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async () => {
 	await dbConnect();
diff --git a/src/routes/api/rezepte/search/+server.ts b/src/routes/api/rezepte/search/+server.ts
index 282526e..084edcf 100644
--- a/src/routes/api/rezepte/search/+server.ts
+++ b/src/routes/api/rezepte/search/+server.ts
@@ -1,7 +1,7 @@
 import { json, type RequestHandler } from '@sveltejs/kit';
-import type { BriefRecipeType } from '../../../../types/types';
-import { Recipe } from '../../../../models/Recipe';
-import { dbConnect } from '../../../../utils/db';
+import type { BriefRecipeType } from '$types/types';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({ url, locals }) => {
   await dbConnect();
diff --git a/src/routes/api/rezepte/translate/untranslated/+server.ts b/src/routes/api/rezepte/translate/untranslated/+server.ts
index c668621..54244fc 100644
--- a/src/routes/api/rezepte/translate/untranslated/+server.ts
+++ b/src/routes/api/rezepte/translate/untranslated/+server.ts
@@ -1,6 +1,6 @@
 import { json, type RequestHandler, error } from '@sveltejs/kit';
-import { Recipe } from '../../../../../models/Recipe';
-import { dbConnect } from '../../../../../utils/db';
+import { Recipe } from '$models/Recipe';
+import { dbConnect } from '$utils/db';
 
 export const GET: RequestHandler = async ({ locals }) => {
 	const session = await locals.auth();
diff --git a/src/routes/cospend/+layout.svelte b/src/routes/cospend/+layout.svelte
index 92d2686..efc7c58 100644
--- a/src/routes/cospend/+layout.svelte
+++ b/src/routes/cospend/+layout.svelte
@@ -4,7 +4,7 @@
   import { goto } from '$app/navigation';
   import { fly } from 'svelte/transition';
   import { quintOut } from 'svelte/easing';
-  import PaymentModal from '$lib/components/PaymentModal.svelte';
+  import PaymentModal from '$lib/components/cospend/PaymentModal.svelte';
   import Header from '$lib/components/Header.svelte';
   import UserHeader from '$lib/components/UserHeader.svelte';
 
diff --git a/src/routes/cospend/+page.svelte b/src/routes/cospend/+page.svelte
index c3b3ab6..7640bac 100644
--- a/src/routes/cospend/+page.svelte
+++ b/src/routes/cospend/+page.svelte
@@ -2,10 +2,10 @@
   import { onMount } from 'svelte';
   import { page } from '$app/stores';
   import { pushState } from '$app/navigation';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
-  import EnhancedBalance from '$lib/components/EnhancedBalance.svelte';
-  import DebtBreakdown from '$lib/components/DebtBreakdown.svelte';
-  import BarChart from '$lib/components/BarChart.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
+  import EnhancedBalance from '$lib/components/cospend/EnhancedBalance.svelte';
+  import DebtBreakdown from '$lib/components/cospend/DebtBreakdown.svelte';
+  import BarChart from '$lib/components/cospend/BarChart.svelte';
   import { getCategoryEmoji, getCategoryName } from '$lib/utils/categories';
   import { isSettlementPayment, getSettlementIcon, getSettlementClasses, getSettlementReceiver } from '$lib/utils/settlements';
   import AddButton from '$lib/components/AddButton.svelte';
diff --git a/src/routes/cospend/payments/+page.svelte b/src/routes/cospend/payments/+page.svelte
index b940236..ae95136 100644
--- a/src/routes/cospend/payments/+page.svelte
+++ b/src/routes/cospend/payments/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from 'svelte';
   import { goto } from '$app/navigation';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
   import { getCategoryEmoji, getCategoryName } from '$lib/utils/categories';
   import { isSettlementPayment, getSettlementIcon, getSettlementReceiver } from '$lib/utils/settlements';
   import AddButton from '$lib/components/AddButton.svelte';
diff --git a/src/routes/cospend/payments/add/+page.svelte b/src/routes/cospend/payments/add/+page.svelte
index 315d663..9c82c5a 100644
--- a/src/routes/cospend/payments/add/+page.svelte
+++ b/src/routes/cospend/payments/add/+page.svelte
@@ -5,9 +5,9 @@
   import { getCategoryOptions } from '$lib/utils/categories';
   import { PREDEFINED_USERS, isPredefinedUsersMode } from '$lib/config/users';
   import { validateCronExpression, getFrequencyDescription, calculateNextExecutionDate } from '$lib/utils/recurring';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
-  import SplitMethodSelector from '$lib/components/SplitMethodSelector.svelte';
-  import UsersList from '$lib/components/UsersList.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
+  import SplitMethodSelector from '$lib/components/cospend/SplitMethodSelector.svelte';
+  import UsersList from '$lib/components/cospend/UsersList.svelte';
   import ImageUpload from '$lib/components/ImageUpload.svelte';
 
   let { data, form } = $props();
diff --git a/src/routes/cospend/payments/view/[id]/+page.svelte b/src/routes/cospend/payments/view/[id]/+page.svelte
index 2d445d9..4d07de4 100644
--- a/src/routes/cospend/payments/view/[id]/+page.svelte
+++ b/src/routes/cospend/payments/view/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from 'svelte';
   import { goto } from '$app/navigation';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
   import { getCategoryEmoji, getCategoryName } from '$lib/utils/categories';
   import EditButton from '$lib/components/EditButton.svelte';
   
diff --git a/src/routes/cospend/recurring/+page.svelte b/src/routes/cospend/recurring/+page.svelte
index fa617cf..03a23a9 100644
--- a/src/routes/cospend/recurring/+page.svelte
+++ b/src/routes/cospend/recurring/+page.svelte
@@ -2,7 +2,7 @@
   import { onMount } from 'svelte';
   import { getCategoryEmoji, getCategoryName } from '$lib/utils/categories';
   import { getFrequencyDescription, formatNextExecution } from '$lib/utils/recurring';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
   import AddButton from '$lib/components/AddButton.svelte';
   import { formatCurrency } from '$lib/utils/formatters';
 
diff --git a/src/routes/cospend/recurring/edit/[id]/+page.svelte b/src/routes/cospend/recurring/edit/[id]/+page.svelte
index 22751a7..4a442cc 100644
--- a/src/routes/cospend/recurring/edit/[id]/+page.svelte
+++ b/src/routes/cospend/recurring/edit/[id]/+page.svelte
@@ -4,9 +4,9 @@
   import { getCategoryOptions } from '$lib/utils/categories';
   import { PREDEFINED_USERS, isPredefinedUsersMode } from '$lib/config/users';
   import { validateCronExpression, getFrequencyDescription, calculateNextExecutionDate } from '$lib/utils/recurring';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
-  import SplitMethodSelector from '$lib/components/SplitMethodSelector.svelte';
-  import UsersList from '$lib/components/UsersList.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
+  import SplitMethodSelector from '$lib/components/cospend/SplitMethodSelector.svelte';
+  import UsersList from '$lib/components/cospend/UsersList.svelte';
 
   let { data } = $props();
 
diff --git a/src/routes/cospend/settle/+page.svelte b/src/routes/cospend/settle/+page.svelte
index 3f90005..dddf233 100644
--- a/src/routes/cospend/settle/+page.svelte
+++ b/src/routes/cospend/settle/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from 'svelte';
   import { enhance } from '$app/forms';
-  import ProfilePicture from '$lib/components/ProfilePicture.svelte';
+  import ProfilePicture from '$lib/components/cospend/ProfilePicture.svelte';
   import { PREDEFINED_USERS, isPredefinedUsersMode } from '$lib/config/users';
 
 
diff --git a/svelte.config.js b/svelte.config.js
index 02773ae..25284db 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -15,7 +15,8 @@ const config = {
 		}),
 		alias: {
 			$models: 'src/models',
-			$utils: 'src/utils'
+			$utils: 'src/utils',
+			$types: 'src/types'
 		}
 	}
 };