diff --git a/frontend/src/dialog/p-album-edit-dialog.vue b/frontend/src/dialog/album/edit.vue
similarity index 100%
rename from frontend/src/dialog/p-album-edit-dialog.vue
rename to frontend/src/dialog/album/edit.vue
diff --git a/frontend/src/dialog/dialogs.js b/frontend/src/dialog/dialogs.js
index 0232a1dae..85cce9040 100644
--- a/frontend/src/dialog/dialogs.js
+++ b/frontend/src/dialog/dialogs.js
@@ -31,15 +31,15 @@ https://docs.photoprism.org/developer-guide/
 import PAccountAddDialog from "./account/add.vue";
 import PAccountRemoveDialog from "./account/remove.vue";
 import PAccountEditDialog from "./account/edit.vue";
-import PPhotoArchiveDialog from "./p-photo-archive-dialog.vue";
-import PPhotoAlbumDialog from "./p-photo-album-dialog.vue";
-import PPhotoEditDialog from "./p-photo-edit-dialog.vue";
-import PAlbumEditDialog from "./p-album-edit-dialog.vue";
+import PPhotoArchiveDialog from "./photo/archive.vue";
+import PPhotoAlbumDialog from "./photo/album.vue";
+import PPhotoEditDialog from "./photo/edit.vue";
+import PAlbumEditDialog from "./album/edit.vue";
 import PAlbumDeleteDialog from "./album/delete.vue";
 import PLabelDeleteDialog from "./label/delete.vue";
-import PUploadDialog from "./p-upload-dialog.vue";
-import PVideoDialog from "./p-video-dialog.vue";
-import PShareDialog from "./p-share-dialog.vue";
+import PUploadDialog from "./upload.vue";
+import PVideoDialog from "./video.vue";
+import PShareDialog from "./share.vue";
 import PShareUploadDialog from "./share/upload.vue";
 
 const dialogs = {};
diff --git a/frontend/src/dialog/p-photo-album-dialog.vue b/frontend/src/dialog/photo/album.vue
similarity index 99%
rename from frontend/src/dialog/p-photo-album-dialog.vue
rename to frontend/src/dialog/photo/album.vue
index f85983393..e855e1a1d 100644
--- a/frontend/src/dialog/p-photo-album-dialog.vue
+++ b/frontend/src/dialog/photo/album.vue
@@ -42,7 +42,7 @@
   </v-dialog>
 </template>
 <script>
-    import Album from "../model/album";
+    import Album from "model/album";
 
     export default {
         name: 'p-photo-album-dialog',
diff --git a/frontend/src/dialog/p-photo-archive-dialog.vue b/frontend/src/dialog/photo/archive.vue
similarity index 100%
rename from frontend/src/dialog/p-photo-archive-dialog.vue
rename to frontend/src/dialog/photo/archive.vue
diff --git a/frontend/src/dialog/p-photo-edit-dialog.vue b/frontend/src/dialog/photo/edit.vue
similarity index 95%
rename from frontend/src/dialog/p-photo-edit-dialog.vue
rename to frontend/src/dialog/photo/edit.vue
index a6f71d81b..bc4d1bef2 100644
--- a/frontend/src/dialog/p-photo-edit-dialog.vue
+++ b/frontend/src/dialog/photo/edit.vue
@@ -68,11 +68,11 @@
   </v-dialog>
 </template>
 <script>
-    import Photo from "../model/photo";
-    import PhotoDetails from "./photo/details.vue";
-    import PhotoLabels from "./photo/labels.vue";
-    import PhotoFiles from "./photo/files.vue";
-    import PhotoInfo from "./photo/info.vue";
+    import Photo from "model/photo";
+    import PhotoDetails from "./details.vue";
+    import PhotoLabels from "./labels.vue";
+    import PhotoFiles from "./files.vue";
+    import PhotoInfo from "./info.vue";
 
     export default {
         name: 'p-photo-edit-dialog',
diff --git a/frontend/src/dialog/p-share-dialog.vue b/frontend/src/dialog/share.vue
similarity index 100%
rename from frontend/src/dialog/p-share-dialog.vue
rename to frontend/src/dialog/share.vue
diff --git a/frontend/src/dialog/p-upload-dialog.vue b/frontend/src/dialog/upload.vue
similarity index 97%
rename from frontend/src/dialog/p-upload-dialog.vue
rename to frontend/src/dialog/upload.vue
index 853968fdc..987320e3b 100644
--- a/frontend/src/dialog/p-upload-dialog.vue
+++ b/frontend/src/dialog/upload.vue
@@ -62,12 +62,12 @@
 
 
             <p class="body-1" v-if="safe">
-              <translate key="nsfw-info">Please don't upload photos containing offensive content. Uploads
+              <translate>Please don't upload photos containing offensive content. Uploads
                 that may contain such images will be rejected automatically.</translate>
             </p>
 
             <p class="body-1" v-if="review">
-              <translate key="review-info">Low-quality photos require a review before they appear in search results.</translate>
+              <translate>Non-photographic and low-quality images require a review before they appear in search results.</translate>
             </p>
 
             <v-btn
diff --git a/frontend/src/dialog/p-video-dialog.vue b/frontend/src/dialog/video.vue
similarity index 100%
rename from frontend/src/dialog/p-video-dialog.vue
rename to frontend/src/dialog/video.vue