diff --git a/dashboard/src/components/Index.vue b/dashboard/src/Index.vue
similarity index 85%
rename from dashboard/src/components/Index.vue
rename to dashboard/src/Index.vue
index 2a962a12f..a8c0e1891 100644
--- a/dashboard/src/components/Index.vue
+++ b/dashboard/src/Index.vue
@@ -2,15 +2,15 @@
 
 import { Notification } from 'pankow';
 
-import AppsView from './AppsView.vue';
-import AppstoreView from './AppstoreView.vue';
-import ProfileView from './ProfileView.vue';
-import ServicesView from '../views/ServicesView.vue';
-import SupportView from './SupportView.vue';
-import UserDirectoryView from './UserDirectoryView.vue';
-import VolumesView from './VolumesView.vue';
+import AppsView from './views/AppsView.vue';
+import AppstoreView from './views/AppstoreView.vue';
+import ProfileView from './views/ProfileView.vue';
+import ServicesView from './views/ServicesView.vue';
+import SupportView from './views/SupportView.vue';
+import UserDirectoryView from './views/UserDirectoryView.vue';
+import VolumesView from './views/VolumesView.vue';
 
-import ProfileModel from '../models/ProfileModel.js';
+import ProfileModel from './models/ProfileModel.js';
 
 const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
 
diff --git a/dashboard/src/index.js b/dashboard/src/index.js
index 5cb6bbec9..e5b71abec 100644
--- a/dashboard/src/index.js
+++ b/dashboard/src/index.js
@@ -5,7 +5,7 @@ import '@fontsource/noto-sans';
 import { tooltip, fallbackImage } from 'pankow';
 
 import i18n from './i18n.js';
-import Index from './components/Index.vue';
+import Index from './Index.vue';
 
 import './style.css';
 
diff --git a/dashboard/src/components/AppsView.vue b/dashboard/src/views/AppsView.vue
similarity index 99%
rename from dashboard/src/components/AppsView.vue
rename to dashboard/src/views/AppsView.vue
index 14337eda7..17a23aad1 100644
--- a/dashboard/src/components/AppsView.vue
+++ b/dashboard/src/views/AppsView.vue
@@ -6,7 +6,7 @@ import { APP_TYPES, HSTATES, ISTATES, RSTATES } from '../constants.js';
 import AppsModel from '../models/AppsModel.js';
 import ApplinksModel from '../models/ApplinksModel.js';
 import DomainsModel from '../models/DomainsModel.js';
-import ApplinkDialog from './ApplinkDialog.vue';
+import ApplinkDialog from '../components/ApplinkDialog.vue';
 
 const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
 const accessToken = localStorage.token;
diff --git a/dashboard/src/components/AppstoreView.vue b/dashboard/src/views/AppstoreView.vue
similarity index 97%
rename from dashboard/src/components/AppstoreView.vue
rename to dashboard/src/views/AppstoreView.vue
index a3a4c5ac1..8ff7bafe5 100644
--- a/dashboard/src/components/AppstoreView.vue
+++ b/dashboard/src/views/AppstoreView.vue
@@ -3,8 +3,8 @@
 import { ref, computed, useTemplateRef, onMounted } from 'vue';
 import { Button, ButtonGroup, TextInput } from 'pankow';
 import AppstoreModel from '../models/AppstoreModel.js';
-import AppInstallDialog from './AppInstallDialog.vue';
-import ApplinkDialog from './ApplinkDialog.vue';
+import AppInstallDialog from '../components/AppInstallDialog.vue';
+import ApplinkDialog from '../components/ApplinkDialog.vue';
 import { PROXY_APP_ID } from '../constants.js';
 
 const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
diff --git a/dashboard/src/components/ProfileView.vue b/dashboard/src/views/ProfileView.vue
similarity index 98%
rename from dashboard/src/components/ProfileView.vue
rename to dashboard/src/views/ProfileView.vue
index 5563c39c9..cfe4498cc 100644
--- a/dashboard/src/components/ProfileView.vue
+++ b/dashboard/src/views/ProfileView.vue
@@ -9,9 +9,9 @@ const t = i18n.t;
 import { ref, onMounted, useTemplateRef } from 'vue';
 import { Button, Dropdown, Dialog, InputDialog, TextInput } from 'pankow';
 import { TOKEN_TYPES } from '../constants.js';
-import AppPasswords from './AppPasswords.vue';
-import Section from './Section.vue';
-import ApiTokens from './ApiTokens.vue';
+import AppPasswords from '../components/AppPasswords.vue';
+import Section from '../components/Section.vue';
+import ApiTokens from '../components/ApiTokens.vue';
 
 import ProfileModel from '../models/ProfileModel.js';
 import CloudronModel from '../models/CloudronModel.js';
diff --git a/dashboard/src/components/SupportView.vue b/dashboard/src/views/SupportView.vue
similarity index 97%
rename from dashboard/src/components/SupportView.vue
rename to dashboard/src/views/SupportView.vue
index ca95607a3..1644f6b26 100644
--- a/dashboard/src/components/SupportView.vue
+++ b/dashboard/src/views/SupportView.vue
@@ -3,7 +3,7 @@
 import { fetcher, Button } from 'pankow';
 import { marked } from 'marked';
 
-import Section from  './Section.vue';
+import Section from  '../components/Section.vue';
 
 const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
 const accessToken = localStorage.token;
diff --git a/dashboard/src/components/UserDirectoryView.vue b/dashboard/src/views/UserDirectoryView.vue
similarity index 89%
rename from dashboard/src/components/UserDirectoryView.vue
rename to dashboard/src/views/UserDirectoryView.vue
index 03446206b..5a47cc8a9 100644
--- a/dashboard/src/components/UserDirectoryView.vue
+++ b/dashboard/src/views/UserDirectoryView.vue
@@ -4,10 +4,10 @@ const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_OR
 
 import { ref, onMounted } from 'vue';
 import { Button, Checkbox } from 'pankow';
-import Section from './Section.vue';
-import ExternalLdap from './ExternalLdap.vue';
-import ExposedLdap from './ExposedLdap.vue';
-import OpenIdClients from './OpenIdClients.vue';
+import Section from '../components/Section.vue';
+import ExternalLdap from '../components/ExternalLdap.vue';
+import ExposedLdap from '../components/ExposedLdap.vue';
+import OpenIdClients from '../components/OpenIdClients.vue';
 import UserDirectoryModel from '../models/UserDirectoryModel.js';
 
 const userDirectoryModel = UserDirectoryModel.create(API_ORIGIN, localStorage.token);
diff --git a/dashboard/src/components/VolumesView.vue b/dashboard/src/views/VolumesView.vue
similarity index 99%
rename from dashboard/src/components/VolumesView.vue
rename to dashboard/src/views/VolumesView.vue
index b84897078..7abb6f599 100644
--- a/dashboard/src/components/VolumesView.vue
+++ b/dashboard/src/views/VolumesView.vue
@@ -2,7 +2,7 @@
 
 import { Button, ButtonGroup, Checkbox, Dialog, Dropdown, FormGroup, InputDialog, NumberInput, PasswordInput, TableView, TextInput } from 'pankow';
 
-import Section from  './Section.vue';
+import Section from  '../components/Section.vue';
 
 import { createVolumesModel } from '../models/VolumesModel.js';