diff --git a/komga-webui/src/components/Dialogs.vue b/komga-webui/src/components/Dialogs.vue
index 393316910..84486cb20 100644
--- a/komga-webui/src/components/Dialogs.vue
+++ b/komga-webui/src/components/Dialogs.vue
@@ -21,9 +21,9 @@
 </template>
 
 <script lang="ts">
-import CollectionAddToDialog from '@/components/CollectionAddToDialog.vue'
-import CollectionDeleteDialog from '@/components/CollectionDeleteDialog.vue'
-import LibraryDeleteDialog from '@/components/LibraryDeleteDialog.vue'
+import CollectionAddToDialog from '@/components/dialogs/CollectionAddToDialog.vue'
+import CollectionDeleteDialog from '@/components/dialogs/CollectionDeleteDialog.vue'
+import LibraryDeleteDialog from '@/components/dialogs/LibraryDeleteDialog.vue'
 import { COLLECTION_CHANGED, COLLECTION_DELETED, LIBRARY_DELETED, SERIES_CHANGED } from '@/types/events'
 import Vue from 'vue'
 
diff --git a/komga-webui/src/components/ItemCard.vue b/komga-webui/src/components/ItemCard.vue
index 1ec4044e6..d9a0ca88f 100644
--- a/komga-webui/src/components/ItemCard.vue
+++ b/komga-webui/src/components/ItemCard.vue
@@ -109,9 +109,9 @@
 </template>
 
 <script lang="ts">
-import BookActionsMenu from '@/components/BookActionsMenu.vue'
-import CollectionActionsMenu from '@/components/CollectionActionsMenu.vue'
-import SeriesActionsMenu from '@/components/SeriesActionsMenu.vue'
+import BookActionsMenu from '@/components/menus/BookActionsMenu.vue'
+import CollectionActionsMenu from '@/components/menus/CollectionActionsMenu.vue'
+import SeriesActionsMenu from '@/components/menus/SeriesActionsMenu.vue'
 import { getReadProgress, getReadProgressPercentage } from '@/functions/book-progress'
 import { ReadStatus } from '@/types/enum-books'
 import { createItem, Item, ItemTypes } from '@/types/items'
