diff --git a/src/lib/molecules/Categories/Categories.svelte b/src/lib/components/molecules/Categories/Categories.svelte
similarity index 100%
rename from src/lib/molecules/Categories/Categories.svelte
rename to src/lib/components/molecules/Categories/Categories.svelte
diff --git a/src/lib/molecules/Categories/Category.svelte b/src/lib/components/molecules/Categories/Category.svelte
similarity index 100%
rename from src/lib/molecules/Categories/Category.svelte
rename to src/lib/components/molecules/Categories/Category.svelte
diff --git a/src/lib/molecules/Categories/index.ts b/src/lib/components/molecules/Categories/index.ts
similarity index 100%
rename from src/lib/molecules/Categories/index.ts
rename to src/lib/components/molecules/Categories/index.ts
diff --git a/src/lib/molecules/Categories/service.ts b/src/lib/components/molecules/Categories/service.ts
similarity index 100%
rename from src/lib/molecules/Categories/service.ts
rename to src/lib/components/molecules/Categories/service.ts
diff --git a/src/lib/molecules/SubCategories.svelte b/src/lib/components/molecules/SubCategories.svelte
similarity index 92%
rename from src/lib/molecules/SubCategories.svelte
rename to src/lib/components/molecules/SubCategories.svelte
index cbad371..fd805c9 100644
--- a/src/lib/molecules/SubCategories.svelte
+++ b/src/lib/components/molecules/SubCategories.svelte
@@ -2,9 +2,8 @@
   import type { Component } from "svelte";
   import type { ClassValue, SvelteHTMLElements } from "svelte/elements";
   import type { Writable } from "svelte/store";
-  import { IconEntryButton } from "$lib/components/molecules";
+  import { Categories, IconEntryButton, type SelectedCategory } from "$lib/components/molecules";
   import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
-  import Categories, { type SelectedCategory } from "$lib/molecules/Categories";
   import { masterKeyStore } from "$lib/stores";
 
   import IconAddCircle from "~icons/material-symbols/add-circle";
diff --git a/src/lib/components/molecules/index.ts b/src/lib/components/molecules/index.ts
index fb4fe57..8edc84a 100644
--- a/src/lib/components/molecules/index.ts
+++ b/src/lib/components/molecules/index.ts
@@ -1,6 +1,9 @@
 export * from "./ActionModal.svelte";
 export { default as ActionModal } from "./ActionModal.svelte";
+export * from "./Categories";
+export { default as Categories } from "./Categories";
 export { default as IconEntryButton } from "./IconEntryButton.svelte";
 export * from "./labels";
+export { default as SubCategories } from "./SubCategories.svelte";
 export { default as TitledDiv } from "./TitledDiv.svelte";
 export { default as TopBar } from "./TopBar.svelte";
diff --git a/src/lib/organisms/Category/Category.svelte b/src/lib/components/organisms/Category/Category.svelte
similarity index 95%
rename from src/lib/organisms/Category/Category.svelte
rename to src/lib/components/organisms/Category/Category.svelte
index 3407c32..295bf99 100644
--- a/src/lib/organisms/Category/Category.svelte
+++ b/src/lib/components/organisms/Category/Category.svelte
@@ -2,10 +2,9 @@
   import { untrack } from "svelte";
   import { get, type Writable } from "svelte/store";
   import { CheckBox } from "$lib/components/atoms";
+  import { SubCategories, type SelectedCategory } from "$lib/components/molecules";
   import { getFileInfo, type FileInfo, type CategoryInfo } from "$lib/modules/filesystem";
   import { SortBy, sortEntries } from "$lib/modules/util";
-  import type { SelectedCategory } from "$lib/molecules/Categories";
-  import SubCategories from "$lib/molecules/SubCategories.svelte";
   import { masterKeyStore } from "$lib/stores";
   import File from "./File.svelte";
   import type { SelectedFile } from "./service";
