diff --git a/src/lib/components/molecules/FileThumbnailButton.svelte b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
similarity index 89%
rename from src/lib/components/molecules/FileThumbnailButton.svelte
rename to src/lib/components/atoms/buttons/FileThumbnailButton.svelte
index 463419a..c18101c 100644
--- a/src/lib/components/molecules/FileThumbnailButton.svelte
+++ b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
@@ -31,7 +31,7 @@
 {#if $info}
   <button
     onclick={() => onclick?.($info)}
-    class="relative aspect-square w-full overflow-hidden rounded transition active:scale-95 active:brightness-90"
+    class="aspect-square overflow-hidden rounded transition active:scale-95 active:brightness-90"
   >
     {#if thumbnail}
       <img src={thumbnail} alt={$info.name} class="h-full w-full object-cover" />
diff --git a/src/lib/components/atoms/buttons/index.ts b/src/lib/components/atoms/buttons/index.ts
index fc5022f..4ed77f2 100644
--- a/src/lib/components/atoms/buttons/index.ts
+++ b/src/lib/components/atoms/buttons/index.ts
@@ -1,5 +1,6 @@
 export { default as ActionEntryButton } from "./ActionEntryButton.svelte";
 export { default as Button } from "./Button.svelte";
 export { default as EntryButton } from "./EntryButton.svelte";
+export { default as FileThumbnailButton } from "./FileThumbnailButton.svelte";
 export { default as FloatingButton } from "./FloatingButton.svelte";
 export { default as TextButton } from "./TextButton.svelte";
diff --git a/src/lib/components/molecules/index.ts b/src/lib/components/molecules/index.ts
index b71affe..8edc84a 100644
--- a/src/lib/components/molecules/index.ts
+++ b/src/lib/components/molecules/index.ts
@@ -2,7 +2,6 @@ export * from "./ActionModal.svelte";
 export { default as ActionModal } from "./ActionModal.svelte";
 export * from "./Categories";
 export { default as Categories } from "./Categories";
-export { default as FileThumbnailButton } from "./FileThumbnailButton.svelte";
 export { default as IconEntryButton } from "./IconEntryButton.svelte";
 export * from "./labels";
 export { default as SubCategories } from "./SubCategories.svelte";
diff --git a/src/lib/components/organisms/Gallery.svelte b/src/lib/components/organisms/Gallery.svelte
index 4ee8a37..8537ac5 100644
--- a/src/lib/components/organisms/Gallery.svelte
+++ b/src/lib/components/organisms/Gallery.svelte
@@ -2,7 +2,7 @@
   import { createWindowVirtualizer } from "@tanstack/svelte-virtual";
   import { untrack } from "svelte";
   import { get, type Writable } from "svelte/store";
-  import { FileThumbnailButton } from "$lib/components/molecules";
+  import { FileThumbnailButton } from "$lib/components/atoms";
   import type { FileInfo } from "$lib/modules/filesystem";
   import { formatDate, formatDateSortable, SortBy, sortEntries } from "$lib/utils";
 
diff --git a/src/routes/(fullscreen)/key/export/+page.ts b/src/routes/(fullscreen)/key/export/+page.ts
index 5785158..fc25a3e 100644
--- a/src/routes/(fullscreen)/key/export/+page.ts
+++ b/src/routes/(fullscreen)/key/export/+page.ts
@@ -1,5 +1,5 @@
 import { error } from "@sveltejs/kit";
-import { keyExportState } from "$lib/utils/gotoStateful";
+import { keyExportState } from "$lib/utils";
 import type { PageLoad } from "./$types";
 
 export const load: PageLoad = async () => {
diff --git a/src/routes/(main)/home/+page.svelte b/src/routes/(main)/home/+page.svelte
index e8997c4..3ee05bb 100644
--- a/src/routes/(main)/home/+page.svelte
+++ b/src/routes/(main)/home/+page.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import type { Writable } from "svelte/store";
   import { goto } from "$app/navigation";
-  import { EntryButton } from "$lib/components/atoms";
-  import { FileThumbnailButton } from "$lib/components/molecules";
+  import { EntryButton, FileThumbnailButton } from "$lib/components/atoms";
   import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
   import { requestFreshMediaFilesRetrieval } from "./service";
diff --git a/src/trpc/routers/client.ts b/src/trpc/routers/client.ts
index db7229a..49844f1 100644
--- a/src/trpc/routers/client.ts
+++ b/src/trpc/routers/client.ts
@@ -1,8 +1,8 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import { ClientRepo, IntegrityError } from "$lib/server/db";
-import { verifyPubKey, verifySignature, generateChallenge } from "$lib/server/modules/crypto";
 import env from "$lib/server/loadenv";
+import { verifyPubKey, verifySignature, generateChallenge } from "$lib/server/modules/crypto";
 import { router, roleProcedure } from "../init.server";
 
 const createUserClientChallenge = async (