diff --git a/src/app/AppBar.vue b/src/app/AppBar.vue
index ff3902a..31955af 100644
--- a/src/app/AppBar.vue
+++ b/src/app/AppBar.vue
@@ -32,7 +32,7 @@ import { useDisplay } from "vuetify";
 
 import { useConfig } from "@/utils/config";
 import ToggleDarkModeButton from "@/components/utils/ToggleDarkModeButtonWithTooltip.vue";
-import AutoModeButton from "@/components/auto-mode-button/AutoModeButton.vue";
+import { AutoModeButton } from "@/components/schedule";
 
 import TabNavi from "./TabNavi.vue";
 
diff --git a/src/views/db/RefreshButton.vue b/src/components/rdb/RefreshButton.vue
similarity index 100%
rename from src/views/db/RefreshButton.vue
rename to src/components/rdb/RefreshButton.vue
diff --git a/src/components/History/RunCard.vue b/src/components/rdb/RunCard.vue
similarity index 100%
rename from src/components/History/RunCard.vue
rename to src/components/rdb/RunCard.vue
diff --git a/src/views/db/RunView.vue b/src/components/rdb/RunView.vue
similarity index 96%
rename from src/views/db/RunView.vue
rename to src/components/rdb/RunView.vue
index e81116a..1fc99a5 100644
--- a/src/views/db/RunView.vue
+++ b/src/components/rdb/RunView.vue
@@ -4,7 +4,7 @@ import { useRoute } from "vue-router";
 
 import { useRdbRunQuery } from "@/graphql/codegen/generated";
 
-import RunCard from "@/components/History/RunCard.vue";
+import RunCard from "./RunCard.vue";
 
 const route = useRoute();
 const runNo = Number(route.params.runNo);
diff --git a/src/views/db/RunsView.vue b/src/components/rdb/RunsView.vue
similarity index 100%
rename from src/views/db/RunsView.vue
rename to src/components/rdb/RunsView.vue
diff --git a/src/components/auto-mode-button/AutoModeButton.vue b/src/components/schedule/auto-mode/auto-mode-button/AutoModeButton.vue
similarity index 100%
rename from src/components/auto-mode-button/AutoModeButton.vue
rename to src/components/schedule/auto-mode/auto-mode-button/AutoModeButton.vue
diff --git a/src/components/auto-mode-button/modes/error/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/error/Button.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/error/Button.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/error/Button.vue
diff --git a/src/components/auto-mode-button/modes/error/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/error/Dialog.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/error/Dialog.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/error/Dialog.vue
diff --git a/src/components/auto-mode-button/modes/off/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/off/Button.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/off/Button.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/off/Button.vue
diff --git a/src/components/auto-mode-button/modes/off/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/off/Dialog.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/off/Dialog.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/off/Dialog.vue
diff --git a/src/components/auto-mode-button/modes/queue/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/queue/Button.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/queue/Button.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/queue/Button.vue
diff --git a/src/components/auto-mode-button/modes/queue/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/queue/Dialog.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/queue/Dialog.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/queue/Dialog.vue
diff --git a/src/components/auto-mode-button/modes/scheduler/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Button.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/scheduler/Button.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Button.vue
diff --git a/src/components/auto-mode-button/modes/scheduler/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Dialog.vue
similarity index 100%
rename from src/components/auto-mode-button/modes/scheduler/Dialog.vue
rename to src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Dialog.vue
diff --git a/src/components/schedule/index.ts b/src/components/schedule/index.ts
new file mode 100644
index 0000000..9abd25d
--- /dev/null
+++ b/src/components/schedule/index.ts
@@ -0,0 +1 @@
+export { default as AutoModeButton } from "./auto-mode/auto-mode-button/AutoModeButton.vue";
diff --git a/src/components/queue/ErrorDialog.vue b/src/components/schedule/queue/ErrorDialog.vue
similarity index 100%
rename from src/components/queue/ErrorDialog.vue
rename to src/components/schedule/queue/ErrorDialog.vue
diff --git a/src/components/queue/LoadingIndicator.vue b/src/components/schedule/queue/LoadingIndicator.vue
similarity index 100%
rename from src/components/queue/LoadingIndicator.vue
rename to src/components/schedule/queue/LoadingIndicator.vue
diff --git a/src/components/queue/QueueFrame.vue b/src/components/schedule/queue/QueueFrame.vue
similarity index 100%
rename from src/components/queue/QueueFrame.vue
rename to src/components/schedule/queue/QueueFrame.vue
diff --git a/src/views/QueueView.vue b/src/components/schedule/queue/QueueView.vue
similarity index 59%
rename from src/views/QueueView.vue
rename to src/components/schedule/queue/QueueView.vue
index 554924f..f0b3a59 100644
--- a/src/views/QueueView.vue
+++ b/src/components/schedule/queue/QueueView.vue
@@ -3,5 +3,5 @@
 </template>
 
 <script setup lang="ts">