diff --git a/src/lib/organisms/Category/File.svelte b/src/lib/components/organisms/Category/File.svelte
similarity index 100%
rename from src/lib/organisms/Category/File.svelte
rename to src/lib/components/organisms/Category/File.svelte
diff --git a/src/lib/organisms/Category/index.ts b/src/lib/components/organisms/Category/index.ts
similarity index 100%
rename from src/lib/organisms/Category/index.ts
rename to src/lib/components/organisms/Category/index.ts
diff --git a/src/lib/organisms/Category/service.ts b/src/lib/components/organisms/Category/service.ts
similarity index 100%
rename from src/lib/organisms/Category/service.ts
rename to src/lib/components/organisms/Category/service.ts
diff --git a/src/lib/components/organisms/index.ts b/src/lib/components/organisms/index.ts
index fa02317..64f9861 100644
--- a/src/lib/components/organisms/index.ts
+++ b/src/lib/components/organisms/index.ts
@@ -1 +1,3 @@
+export * from "./Category";
+export { default as Category } from "./Category";
 export * from "./modals";
diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte
index 7d7d50e..2ab7e32 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -4,14 +4,13 @@
   import { get, type Writable } from "svelte/store";
   import { goto } from "$app/navigation";
   import { FullscreenDiv } from "$lib/components/atoms";
-  import { IconEntryButton, TopBar } from "$lib/components/molecules";
+  import { Categories, IconEntryButton, TopBar } from "$lib/components/molecules";
   import {
     getFileInfo,
     getCategoryInfo,
     type FileInfo,
     type CategoryInfo,
   } from "$lib/modules/filesystem";
-  import Categories from "$lib/molecules/Categories";
   import { fileDownloadStatusStore, isFileDownloading, masterKeyStore } from "$lib/stores";
   import AddToCategoryBottomSheet from "./AddToCategoryBottomSheet.svelte";
   import DownloadStatus from "./DownloadStatus.svelte";
diff --git a/src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte b/src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte
index 039ab8c..b707015 100644
--- a/src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte
+++ b/src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { Writable } from "svelte/store";
   import { BottomSheet, Button, BottomDiv, FullscreenDiv } from "$lib/components/atoms";
-  import { CategoryCreateModal } from "$lib/components/organisms/modals";
+  import { SubCategories } from "$lib/components/molecules";
+  import { CategoryCreateModal } from "$lib/components/organisms";
   import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
-  import SubCategories from "$lib/molecules/SubCategories.svelte";
   import { masterKeyStore } from "$lib/stores";
   import { requestCategoryCreation } from "./service";
 
diff --git a/src/routes/(main)/category/[[id]]/+page.svelte b/src/routes/(main)/category/[[id]]/+page.svelte
index 47aa2b5..9bfa2a4 100644
--- a/src/routes/(main)/category/[[id]]/+page.svelte
+++ b/src/routes/(main)/category/[[id]]/+page.svelte
@@ -2,9 +2,8 @@
   import type { Writable } from "svelte/store";
   import { goto } from "$app/navigation";
   import { TopBar } from "$lib/components/molecules";
-  import { CategoryCreateModal } from "$lib/components/organisms";
+  import { Category, CategoryCreateModal } from "$lib/components/organisms";
   import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem";
-  import Category from "$lib/organisms/Category";
   import { masterKeyStore } from "$lib/stores";
   import CategoryDeleteModal from "./CategoryDeleteModal.svelte";
   import CategoryMenuBottomSheet from "./CategoryMenuBottomSheet.svelte";
diff --git a/src/routes/(main)/category/[[id]]/service.svelte.ts b/src/routes/(main)/category/[[id]]/service.svelte.ts
index 275fe80..b573041 100644
--- a/src/routes/(main)/category/[[id]]/service.svelte.ts
+++ b/src/routes/(main)/category/[[id]]/service.svelte.ts
@@ -1,7 +1,7 @@
 import { getContext, setContext } from "svelte";
 import { callPostApi } from "$lib/hooks";
 import { encryptString } from "$lib/modules/crypto";
-import type { SelectedCategory } from "$lib/molecules/Categories";
+import type { SelectedCategory } from "$lib/components/molecules";
 import type { CategoryRenameRequest } from "$lib/server/schemas";
 
 export { requestCategoryCreation, requestFileRemovalFromCategory } from "$lib/services/category";