diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index c2bb95e..cd7f2e0 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -1,17 +1,17 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
 import Home from "../views/Home.vue";
-import missing from "../views/missing.vue";
-import TimeRecords from "../views/TimeRecords.vue";
+import missing from "../views/Missing.vue";
+import TimeRecords from "../views/timerecords/TimeRecords.vue";
 import About from "../views/About.vue";
 import StatisticOverview from "../views/statistics/StatisticOverview.vue";
-import Users from "../views/Users.vue";
-import EditUser from "../views/EditUser.vue";
-import TimeTrackAccounts from "../views/TimeTrackAccounts.vue";
-import EditTimeTrackAccount from "../views/EditTimeTrackAccount.vue"
-import CreateTimeTrackAccount from "../views/CreateTimeTrackAccount.vue"
-import EditTimerecord from "../views/EditTimerecord.vue"
-import CreateTimerecord from "../views/CreateTimerecord.vue"
+import Users from "../views/admin/Users.vue";
+import EditUser from "../views/admin/EditUser.vue";
+import TimeTrackAccounts from "../views/timetrackaccounts/TimeTrackAccounts.vue";
+import EditTimeTrackAccount from "../views/timetrackaccounts/EditTimeTrackAccount.vue"
+import CreateTimeTrackAccount from "../views/timetrackaccounts/CreateTimeTrackAccount.vue"
+import EditTimerecord from "../views/timerecords/EditTimerecord.vue"
+import CreateTimerecord from "../views/timerecords/CreateTimerecord.vue"
 
 Vue.use(VueRouter);
 
diff --git a/frontend/src/views/missing.vue b/frontend/src/views/Missing.vue
similarity index 100%
rename from frontend/src/views/missing.vue
rename to frontend/src/views/Missing.vue
diff --git a/frontend/src/views/EditUser.vue b/frontend/src/views/admin/EditUser.vue
similarity index 99%
rename from frontend/src/views/EditUser.vue
rename to frontend/src/views/admin/EditUser.vue
index 972e176..90e57ee 100644
--- a/frontend/src/views/EditUser.vue
+++ b/frontend/src/views/admin/EditUser.vue
@@ -71,7 +71,7 @@
   </v-container>
 </template>
 <script>
-  import {BASE_URI} from "../globals";
+  import {BASE_URI} from "../../globals";
 
   export default {
     name: "Edituser",
diff --git a/frontend/src/views/Users.vue b/frontend/src/views/admin/Users.vue
similarity index 98%
rename from frontend/src/views/Users.vue
rename to frontend/src/views/admin/Users.vue
index 0b98f34..0a918e2 100644
--- a/frontend/src/views/Users.vue
+++ b/frontend/src/views/admin/Users.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-  import {BASE_URI} from "../globals.js";
+  import {BASE_URI} from "../../globals.js";
   import UsersItems from "./UsersItems.vue";
 
   export default {
diff --git a/frontend/src/views/UsersItems.vue b/frontend/src/views/admin/UsersItems.vue
similarity index 100%
rename from frontend/src/views/UsersItems.vue
rename to frontend/src/views/admin/UsersItems.vue
diff --git a/frontend/src/views/CreateTimerecord.vue b/frontend/src/views/timerecords/CreateTimerecord.vue
similarity index 99%
rename from frontend/src/views/CreateTimerecord.vue
rename to frontend/src/views/timerecords/CreateTimerecord.vue
index d938198..86b05fa 100644
--- a/frontend/src/views/CreateTimerecord.vue
+++ b/frontend/src/views/timerecords/CreateTimerecord.vue
@@ -70,7 +70,7 @@
   </v-container>
 </template>
 <script>
-  import {BASE_URI} from "../globals";
+  import {BASE_URI} from "../../globals";
   import axios from "axios"
 
   export default {
diff --git a/frontend/src/views/EditTimerecord.vue b/frontend/src/views/timerecords/EditTimerecord.vue
similarity index 100%
rename from frontend/src/views/EditTimerecord.vue
rename to frontend/src/views/timerecords/EditTimerecord.vue
diff --git a/frontend/src/views/TimeRecordItem.vue b/frontend/src/views/timerecords/TimeRecordItem.vue
similarity index 100%
rename from frontend/src/views/TimeRecordItem.vue
rename to frontend/src/views/timerecords/TimeRecordItem.vue
diff --git a/frontend/src/views/TimeRecords.vue b/frontend/src/views/timerecords/TimeRecords.vue
similarity index 98%
rename from frontend/src/views/TimeRecords.vue
rename to frontend/src/views/timerecords/TimeRecords.vue
index edcaa53..8e3b652 100644
--- a/frontend/src/views/TimeRecords.vue
+++ b/frontend/src/views/timerecords/TimeRecords.vue
@@ -35,7 +35,7 @@
 
 <script>
   import TimeRecordItem from "./TimeRecordItem.vue";
-  import {BASE_URI} from "../globals.js";
+  import {BASE_URI} from "../../globals.js";
 
   export default {
     name: "TimeRecords",
diff --git a/frontend/src/views/CreateTimeTrackAccount.vue b/frontend/src/views/timetrackaccounts/CreateTimeTrackAccount.vue
similarity index 97%
rename from frontend/src/views/CreateTimeTrackAccount.vue
rename to frontend/src/views/timetrackaccounts/CreateTimeTrackAccount.vue
index 98da733..fc3bcc0 100644
--- a/frontend/src/views/CreateTimeTrackAccount.vue
+++ b/frontend/src/views/timetrackaccounts/CreateTimeTrackAccount.vue
@@ -35,7 +35,7 @@
   </v-container>
 </template>
 <script>
-  import {BASE_URI} from "../globals"
+  import {BASE_URI} from "../../globals"
   import axios from "axios"
 
   export default {
diff --git a/frontend/src/views/EditTimeTrackAccount.vue b/frontend/src/views/timetrackaccounts/EditTimeTrackAccount.vue
similarity index 100%
rename from frontend/src/views/EditTimeTrackAccount.vue
rename to frontend/src/views/timetrackaccounts/EditTimeTrackAccount.vue
diff --git a/frontend/src/views/TimeTrackAccountItem.vue b/frontend/src/views/timetrackaccounts/TimeTrackAccountItem.vue
similarity index 100%
rename from frontend/src/views/TimeTrackAccountItem.vue
rename to frontend/src/views/timetrackaccounts/TimeTrackAccountItem.vue
diff --git a/frontend/src/views/TimeTrackAccounts.vue b/frontend/src/views/timetrackaccounts/TimeTrackAccounts.vue
similarity index 98%
rename from frontend/src/views/TimeTrackAccounts.vue
rename to frontend/src/views/timetrackaccounts/TimeTrackAccounts.vue
index d2a0715..f0ddf36 100644
--- a/frontend/src/views/TimeTrackAccounts.vue
+++ b/frontend/src/views/timetrackaccounts/TimeTrackAccounts.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-  import {BASE_URI} from "../globals.js";
+  import {BASE_URI} from "../../globals.js";
   import TimeTrackAccountItem from "./TimeTrackAccountItem.vue";
 
   export default {