diff --git a/src/lib/components/functional/Dialog.svelte b/src/lib/components/functional/Dialog.svelte
index 1bd5f97..e566830 100644
--- a/src/lib/components/functional/Dialog.svelte
+++ b/src/lib/components/functional/Dialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { duration, fade, fly } from "$lib/animation";
+	import { duration, fade, fly } from "$lib/util/animation";
 	import { removeDialog } from "$lib/store/DialogProvider";
 	import { BanIcon, CheckIcon, InfoIcon, TriangleAlert } from "lucide-svelte";
 	import { quintOut } from "svelte/easing";
diff --git a/src/lib/components/functional/Dropdown.svelte b/src/lib/components/functional/Dropdown.svelte
index 0bfa1a2..293a1f3 100644
--- a/src/lib/components/functional/Dropdown.svelte
+++ b/src/lib/components/functional/Dropdown.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { duration, fade, transition } from "$lib/animation";
+	import { duration, fade, transition } from "$lib/util/animation";
 	import { ChevronDown } from "lucide-svelte";
 	import { onMount } from "svelte";
 	import { quintOut } from "svelte/easing";
diff --git a/src/lib/components/functional/FancyMenu.svelte b/src/lib/components/functional/FancyMenu.svelte
index da0a858..a973dad 100644
--- a/src/lib/components/functional/FancyMenu.svelte
+++ b/src/lib/components/functional/FancyMenu.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from "$app/environment";
 	import { page } from "$app/stores";
-	import { duration, fly } from "$lib/animation";
+	import { duration, fly } from "$lib/util/animation";
 	import clsx from "clsx";
 	import { onMount, tick } from "svelte";
 	import { quintOut } from "svelte/easing";
diff --git a/src/lib/components/functional/FormatDropdown.svelte b/src/lib/components/functional/FormatDropdown.svelte
index 333770a..f816985 100644
--- a/src/lib/components/functional/FormatDropdown.svelte
+++ b/src/lib/components/functional/FormatDropdown.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { duration, fade, transition } from "$lib/animation";
+	import { duration, fade, transition } from "$lib/util/animation";
 	import { m } from "$lib/paraglide/messages";
 	import { isMobile, files, dropdownStates } from "$lib/store/index.svelte";
 	import type { Categories } from "$lib/types";
diff --git a/src/lib/components/functional/VertdError.svelte b/src/lib/components/functional/VertdError.svelte
index a603902..6afa501 100644
--- a/src/lib/components/functional/VertdError.svelte
+++ b/src/lib/components/functional/VertdError.svelte
@@ -13,7 +13,7 @@
 	import { vertdFetch } from "$lib/converters/vertd.svelte";
 
 	import { m } from "$lib/paraglide/messages";
-	import { ToastManager, type ToastProps } from "$lib/toast/index.svelte";
+	import { ToastManager, type ToastProps } from "$lib/util/toast.svelte";
 	import { addDialog } from "$lib/store/DialogProvider";
 	import VertdErrorDetails from "./VertdErrorDetails.svelte";
 
