diff --git a/ui/src/App.vue b/ui/src/App.vue
index 8589e79..3d9d76e 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -20,10 +20,10 @@
 <script lang="ts">
 import { Options, Vue } from "vue-class-component";
 
+import CalendarAssistant from "./components/admin/CalendarAssistant.vue";
+import ConfigView from "./components/admin/ConfigView.vue";
+import DoorMapEditor from "./components/admin/DoorMapEditor.vue";
 import AdminButton from "./components/AdminButton.vue";
-import CalendarAssistant from "./components/CalendarAssistant.vue";
-import ConfigView from "./components/ConfigView.vue";
-import DoorMapEditor from "./components/DoorMapEditor.vue";
 
 @Options({
   components: {
diff --git a/ui/src/components/Calendar.vue b/ui/src/components/Calendar.vue
index bc3bb26..ce8212f 100644
--- a/ui/src/components/Calendar.vue
+++ b/ui/src/components/Calendar.vue
@@ -27,8 +27,8 @@
 import { Door } from "@/lib/door";
 import { Options, Vue } from "vue-class-component";
 
+import MultiModal from "./MultiModal.vue";
 import CalendarDoor from "./calendar/CalendarDoor.vue";
-import MultiModal from "./calendar/MultiModal.vue";
 import ThouCanvas from "./calendar/ThouCanvas.vue";
 
 @Options({
diff --git a/ui/src/components/calendar/MultiModal.vue b/ui/src/components/MultiModal.vue
similarity index 100%
rename from ui/src/components/calendar/MultiModal.vue
rename to ui/src/components/MultiModal.vue
diff --git a/ui/src/components/CalendarAssistant.vue b/ui/src/components/admin/CalendarAssistant.vue
similarity index 94%
rename from ui/src/components/CalendarAssistant.vue
rename to ui/src/components/admin/CalendarAssistant.vue
index 823af9c..776fb9e 100644
--- a/ui/src/components/CalendarAssistant.vue
+++ b/ui/src/components/admin/CalendarAssistant.vue
@@ -52,9 +52,9 @@
 import { DayStrModel } from "@/lib/api";
 import { Options, Vue } from "vue-class-component";
 
-import BulmaButton from "./bulma/Button.vue";
-import BulmaDrawer from "./bulma/Drawer.vue";
-import MultiModal from "./calendar/MultiModal.vue";
+import MultiModal from "../MultiModal.vue";
+import BulmaButton from "../bulma/Button.vue";
+import BulmaDrawer from "../bulma/Drawer.vue";
 
 @Options({
   components: {
diff --git a/ui/src/components/ConfigView.vue b/ui/src/components/admin/ConfigView.vue
similarity index 98%
rename from ui/src/components/ConfigView.vue
rename to ui/src/components/admin/ConfigView.vue
index 2171632..bcd618b 100644
--- a/ui/src/components/ConfigView.vue
+++ b/ui/src/components/admin/ConfigView.vue
@@ -129,8 +129,8 @@
 import { ConfigModel, DayStrModel, DoorsSaved } from "@/lib/api";
 import { Options, Vue } from "vue-class-component";
 
-import BulmaDrawer from "./bulma/Drawer.vue";
-import BulmaSecret from "./bulma/Secret.vue";
+import BulmaDrawer from "../bulma/Drawer.vue";
+import BulmaSecret from "../bulma/Secret.vue";
 
 interface Credentials {
   username: string;
diff --git a/ui/src/components/DoorMapEditor.vue b/ui/src/components/admin/DoorMapEditor.vue
similarity index 93%
rename from ui/src/components/DoorMapEditor.vue
rename to ui/src/components/admin/DoorMapEditor.vue
index ba87bb9..30523fb 100644
--- a/ui/src/components/DoorMapEditor.vue
+++ b/ui/src/components/admin/DoorMapEditor.vue
@@ -57,12 +57,12 @@ import { DoorsSaved } from "@/lib/api";
 import { Door } from "@/lib/door";
 import { Options, Vue } from "vue-class-component";
 
-import Calendar from "./Calendar.vue";
-import BulmaBreadcrumbs, { Step } from "./bulma/Breadcrumbs.vue";
-import BulmaButton from "./bulma/Button.vue";
-import BulmaDrawer from "./bulma/Drawer.vue";
-import DoorChooser from "./editor/DoorChooser.vue";
-import DoorPlacer from "./editor/DoorPlacer.vue";
+import Calendar from "../Calendar.vue";
+import BulmaBreadcrumbs, { Step } from "../bulma/Breadcrumbs.vue";
+import BulmaButton from "../bulma/Button.vue";
+import BulmaDrawer from "../bulma/Drawer.vue";
+import DoorChooser from "../editor/DoorChooser.vue";
+import DoorPlacer from "../editor/DoorPlacer.vue";
 
 @Options({
   components: {