diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 162dc5dd..81175468 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -156,7 +156,7 @@ import Photo from "./frame/Photo.vue";
 import Tag from "./frame/Tag.vue";
 import ScrollerManager from "./ScrollerManager.vue";
 import SelectionManager from "./SelectionManager.vue";
-import Viewer from "./Viewer.vue";
+import Viewer from "./viewer/Viewer.vue";
 import OnThisDay from "./top-matter/OnThisDay.vue";
 import TopMatter from "./top-matter/TopMatter.vue";
 
diff --git a/src/components/ImageEditor.vue b/src/components/viewer/ImageEditor.vue
similarity index 99%
rename from src/components/ImageEditor.vue
rename to src/components/viewer/ImageEditor.vue
index 2c95e16f..050dd727 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/viewer/ImageEditor.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import { Component, Prop, Mixins } from "vue-property-decorator";
-import GlobalMixin from "../mixins/GlobalMixin";
+import GlobalMixin from "../../mixins/GlobalMixin";
 
 import { basename, dirname, extname, join } from "path";
 import { emit } from "@nextcloud/event-bus";
@@ -20,7 +20,7 @@ import { FilerobotImageEditorConfig } from "react-filerobot-image-editor";
 
 import translations from "./ImageEditorTranslations";
 
-import { API } from "../services/API";
+import { API } from "../../services/API";
 
 let TABS, TOOLS: any;
 type FilerobotImageEditor = import("filerobot-image-editor").default;
diff --git a/src/components/ImageEditorTranslations.ts b/src/components/viewer/ImageEditorTranslations.ts
similarity index 100%
rename from src/components/ImageEditorTranslations.ts
rename to src/components/viewer/ImageEditorTranslations.ts
diff --git a/src/components/PsLivePhoto.ts b/src/components/viewer/PsLivePhoto.ts
similarity index 97%
rename from src/components/PsLivePhoto.ts
rename to src/components/viewer/PsLivePhoto.ts
index 5ada6090..414d7395 100644
--- a/src/components/PsLivePhoto.ts
+++ b/src/components/viewer/PsLivePhoto.ts
@@ -1,5 +1,5 @@
 import PhotoSwipe from "photoswipe";
-import * as utils from "../services/Utils";
+import * as utils from "../../services/Utils";
 
 function isLiveContent(content): boolean {
   return Boolean(content?.data?.photo?.liveid);
diff --git a/src/components/PsVideo.ts b/src/components/viewer/PsVideo.ts
similarity index 99%
rename from src/components/PsVideo.ts
rename to src/components/viewer/PsVideo.ts
index 186aaac5..bf522f03 100644
--- a/src/components/PsVideo.ts
+++ b/src/components/viewer/PsVideo.ts
@@ -4,8 +4,9 @@ import axios from "@nextcloud/axios";
 import { showError } from "@nextcloud/dialogs";
 import { translate as t } from "@nextcloud/l10n";
 import { getCurrentUser } from "@nextcloud/auth";
-import { API } from "../services/API";
-import { IPhoto } from "../types";
+
+import { API } from "../../services/API";
+import { IPhoto } from "../../types";
 
 const config_noTranscode = loadState(
   "memories",
@@ -133,7 +134,7 @@ class VideoContentSetup {
 
     // Load videojs scripts
     if (!globalThis.vidjs) {
-      await import("../services/videojs");
+      await import("../../services/videojs");
     }
 
     // Create video element
diff --git a/src/components/Viewer.vue b/src/components/viewer/Viewer.vue
similarity index 98%
rename from src/components/Viewer.vue
rename to src/components/viewer/Viewer.vue
index 44748b9e..cbeedd69 100644
--- a/src/components/Viewer.vue
+++ b/src/components/viewer/Viewer.vue
@@ -148,9 +148,9 @@
 
 <script lang="ts">
 import { Component, Emit, Mixins } from "vue-property-decorator";
-import GlobalMixin from "../mixins/GlobalMixin";
+import GlobalMixin from "../../mixins/GlobalMixin";
 
-import { IDay, IPhoto, IRow, IRowType } from "../types";
+import { IDay, IPhoto, IRow, IRowType } from "../../types";
 
 import NcActions from "@nextcloud/vue/dist/Components/NcActions";
 import NcActionButton from "@nextcloud/vue/dist/Components/NcActionButton";
@@ -158,10 +158,10 @@ import { subscribe, unsubscribe } from "@nextcloud/event-bus";
 import { showError } from "@nextcloud/dialogs";
 import axios from "@nextcloud/axios";
 
-import * as dav from "../services/DavRequests";
-import * as utils from "../services/Utils";
-import { getPreviewUrl } from "../services/FileUtils";
-import { getDownloadLink } from "../services/DavRequests";
+import * as dav from "../../services/DavRequests";
+import * as utils from "../../services/Utils";
+import { getPreviewUrl } from "../../services/FileUtils";
+import { getDownloadLink } from "../../services/DavRequests";
 
 import ImageEditor from "./ImageEditor.vue";
 
@@ -180,7 +180,7 @@ import InfoIcon from "vue-material-design-icons/InformationOutline.vue";
 import OpenInNewIcon from "vue-material-design-icons/OpenInNew.vue";
 import TuneIcon from "vue-material-design-icons/Tune.vue";
 import SlideshowIcon from "vue-material-design-icons/PlayBox.vue";
-import { API } from "../services/API";
+import { API } from "../../services/API";
 
 const SLIDESHOW_MS = 5000;