diff --git a/komga-webui/src/components/CollectionAddToDialog.vue b/komga-webui/src/components/dialogs/CollectionAddToDialog.vue
similarity index 100%
rename from komga-webui/src/components/CollectionAddToDialog.vue
rename to komga-webui/src/components/dialogs/CollectionAddToDialog.vue
diff --git a/komga-webui/src/components/CollectionDeleteDialog.vue b/komga-webui/src/components/dialogs/CollectionDeleteDialog.vue
similarity index 100%
rename from komga-webui/src/components/CollectionDeleteDialog.vue
rename to komga-webui/src/components/dialogs/CollectionDeleteDialog.vue
diff --git a/komga-webui/src/components/CollectionEditDialog.vue b/komga-webui/src/components/dialogs/CollectionEditDialog.vue
similarity index 100%
rename from komga-webui/src/components/CollectionEditDialog.vue
rename to komga-webui/src/components/dialogs/CollectionEditDialog.vue
diff --git a/komga-webui/src/components/EditBooksDialog.vue b/komga-webui/src/components/dialogs/EditBooksDialog.vue
similarity index 99%
rename from komga-webui/src/components/EditBooksDialog.vue
rename to komga-webui/src/components/dialogs/EditBooksDialog.vue
index 5c3b30ff7..a26f6ecef 100644
--- a/komga-webui/src/components/EditBooksDialog.vue
+++ b/komga-webui/src/components/dialogs/EditBooksDialog.vue
@@ -575,5 +575,5 @@ export default Vue.extend({
 </script>
 
 <style lang="sass" scoped>
-@import '../styles/tabbed-dialog.sass'
+@import 'src/styles/tabbed-dialog'
 </style>
diff --git a/komga-webui/src/components/EditSeriesDialog.vue b/komga-webui/src/components/dialogs/EditSeriesDialog.vue
similarity index 99%
rename from komga-webui/src/components/EditSeriesDialog.vue
rename to komga-webui/src/components/dialogs/EditSeriesDialog.vue
index 2f566825e..a90698eff 100644
--- a/komga-webui/src/components/EditSeriesDialog.vue
+++ b/komga-webui/src/components/dialogs/EditSeriesDialog.vue
@@ -297,5 +297,5 @@ export default Vue.extend({
 </script>
 
 <style lang="sass" scoped>
-@import '../styles/tabbed-dialog.sass'
+@import 'src/styles/tabbed-dialog'
 </style>
diff --git a/komga-webui/src/components/FileBrowserDialog.vue b/komga-webui/src/components/dialogs/FileBrowserDialog.vue
similarity index 100%
rename from komga-webui/src/components/FileBrowserDialog.vue
rename to komga-webui/src/components/dialogs/FileBrowserDialog.vue
diff --git a/komga-webui/src/components/LibraryAddDialog.vue b/komga-webui/src/components/dialogs/LibraryAddDialog.vue
similarity index 98%
rename from komga-webui/src/components/LibraryAddDialog.vue
rename to komga-webui/src/components/dialogs/LibraryAddDialog.vue
index 2faac1cdc..44f2f8e7f 100644
--- a/komga-webui/src/components/LibraryAddDialog.vue
+++ b/komga-webui/src/components/dialogs/LibraryAddDialog.vue
@@ -84,7 +84,7 @@
 </template>
 
 <script lang="ts">
-import FileBrowserDialog from '@/components/FileBrowserDialog.vue'
+import FileBrowserDialog from '@/components/dialogs/FileBrowserDialog.vue'
 import Vue from 'vue'
 import { required } from 'vuelidate/lib/validators'
 
diff --git a/komga-webui/src/components/LibraryDeleteDialog.vue b/komga-webui/src/components/dialogs/LibraryDeleteDialog.vue
similarity index 100%
rename from komga-webui/src/components/LibraryDeleteDialog.vue
rename to komga-webui/src/components/dialogs/LibraryDeleteDialog.vue
diff --git a/komga-webui/src/components/PasswordChangeDialog.vue b/komga-webui/src/components/dialogs/PasswordChangeDialog.vue
similarity index 100%
rename from komga-webui/src/components/PasswordChangeDialog.vue
rename to komga-webui/src/components/dialogs/PasswordChangeDialog.vue
diff --git a/komga-webui/src/components/ThumbnailExplorerDialog.vue b/komga-webui/src/components/dialogs/ThumbnailExplorerDialog.vue
similarity index 98%
rename from komga-webui/src/components/ThumbnailExplorerDialog.vue
rename to komga-webui/src/components/dialogs/ThumbnailExplorerDialog.vue
index 7ded39fe0..ed278c93e 100644
--- a/komga-webui/src/components/ThumbnailExplorerDialog.vue
+++ b/komga-webui/src/components/dialogs/ThumbnailExplorerDialog.vue
@@ -21,7 +21,7 @@
             >
               <v-img
                 :src="url"
-                lazy-src="../assets/cover.svg"
+                lazy-src="../../assets/cover.svg"
                 aspect-ratio="0.7071"
                 :contain="true"
                 max-height="200"
diff --git a/komga-webui/src/components/UserAddDialog.vue b/komga-webui/src/components/dialogs/UserAddDialog.vue
similarity index 100%
rename from komga-webui/src/components/UserAddDialog.vue
rename to komga-webui/src/components/dialogs/UserAddDialog.vue
diff --git a/komga-webui/src/components/UserDeleteDialog.vue b/komga-webui/src/components/dialogs/UserDeleteDialog.vue
similarity index 100%
rename from komga-webui/src/components/UserDeleteDialog.vue
rename to komga-webui/src/components/dialogs/UserDeleteDialog.vue
diff --git a/komga-webui/src/components/UserEditDialog.vue b/komga-webui/src/components/dialogs/UserEditDialog.vue
similarity index 100%
rename from komga-webui/src/components/UserEditDialog.vue
rename to komga-webui/src/components/dialogs/UserEditDialog.vue
diff --git a/komga-webui/src/components/UserSharedLibrariesEditDialog.vue b/komga-webui/src/components/dialogs/UserSharedLibrariesEditDialog.vue
similarity index 100%
rename from komga-webui/src/components/UserSharedLibrariesEditDialog.vue
rename to komga-webui/src/components/dialogs/UserSharedLibrariesEditDialog.vue
diff --git a/komga-webui/src/components/BookActionsMenu.vue b/komga-webui/src/components/menus/BookActionsMenu.vue
similarity index 100%
rename from komga-webui/src/components/BookActionsMenu.vue
rename to komga-webui/src/components/menus/BookActionsMenu.vue
diff --git a/komga-webui/src/components/CollectionActionsMenu.vue b/komga-webui/src/components/menus/CollectionActionsMenu.vue
similarity index 96%
rename from komga-webui/src/components/CollectionActionsMenu.vue
rename to komga-webui/src/components/menus/CollectionActionsMenu.vue
index 3102d5aa6..04fa224e1 100644
--- a/komga-webui/src/components/CollectionActionsMenu.vue
+++ b/komga-webui/src/components/menus/CollectionActionsMenu.vue
@@ -53,5 +53,5 @@ export default Vue.extend({
 })
 </script>
 <style scoped>
-@import "../styles/list-warning.css";
+@import "../../styles/list-warning.css";
 </style>
diff --git a/komga-webui/src/components/LibraryActionsMenu.vue b/komga-webui/src/components/menus/LibraryActionsMenu.vue
similarity index 97%
rename from komga-webui/src/components/LibraryActionsMenu.vue
rename to komga-webui/src/components/menus/LibraryActionsMenu.vue
index 700f4bba4..396e968e8 100644
--- a/komga-webui/src/components/LibraryActionsMenu.vue
+++ b/komga-webui/src/components/menus/LibraryActionsMenu.vue
@@ -57,5 +57,5 @@ export default Vue.extend({
 })
 </script>
 <style scoped>
-@import "../styles/list-warning.css";
+@import "../../styles/list-warning.css";
 </style>
diff --git a/komga-webui/src/components/SeriesActionsMenu.vue b/komga-webui/src/components/menus/SeriesActionsMenu.vue
similarity index 100%
rename from komga-webui/src/components/SeriesActionsMenu.vue
rename to komga-webui/src/components/menus/SeriesActionsMenu.vue
diff --git a/komga-webui/src/router.ts b/komga-webui/src/router.ts
index 1563fe242..7ebaed8b6 100644
--- a/komga-webui/src/router.ts
+++ b/komga-webui/src/router.ts
@@ -32,7 +32,7 @@ const router = new Router({
           path: '/libraries/add',
           name: 'addlibrary',
           beforeEnter: adminGuard,
-          component: () => import(/* webpackChunkName: "addlibrary" */ './components/LibraryAddDialog.vue'),
+          component: () => import(/* webpackChunkName: "addlibrary" */ './components/dialogs/LibraryAddDialog.vue'),
         },
         {
           path: '/welcome',
@@ -60,7 +60,7 @@ const router = new Router({
                 {
                   path: '/settings/users/add',
                   name: 'settings-users-add',
-                  component: () => import(/* webpackChunkName: "settings-user" */ './components/UserAddDialog.vue'),
+                  component: () => import(/* webpackChunkName: "settings-user" */ './components/dialogs/UserAddDialog.vue'),
                 },
               ],
             },
diff --git a/komga-webui/src/views/AccountSettings.vue b/komga-webui/src/views/AccountSettings.vue
index 85e7f7990..468da1ee8 100644
--- a/komga-webui/src/views/AccountSettings.vue
+++ b/komga-webui/src/views/AccountSettings.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="ts">
-import PasswordChangeDialog from '@/components/PasswordChangeDialog.vue'
+import PasswordChangeDialog from '@/components/dialogs/PasswordChangeDialog.vue'
 import Vue from 'vue'
 
 export default Vue.extend({
diff --git a/komga-webui/src/views/BookReader.vue b/komga-webui/src/views/BookReader.vue
index 1737e9813..50a5eaf19 100644
--- a/komga-webui/src/views/BookReader.vue
+++ b/komga-webui/src/views/BookReader.vue
@@ -251,7 +251,7 @@
 <script lang="ts">
 import SettingsSelect from '@/components/SettingsSelect.vue'
 import SettingsSwitch from '@/components/SettingsSwitch.vue'
-import ThumbnailExplorerDialog from '@/components/ThumbnailExplorerDialog.vue'
+import ThumbnailExplorerDialog from '@/components/dialogs/ThumbnailExplorerDialog.vue'
 import { getBookTitleCompact } from '@/functions/book-title'
 import { checkWebpFeature } from '@/functions/check-webp'
 import { bookPageUrl } from '@/functions/urls'
diff --git a/komga-webui/src/views/BrowseBook.vue b/komga-webui/src/views/BrowseBook.vue
index 77b08536d..cf58c68a5 100644
--- a/komga-webui/src/views/BrowseBook.vue
+++ b/komga-webui/src/views/BrowseBook.vue
@@ -147,8 +147,8 @@
 
 <script lang="ts">
 import Badge from '@/components/Badge.vue'
-import BookActionsMenu from '@/components/BookActionsMenu.vue'
-import EditBooksDialog from '@/components/EditBooksDialog.vue'
+import BookActionsMenu from '@/components/menus/BookActionsMenu.vue'
+import EditBooksDialog from '@/components/dialogs/EditBooksDialog.vue'
 import ItemCard from '@/components/ItemCard.vue'
 import ToolbarSticky from '@/components/ToolbarSticky.vue'
 import { groupAuthorsByRolePlural } from '@/functions/authors'
diff --git a/komga-webui/src/views/BrowseCollection.vue b/komga-webui/src/views/BrowseCollection.vue
index a8e7201d9..03d655479 100644
--- a/komga-webui/src/views/BrowseCollection.vue
+++ b/komga-webui/src/views/BrowseCollection.vue
@@ -130,9 +130,9 @@
 
 <script lang="ts">
 import Badge from '@/components/Badge.vue'
-import CollectionActionsMenu from '@/components/CollectionActionsMenu.vue'
-import CollectionEditDialog from '@/components/CollectionEditDialog.vue'
-import EditSeriesDialog from '@/components/EditSeriesDialog.vue'
+import CollectionActionsMenu from '@/components/menus/CollectionActionsMenu.vue'
+import CollectionEditDialog from '@/components/dialogs/CollectionEditDialog.vue'
+import EditSeriesDialog from '@/components/dialogs/EditSeriesDialog.vue'
 import ItemBrowser from '@/components/ItemBrowser.vue'
 import ToolbarSticky from '@/components/ToolbarSticky.vue'
 import { COLLECTION_DELETED, SERIES_CHANGED } from '@/types/events'
diff --git a/komga-webui/src/views/BrowseCollections.vue b/komga-webui/src/views/BrowseCollections.vue
index 388831d1c..884287389 100644
--- a/komga-webui/src/views/BrowseCollections.vue
+++ b/komga-webui/src/views/BrowseCollections.vue
@@ -38,7 +38,7 @@
 <script lang="ts">
 import Badge from '@/components/Badge.vue'
 import ItemBrowser from '@/components/ItemBrowser.vue'
-import LibraryActionsMenu from '@/components/LibraryActionsMenu.vue'
+import LibraryActionsMenu from '@/components/menus/LibraryActionsMenu.vue'
 import LibraryNavigation from '@/components/LibraryNavigation.vue'
 import PageSizeSelect from '@/components/PageSizeSelect.vue'
 import ToolbarSticky from '@/components/ToolbarSticky.vue'
diff --git a/komga-webui/src/views/BrowseLibraries.vue b/komga-webui/src/views/BrowseLibraries.vue
index 2c87b10a8..588900f03 100644
--- a/komga-webui/src/views/BrowseLibraries.vue
+++ b/komga-webui/src/views/BrowseLibraries.vue
@@ -120,11 +120,11 @@
 
 <script lang="ts">
 import Badge from '@/components/Badge.vue'
-import EditSeriesDialog from '@/components/EditSeriesDialog.vue'
+import EditSeriesDialog from '@/components/dialogs/EditSeriesDialog.vue'
 import EmptyState from '@/components/EmptyState.vue'
 import FilterMenuButton from '@/components/FilterMenuButton.vue'
 import ItemBrowser from '@/components/ItemBrowser.vue'
-import LibraryActionsMenu from '@/components/LibraryActionsMenu.vue'
+import LibraryActionsMenu from '@/components/menus/LibraryActionsMenu.vue'
 import LibraryNavigation from '@/components/LibraryNavigation.vue'
 import PageSizeSelect from '@/components/PageSizeSelect.vue'
 import SortMenuButton from '@/components/SortMenuButton.vue'
diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue
index dca6b767f..432568478 100644
--- a/komga-webui/src/views/BrowseSeries.vue
+++ b/komga-webui/src/views/BrowseSeries.vue
@@ -201,15 +201,15 @@
 
 <script lang="ts">
 import Badge from '@/components/Badge.vue'
-import EditBooksDialog from '@/components/EditBooksDialog.vue'
-import EditSeriesDialog from '@/components/EditSeriesDialog.vue'
+import EditBooksDialog from '@/components/dialogs/EditBooksDialog.vue'
+import EditSeriesDialog from '@/components/dialogs/EditSeriesDialog.vue'
 import EmptyState from '@/components/EmptyState.vue'
 import FilterMenuButton from '@/components/FilterMenuButton.vue'
 import HorizontalScroller from '@/components/HorizontalScroller.vue'
 import ItemBrowser from '@/components/ItemBrowser.vue'
 import ItemCard from '@/components/ItemCard.vue'
 import PageSizeSelect from '@/components/PageSizeSelect.vue'
-import SeriesActionsMenu from '@/components/SeriesActionsMenu.vue'
+import SeriesActionsMenu from '@/components/menus/SeriesActionsMenu.vue'
 import SortMenuButton from '@/components/SortMenuButton.vue'
 import ToolbarSticky from '@/components/ToolbarSticky.vue'
 import { parseQueryFilter, parseQuerySort } from '@/functions/query-params'
diff --git a/komga-webui/src/views/Dashboard.vue b/komga-webui/src/views/Dashboard.vue
index 5b4984d32..1b566a892 100644
--- a/komga-webui/src/views/Dashboard.vue
+++ b/komga-webui/src/views/Dashboard.vue
@@ -83,8 +83,8 @@
 </template>
 
 <script lang="ts">
-import EditBooksDialog from '@/components/EditBooksDialog.vue'
-import EditSeriesDialog from '@/components/EditSeriesDialog.vue'
+import EditBooksDialog from '@/components/dialogs/EditBooksDialog.vue'
+import EditSeriesDialog from '@/components/dialogs/EditSeriesDialog.vue'
 import EmptyState from '@/components/EmptyState.vue'
 import HorizontalScroller from '@/components/HorizontalScroller.vue'
 import ItemCard from '@/components/ItemCard.vue'
diff --git a/komga-webui/src/views/Home.vue b/komga-webui/src/views/Home.vue
index fc4017a79..d3d7ec77a 100644
--- a/komga-webui/src/views/Home.vue
+++ b/komga-webui/src/views/Home.vue
@@ -117,7 +117,7 @@
 
 <script lang="ts">
 import Dialogs from '@/components/Dialogs.vue'
-import LibraryActionsMenu from '@/components/LibraryActionsMenu.vue'
+import LibraryActionsMenu from '@/components/menus/LibraryActionsMenu.vue'
 import SearchBox from '@/components/SearchBox.vue'
 import Vue from 'vue'
 
diff --git a/komga-webui/src/views/SettingsUsers.vue b/komga-webui/src/views/SettingsUsers.vue
index b7e6461fa..8eacca1f7 100644
--- a/komga-webui/src/views/SettingsUsers.vue
+++ b/komga-webui/src/views/SettingsUsers.vue
@@ -91,9 +91,9 @@
 </template>
 
 <script lang="ts">
-import UserDeleteDialog from '@/components/UserDeleteDialog.vue'
-import UserEditDialog from '@/components/UserEditDialog.vue'
-import UserSharedLibrariesEditDialog from '@/components/UserSharedLibrariesEditDialog.vue'
+import UserDeleteDialog from '@/components/dialogs/UserDeleteDialog.vue'
+import UserEditDialog from '@/components/dialogs/UserEditDialog.vue'
+import UserSharedLibrariesEditDialog from '@/components/dialogs/UserSharedLibrariesEditDialog.vue'
 import { UserRoles } from '@/types/enum-users'
 import Vue from 'vue'