-import QueueFrame from "@/components/queue/QueueFrame.vue";
+import QueueFrame from "./QueueFrame.vue";
 </script>
diff --git a/src/components/queue/TableFrame.vue b/src/components/schedule/queue/TableFrame.vue
similarity index 100%
rename from src/components/queue/TableFrame.vue
rename to src/components/schedule/queue/TableFrame.vue
diff --git a/src/components/queue/TopFrame.vue b/src/components/schedule/queue/TopFrame.vue
similarity index 100%
rename from src/components/queue/TopFrame.vue
rename to src/components/schedule/queue/TopFrame.vue
diff --git a/src/components/queue/add/AddDialog.vue b/src/components/schedule/queue/add/AddDialog.vue
similarity index 100%
rename from src/components/queue/add/AddDialog.vue
rename to src/components/schedule/queue/add/AddDialog.vue
diff --git a/src/components/queue/add/DiscardConfirmationDialog.vue b/src/components/schedule/queue/add/DiscardConfirmationDialog.vue
similarity index 100%
rename from src/components/queue/add/DiscardConfirmationDialog.vue
rename to src/components/schedule/queue/add/DiscardConfirmationDialog.vue
diff --git a/src/components/queue/add/Editor.vue b/src/components/schedule/queue/add/Editor.vue
similarity index 100%
rename from src/components/queue/add/Editor.vue
rename to src/components/schedule/queue/add/Editor.vue
diff --git a/src/components/queue/add/ItemAdd.vue b/src/components/schedule/queue/add/ItemAdd.vue
similarity index 100%
rename from src/components/queue/add/ItemAdd.vue
rename to src/components/schedule/queue/add/ItemAdd.vue
diff --git a/src/components/queue/items.ts b/src/components/schedule/queue/items.ts
similarity index 100%
rename from src/components/queue/items.ts
rename to src/components/schedule/queue/items.ts
diff --git a/src/components/queue/view/ContentFrame.vue b/src/components/schedule/queue/view/ContentFrame.vue
similarity index 100%
rename from src/components/queue/view/ContentFrame.vue
rename to src/components/schedule/queue/view/ContentFrame.vue
diff --git a/src/components/queue/view/DeleteConfirmationDialog.vue b/src/components/schedule/queue/view/DeleteConfirmationDialog.vue
similarity index 100%
rename from src/components/queue/view/DeleteConfirmationDialog.vue
rename to src/components/schedule/queue/view/DeleteConfirmationDialog.vue
diff --git a/src/components/queue/view/Editor.vue b/src/components/schedule/queue/view/Editor.vue
similarity index 100%
rename from src/components/queue/view/Editor.vue
rename to src/components/schedule/queue/view/Editor.vue
diff --git a/src/components/queue/view/TopFrame.vue b/src/components/schedule/queue/view/TopFrame.vue
similarity index 100%
rename from src/components/queue/view/TopFrame.vue
rename to src/components/schedule/queue/view/TopFrame.vue
diff --git a/src/components/queue/view/ViewDialog.vue b/src/components/schedule/queue/view/ViewDialog.vue
similarity index 100%
rename from src/components/queue/view/ViewDialog.vue
rename to src/components/schedule/queue/view/ViewDialog.vue
diff --git a/src/plugins/router.ts b/src/plugins/router.ts
index 24cb841..5ef1735 100644
--- a/src/plugins/router.ts
+++ b/src/plugins/router.ts
@@ -2,8 +2,8 @@ import { createRouter, createWebHistory } from "vue-router";
 import type { RouteRecordRaw } from "vue-router";
 
 import HomeView from "@/views/main/HomeView.vue";
-import RunsView from "@/views/db/RunsView.vue";
-import RunView from "@/views/db/RunView.vue";
+import RunsView from "@/components/rdb/RunsView.vue";
+import RunView from "@/components/rdb/RunView.vue";
 
 const routes: RouteRecordRaw[] = [
   {
@@ -19,7 +19,7 @@ const routes: RouteRecordRaw[] = [
   {
     path: "/queue",
     name: "queue",
-    component: () => import("@/views/QueueView.vue"),
+    component: () => import("@/components/schedule/queue/QueueView.vue"),
   },
   {
     path: "/db/runs",