diff --git a/src/lib/components/layout/Dialogs.svelte b/src/lib/components/layout/Dialogs.svelte
index 7914117..b496244 100644
--- a/src/lib/components/layout/Dialogs.svelte
+++ b/src/lib/components/layout/Dialogs.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { duration, fade } from "$lib/animation";
+	import { duration, fade } from "$lib/util/animation";
 	import { quintOut } from "svelte/easing";
 	import Dialog from "../functional/Dialog.svelte";
 	import {
diff --git a/src/lib/components/layout/Footer.svelte b/src/lib/components/layout/Footer.svelte
index 0e4867f..6303e72 100644
--- a/src/lib/components/layout/Footer.svelte
+++ b/src/lib/components/layout/Footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { GITHUB_URL_VERT, DISCORD_URL } from "$lib/consts";
+	import { GITHUB_URL_VERT, DISCORD_URL } from "$lib/util/consts";
 	import { m } from "$lib/paraglide/messages";
 
 	const items = $derived([
diff --git a/src/lib/components/layout/Gradients.svelte b/src/lib/components/layout/Gradients.svelte
index 3e3cd8f..6db02e6 100644
--- a/src/lib/components/layout/Gradients.svelte
+++ b/src/lib/components/layout/Gradients.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from "$app/state";
-	import { duration, transition } from "$lib/animation";
+	import { duration, transition } from "$lib/util/animation";
 	import VertVBig from "$lib/assets/vert-bg.svg?component";
 	import {
 		files,
@@ -8,7 +8,7 @@
 		showGradient,
 	} from "$lib/store/index.svelte";
 	import { quintOut } from "svelte/easing";
-	import { fade } from "$lib/animation";
+	import { fade } from "$lib/util/animation";
 	import { Tween } from "svelte/motion";
 
 	const colors: {
diff --git a/src/lib/components/layout/Navbar/Base.svelte b/src/lib/components/layout/Navbar/Base.svelte
index 01b9248..ae2750f 100644
--- a/src/lib/components/layout/Navbar/Base.svelte
+++ b/src/lib/components/layout/Navbar/Base.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from "$app/environment";
 	import { page } from "$app/state";
-	import { duration, fade } from "$lib/animation";
+	import { duration, fade } from "$lib/util/animation";
 	import {
 		effects,
 		files,
diff --git a/src/lib/components/layout/PageContent.svelte b/src/lib/components/layout/PageContent.svelte
index 8feab3a..0489afb 100644
--- a/src/lib/components/layout/PageContent.svelte
+++ b/src/lib/components/layout/PageContent.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { page } from "$app/state";
-	import { duration } from "$lib/animation";
+	import { duration } from "$lib/util/animation";
 	import { goingLeft, isMobile } from "$lib/store/index.svelte";
 	import { quintOut } from "svelte/easing";
-	import { fly, fade } from "$lib/animation";
+	import { fly, fade } from "$lib/util/animation";
 
 	let { children } = $props();
 </script>
diff --git a/src/lib/components/layout/Toasts.svelte b/src/lib/components/layout/Toasts.svelte
index ad59825..a3e79d7 100644
--- a/src/lib/components/layout/Toasts.svelte
+++ b/src/lib/components/layout/Toasts.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Toast from "$lib/components/visual/Toast.svelte";
-	import { ToastManager } from "$lib/toast/index.svelte";
+	import { ToastManager } from "$lib/util/toast.svelte";
 </script>
 
 <div
diff --git a/src/lib/components/layout/UploadRegion.svelte b/src/lib/components/layout/UploadRegion.svelte
index 553977c..c393914 100644
--- a/src/lib/components/layout/UploadRegion.svelte
+++ b/src/lib/components/layout/UploadRegion.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { duration, fade } from "$lib/animation";
+	import { duration, fade } from "$lib/util/animation";
 	import { dropping, effects } from "$lib/store/index.svelte";
 	import { quintOut } from "svelte/easing";
 </script>
diff --git a/src/lib/components/visual/Toast.svelte b/src/lib/components/visual/Toast.svelte
index b3e68cc..a3bd700 100644
--- a/src/lib/components/visual/Toast.svelte
+++ b/src/lib/components/visual/Toast.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { fade, fly } from "$lib/animation";
+	import { fade, fly } from "$lib/util/animation";
 	import {
 		BanIcon,
 		CheckIcon,
@@ -8,11 +8,11 @@
 		XIcon,
 	} from "lucide-svelte";
 	import { quintOut } from "svelte/easing";
-	import { ToastManager } from "$lib/toast/index.svelte";
-	import type { ToastProps } from "$lib/toast/index.svelte";
+	import { ToastManager } from "$lib/util/toast.svelte";
+	import type { ToastProps } from "$lib/util/toast.svelte";
 	import type { SvelteComponent } from "svelte";
 	import clsx from "clsx";
-	import type { Toast as ToastType } from "$lib/toast/index.svelte";
+	import type { Toast as ToastType } from "$lib/util/toast.svelte";
 
 	const props: {
 		toast: ToastType<unknown>;
diff --git a/src/lib/components/visual/Tooltip.svelte b/src/lib/components/visual/Tooltip.svelte
index f1a0214..edeba94 100644
--- a/src/lib/components/visual/Tooltip.svelte
+++ b/src/lib/components/visual/Tooltip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { fade } from "$lib/animation";
+	import { fade } from "$lib/util/animation";
 	interface Props {
 		children: () => any;
 		text: string;
diff --git a/src/lib/converters/ffmpeg.svelte.ts b/src/lib/converters/ffmpeg.svelte.ts
index 7b61bdc..f2af362 100644
--- a/src/lib/converters/ffmpeg.svelte.ts
+++ b/src/lib/converters/ffmpeg.svelte.ts
@@ -2,10 +2,10 @@ import { VertFile } from "$lib/types";
 import { Converter, FormatInfo } from "./converter.svelte";
 import { FFmpeg } from "@ffmpeg/ffmpeg";
 import { browser } from "$app/environment";
-import { error, log } from "$lib/logger";
+import { error, log } from "$lib/util/logger";
 import { m } from "$lib/paraglide/messages";
 import { Settings } from "$lib/sections/settings/index.svelte";
-import { ToastManager } from "$lib/toast/index.svelte";
+import { ToastManager } from "$lib/util/toast.svelte";
 
 // TODO: differentiate in UI? (not native formats)
 const videoFormats = [
diff --git a/src/lib/converters/index.ts b/src/lib/converters/index.ts
index 43eb325..11089ae 100644
--- a/src/lib/converters/index.ts
+++ b/src/lib/converters/index.ts
@@ -4,7 +4,7 @@ import { FFmpegConverter } from "./ffmpeg.svelte";
 import { PandocConverter } from "./pandoc.svelte";
 import { VertdConverter } from "./vertd.svelte";
 import { MagickConverter } from "./magick.svelte";
-import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
+import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/util/consts";
 
 const getConverters = (): Converter[] => {
 	const converters: Converter[] = [
diff --git a/src/lib/converters/magick.svelte.ts b/src/lib/converters/magick.svelte.ts
index 46a802e..1190d49 100644
--- a/src/lib/converters/magick.svelte.ts
+++ b/src/lib/converters/magick.svelte.ts
@@ -1,5 +1,5 @@
 import { browser } from "$app/environment";
-import { error, log } from "$lib/logger";
+import { error, log } from "$lib/util/logger";
 import { m } from "$lib/paraglide/messages";
 import { VertFile, type WorkerMessage } from "$lib/types";
 import MagickWorker from "$lib/workers/magick?worker&url";
@@ -7,7 +7,7 @@ import { Converter, FormatInfo } from "./converter.svelte";
 import { imageFormats } from "./magick-automated";
 import { Settings } from "$lib/sections/settings/index.svelte";
 import magickWasm from "@imagemagick/magick-wasm/magick.wasm?url";
-import { ToastManager } from "$lib/toast/index.svelte";
+import { ToastManager } from "$lib/util/toast.svelte";
 
 export class MagickConverter extends Converter {
 	public name = "imagemagick";
diff --git a/src/lib/converters/pandoc.svelte.ts b/src/lib/converters/pandoc.svelte.ts
index a7c955c..6dfe84d 100644
--- a/src/lib/converters/pandoc.svelte.ts
+++ b/src/lib/converters/pandoc.svelte.ts
@@ -2,8 +2,8 @@ import { VertFile, type WorkerMessage } from "$lib/types";
 import { Converter, FormatInfo } from "./converter.svelte";
 import { browser } from "$app/environment";
 import PandocWorker from "$lib/workers/pandoc?worker&url";
-import { error, log } from "$lib/logger";
-import { ToastManager } from "$lib/toast/index.svelte";
+import { error, log } from "$lib/util/logger";
+import { ToastManager } from "$lib/util/toast.svelte";
 import { m } from "$lib/paraglide/messages";
 
 export class PandocConverter extends Converter {
diff --git a/src/lib/converters/vertd.svelte.ts b/src/lib/converters/vertd.svelte.ts
index c93861f..a21d2e5 100644
--- a/src/lib/converters/vertd.svelte.ts
+++ b/src/lib/converters/vertd.svelte.ts
@@ -1,5 +1,5 @@
 import VertdErrorComponent from "$lib/components/functional/VertdError.svelte";
-import { error, log } from "$lib/logger";
+import { error, log } from "$lib/util/logger";
 import { m } from "$lib/paraglide/messages";
 import { Settings } from "$lib/sections/settings/index.svelte";
 import { VertdInstance } from "$lib/sections/settings/vertdSettings.svelte";
diff --git a/src/lib/sections/about/Credits.svelte b/src/lib/sections/about/Credits.svelte
index 29e9021..47332eb 100644
--- a/src/lib/sections/about/Credits.svelte
+++ b/src/lib/sections/about/Credits.svelte
@@ -4,7 +4,7 @@
 	import {
 		DISABLE_ALL_EXTERNAL_REQUESTS,
 		GITHUB_URL_VERT,
-	} from "$lib/consts";
+	} from "$lib/util/consts";
 	import { m } from "$lib/paraglide/messages";
 	import { link, sanitize } from "$lib/store/index.svelte";
 
diff --git a/src/lib/sections/about/Donate.svelte b/src/lib/sections/about/Donate.svelte
index 14b5f84..8b90415 100644
--- a/src/lib/sections/about/Donate.svelte
+++ b/src/lib/sections/about/Donate.svelte
@@ -18,7 +18,7 @@
 		PUB_STRIPE_KEY === OFFICIAL_STRIPE_KEY;
 
 	// import { PUB_STRIPE_KEY, PUB_DONATION_API } from "$env/static/public";
-	import { fade } from "$lib/animation";
+	import { fade } from "$lib/util/animation";
 	import FancyInput from "$lib/components/functional/FancyInput.svelte";
 	import Panel from "$lib/components/visual/Panel.svelte";
 	import { effects, link, sanitize } from "$lib/store/index.svelte";
@@ -35,8 +35,8 @@
 	import { Elements, PaymentElement } from "svelte-stripe";
 	import { quintOut } from "svelte/easing";
 	import { m } from "$lib/paraglide/messages";
-	import { ToastManager } from "$lib/toast/index.svelte";
-	import { log } from "$lib/logger";
+	import { ToastManager } from "$lib/util/toast.svelte";
+	import { log } from "$lib/util/logger";
 
 	let amount = $state(1);
 	let customAmount = $state("");
diff --git a/src/lib/sections/about/Resources.svelte b/src/lib/sections/about/Resources.svelte
index 696d2a8..958894b 100644
--- a/src/lib/sections/about/Resources.svelte
+++ b/src/lib/sections/about/Resources.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Panel from "$lib/components/visual/Panel.svelte";
-	import { CONTACT_EMAIL, DISCORD_URL, GITHUB_URL_VERT } from "$lib/consts";
+	import { CONTACT_EMAIL, DISCORD_URL, GITHUB_URL_VERT } from "$lib/util/consts";
 	import { effects } from "$lib/store/index.svelte";
 	import {
 		GithubIcon,
diff --git a/src/lib/sections/about/Sponsors.svelte b/src/lib/sections/about/Sponsors.svelte
index 40873b2..3898018 100644
--- a/src/lib/sections/about/Sponsors.svelte
+++ b/src/lib/sections/about/Sponsors.svelte
@@ -2,11 +2,11 @@
 	import Panel from "$lib/components/visual/Panel.svelte";
 	import { PiggyBankIcon, CopyIcon, CheckIcon } from "lucide-svelte";
 	import HotMilk from "$lib/assets/hotmilk.svg?component";
-	import { DISCORD_URL } from "$lib/consts";
-	import { error } from "$lib/logger";
+	import { DISCORD_URL } from "$lib/util/consts";
+	import { error } from "$lib/util/logger";
 	import { m } from "$lib/paraglide/messages";
 	import { link, sanitize } from "$lib/store/index.svelte";
-	import { ToastManager } from "$lib/toast/index.svelte";
+	import { ToastManager } from "$lib/util/toast.svelte";
 
 	let copied = false;
 	let timeoutId: NodeJS.Timeout | null = null;
diff --git a/src/lib/sections/settings/Privacy.svelte b/src/lib/sections/settings/Privacy.svelte
index fb0a93f..30f3eda 100644
--- a/src/lib/sections/settings/Privacy.svelte
+++ b/src/lib/sections/settings/Privacy.svelte
@@ -11,11 +11,11 @@
 	import { effects } from "$lib/store/index.svelte";
 	import { m } from "$lib/paraglide/messages";
 	import { link, sanitize } from "$lib/store/index.svelte";
-	import { swManager, type CacheInfo } from "$lib/sw/register";
+	import { swManager, type CacheInfo } from "$lib/util/sw";
 	import { onMount } from "svelte";
-	import { error } from "$lib/logger";
-	import { ToastManager } from "$lib/toast/index.svelte";
-	import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
+	import { error } from "$lib/util/logger";
+	import { ToastManager } from "$lib/util/toast.svelte";
+	import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/util/consts";
 	import { addDialog } from "$lib/store/DialogProvider";
 
 	const { settings = $bindable() }: { settings: ISettings } = $props();
diff --git a/src/lib/sections/settings/Vertd.svelte b/src/lib/sections/settings/Vertd.svelte
index 7997538..de116a2 100644
--- a/src/lib/sections/settings/Vertd.svelte
+++ b/src/lib/sections/settings/Vertd.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Panel from "$lib/components/visual/Panel.svelte";
-	import { GITHUB_URL_VERTD } from "$lib/consts";
+	import { GITHUB_URL_VERTD } from "$lib/util/consts";
 	import { ServerIcon } from "lucide-svelte";
 	import type { ISettings } from "./index.svelte";
 	import clsx from "clsx";
diff --git a/src/lib/sections/settings/vertdSettings.svelte.ts b/src/lib/sections/settings/vertdSettings.svelte.ts
index 6fb17b0..bc5052e 100644
--- a/src/lib/sections/settings/vertdSettings.svelte.ts
+++ b/src/lib/sections/settings/vertdSettings.svelte.ts
@@ -1,4 +1,4 @@
-import { ip, type IpInfo } from "$lib/ip";
+import { ip, type IpInfo } from "$lib/util/ip";
 import { Settings } from "./index.svelte";
 import { PUB_VERTD_URL } from "$env/static/public";
 
diff --git a/src/lib/store/index.svelte.ts b/src/lib/store/index.svelte.ts
index 76b36dd..8445023 100644
--- a/src/lib/store/index.svelte.ts
+++ b/src/lib/store/index.svelte.ts
@@ -1,6 +1,6 @@
 import { browser } from "$app/environment";
 import { byNative, converters } from "$lib/converters";
-import { error, log } from "$lib/logger";
+import { error, log } from "$lib/util/logger";
 import { VertFile } from "$lib/types";
 import { parseBlob, selectCover } from "music-metadata";
 import { writable } from "svelte/store";
@@ -9,8 +9,8 @@ import PQueue from "p-queue";
 import { getLocale, setLocale } from "$lib/paraglide/runtime";
 import { m } from "$lib/paraglide/messages";
 import sanitizeHtml from "sanitize-html";
-import { ToastManager } from "$lib/toast/index.svelte";
-import { GB } from "$lib/consts";
+import { ToastManager } from "$lib/util/toast.svelte";
+import { GB } from "$lib/util/consts";
 
 class Files {
 	public files = $state<VertFile[]>([]);
@@ -151,7 +151,7 @@ class Files {
 				}),
 			});
 
-			const { extractZip } = await import("$lib/zip");
+			const { extractZip } = await import("$lib/util/zip");
 			const entries = await extractZip(file);
 
 			const totalEntries = entries.length;
diff --git a/src/lib/types/file.svelte.ts b/src/lib/types/file.svelte.ts
index 093820e..4c9c320 100644
--- a/src/lib/types/file.svelte.ts
+++ b/src/lib/types/file.svelte.ts
@@ -1,7 +1,7 @@
 import { byNative, converters } from "$lib/converters";
 import type { Converter } from "$lib/converters/converter.svelte";
 import { m } from "$lib/paraglide/messages";
-import { ToastManager } from "$lib/toast/index.svelte";
+import { ToastManager } from "$lib/util/toast.svelte";
 import type { Component } from "svelte";
 import { MAX_ARRAY_BUFFER_SIZE } from "$lib/store/index.svelte";
 
@@ -121,7 +121,7 @@ export class VertFile {
 	}
 
 	private async convertZip(converter: Converter): Promise<VertFile> {
-		const { extractZip, createZip } = await import("$lib/zip");
+		const { extractZip, createZip } = await import("$lib/util/zip");
 
 		const entries = await extractZip(this.file);
 		const totalFiles = entries.length;
diff --git a/src/lib/animation/index.ts b/src/lib/util/animation.ts
similarity index 100%
rename from src/lib/animation/index.ts
rename to src/lib/util/animation.ts
diff --git a/src/lib/consts.ts b/src/lib/util/consts.ts
similarity index 100%
rename from src/lib/consts.ts
rename to src/lib/util/consts.ts
diff --git a/src/lib/ip.ts b/src/lib/util/ip.ts
similarity index 100%
rename from src/lib/ip.ts
rename to src/lib/util/ip.ts
diff --git a/src/lib/logger/index.ts b/src/lib/util/logger.ts
similarity index 100%
rename from src/lib/logger/index.ts
rename to src/lib/util/logger.ts
diff --git a/src/lib/parse/ani.ts b/src/lib/util/parse/ani.ts
similarity index 100%
rename from src/lib/parse/ani.ts
rename to src/lib/util/parse/ani.ts
diff --git a/src/lib/parse/icns/index.ts b/src/lib/util/parse/icns/index.ts
similarity index 100%
rename from src/lib/parse/icns/index.ts
rename to src/lib/util/parse/icns/index.ts
diff --git a/src/lib/sw/register.ts b/src/lib/util/sw.ts
similarity index 100%
rename from src/lib/sw/register.ts
rename to src/lib/util/sw.ts
diff --git a/src/lib/toast/index.svelte.ts b/src/lib/util/toast.svelte.ts
similarity index 100%
rename from src/lib/toast/index.svelte.ts
rename to src/lib/util/toast.svelte.ts
diff --git a/src/lib/zip.ts b/src/lib/util/zip.ts
similarity index 96%
rename from src/lib/zip.ts
rename to src/lib/util/zip.ts
index 0f54696..8ff9c46 100644
--- a/src/lib/zip.ts
+++ b/src/lib/util/zip.ts
@@ -1,4 +1,4 @@
-import { error, log } from "$lib/logger";
+import { error, log } from "$lib/util/logger";
 import { unzip } from "fflate";
 import { downloadZip } from "client-zip";
 
diff --git a/src/lib/workers/magick.ts b/src/lib/workers/magick.ts
index 4ed26bc..a2221ea 100644
--- a/src/lib/workers/magick.ts
+++ b/src/lib/workers/magick.ts
@@ -7,7 +7,7 @@ import {
 	type IMagickImage,
 } from "@imagemagick/magick-wasm";
 import { makeZip } from "client-zip";
-import { parseAni } from "$lib/parse/ani";
+import { parseAni } from "$lib/util/parse/ani";
 import { parseIcns } from "vert-wasm";
 import type { WorkerMessage } from "$lib/types";
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 95f8b69..29c4300 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,7 +3,7 @@
 	import { goto, beforeNavigate, afterNavigate } from "$app/navigation";
 
 	import { PUB_PLAUSIBLE_URL, PUB_HOSTNAME } from "$env/static/public";
-	import { DISABLE_ALL_EXTERNAL_REQUESTS, VERT_NAME } from "$lib/consts";
+	import { DISABLE_ALL_EXTERNAL_REQUESTS, VERT_NAME } from "$lib/util/consts.js";
 	import * as Layout from "$lib/components/layout";
 	import * as Navbar from "$lib/components/layout/Navbar";
 	import featuredImage from "$lib/assets/VERT_Feature.webp";
@@ -20,7 +20,7 @@
 	} from "$lib/store/index.svelte";
 	import "$lib/css/app.scss";
 	import { browser } from "$app/environment";
-	import { initStores as initAnimStores } from "$lib/animation/index.js";
+	import { initStores as initAnimStores } from "$lib/util/animation.js";
 	import { VertdInstance } from "$lib/sections/settings/vertdSettings.svelte.js";
 
 	let { children, data } = $props();
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index ecef260..c063d64 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -12,7 +12,7 @@
 	import { onMount } from "svelte";
 	import type { WorkerStatus } from "$lib/converters/converter.svelte";
 	import { sanitize } from "$lib/store/index.svelte";
-	import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
+	import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/util/consts";
 
 	const getSupportedFormats = (name: string) =>
 		converters
diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index c50ebde..0ce7352 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { error } from "$lib/logger";
+	import { error } from "$lib/util/logger";
 	import * as About from "$lib/sections/about";
 	import { InfoIcon } from "lucide-svelte";
 	import { onMount } from "svelte";
@@ -9,9 +9,9 @@
 	import avatarRealmy from "$lib/assets/avatars/realmy.jpg";
 	import avatarAzurejelly from "$lib/assets/avatars/azurejelly.jpg";
 	import { PUB_DONATION_URL, PUB_STRIPE_KEY } from "$env/static/public";
-	import { DISABLE_ALL_EXTERNAL_REQUESTS, GITHUB_API_URL } from "$lib/consts";
+	import { DISABLE_ALL_EXTERNAL_REQUESTS, GITHUB_API_URL } from "$lib/util/consts";
 	import { m } from "$lib/paraglide/messages";
-	import { ToastManager } from "$lib/toast/index.svelte";
+	import { ToastManager } from "$lib/util/toast.svelte";
 	// import { dev } from "$app/environment";
 	// import { page } from "$app/state";
 
diff --git a/src/routes/convert/+page.svelte b/src/routes/convert/+page.svelte
index 98f862a..8769825 100644
--- a/src/routes/convert/+page.svelte
+++ b/src/routes/convert/+page.svelte
@@ -31,8 +31,8 @@
 	import { m } from "$lib/paraglide/messages";
 	import { Settings } from "$lib/sections/settings/index.svelte";
 	import { MAX_ARRAY_BUFFER_SIZE } from "$lib/store/index.svelte";
-	import { GB } from "$lib/consts";
-	import { log } from "$lib/logger";
+	import { GB } from "$lib/util/consts";
+	import { log } from "$lib/util/logger";
 
 	let processedFileIds = $state(new Set<string>());
 
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 48b829a..7d586c8 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
 	import { browser } from "$app/environment";
-	import { log } from "$lib/logger";
+	import { log } from "$lib/util/logger";
 	import * as Settings from "$lib/sections/settings/index.svelte";
 	import { PUB_PLAUSIBLE_URL } from "$env/static/public";
 	import { SettingsIcon } from "lucide-svelte";
 	import { onMount } from "svelte";
 	import { m } from "$lib/paraglide/messages";
-	import { ToastManager } from "$lib/toast/index.svelte";
-	import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
+	import { ToastManager } from "$lib/util/toast.svelte";
+	import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/util/consts";
 
 	let settings = $state(Settings.Settings.instance.settings);