diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index a55c07d..f4ffa66 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -16,17 +16,17 @@
 
 import { createRouter, createWebHistory } from "vue-router";
 
-const Faq = () => import("../components/FaqPage.vue");
-const AdditionalModules = () => import("../view/AdditionalModules.vue");
-const CalendarLink = () => import("../components/CalendarLink.vue");
-const RenameModules = () => import("../components/RenameModules.vue");
-const RoomFinder = () => import("../view/RoomFinder.vue");
-const EditCalendarView = () => import("../view/EditCalendarView.vue");
-const EditAdditionalModules = () =>
-  import("../view/editCalendar/EditAdditionalModules.vue");
-const EditModules = () => import("../view/editCalendar/EditModules.vue");
 const CourseSelection = () => import("../view/CourseSelection.vue");
-const FreeRooms = () => import("../view/FreeRooms.vue");
+const AdditionalModules = () => import("../view/create/AdditionalModules.vue");
+const CalendarLink = () => import("../view/CalendarLink.vue");
+const RenameModules = () => import("../view/create/RenameModules.vue");
+const RoomFinder = () => import("../view/rooms/RoomFinder.vue");
+const FreeRooms = () => import("../view/rooms/FreeRooms.vue");
+const EditCalendarView = () => import("../view/edit/EditCalendar.vue");
+const EditAdditionalModules = () =>
+  import("../view/edit/EditAdditionalModules.vue");
+const EditModules = () => import("../view/edit/EditModules.vue");
+const Faq = () => import("../view/Faq.vue");
 
 import i18n from "../i18n";
 
@@ -108,11 +108,7 @@ const router = createRouter({
     {
       path: "/privacy-policy",
       name: "privacy-policy",
-      component: Faq,
-      beforeEnter() {
-        window.location.href =
-          "https://www.htwk-leipzig.de/hochschule/kontakt/datenschutzerklaerung/";
-      },
+      redirect: "https://www.htwk-leipzig.de/hochschule/kontakt/datenschutzerklaerung/",
       meta: {
         label: "privacy"
       }
@@ -120,11 +116,7 @@ const router = createRouter({
     {
       path: "/imprint",
       name: "imprint",
-      component: Faq,
-      beforeEnter() {
-        window.location.href =
-          "https://www.htwk-leipzig.de/hochschule/kontakt/impressum/";
-      },
+      redirect: "https://www.htwk-leipzig.de/hochschule/kontakt/impressum/",
       meta: {
         label: "imprint"
       }
diff --git a/frontend/src/components/CalendarLink.vue b/frontend/src/view/CalendarLink.vue
similarity index 97%
rename from frontend/src/components/CalendarLink.vue
rename to frontend/src/view/CalendarLink.vue
index f14adbe..ac66469 100644
--- a/frontend/src/components/CalendarLink.vue
+++ b/frontend/src/view/CalendarLink.vue
@@ -17,10 +17,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
 <script lang="ts" setup>
-import tokenStore from "../store/tokenStore.ts";
+import tokenStore from "@/store/tokenStore.ts";
 import { useToast } from "primevue/usetoast";
 import { computed, onMounted } from "vue";
-import router from "../router";
+import router from "@/router";
 import { useI18n } from "vue-i18n";
 const { t } = useI18n({ useScope: "global" });
 
diff --git a/frontend/src/view/CourseSelection.vue b/frontend/src/view/CourseSelection.vue
index af8c369..95e6df8 100644
--- a/frontend/src/view/CourseSelection.vue
+++ b/frontend/src/view/CourseSelection.vue
@@ -21,13 +21,13 @@ import { computed, ComputedRef, Ref, ref, watch } from "vue";
 import {
   fetchCourseBySemester,
   fetchModulesByCourseAndSemester,
-} from "../api/fetchCourse";
-import DynamicPage from "./DynamicPage.vue";
-import ModuleSelection from "../components/ModuleSelection.vue";
-import { Module } from "../model/module.ts";
+} from "@/api/fetchCourse";
+import DynamicPage from "@/view/DynamicPage.vue";
+import ModuleSelection from "@/components/ModuleSelection.vue";
+import { Module } from "@/model/module.ts";
 import { useI18n } from "vue-i18n";
-import moduleStore from "../store/moduleStore";
-import router from "../router";
+import moduleStore from "@/store/moduleStore";
+import router from "@/router";
 
 async function getModules() {
   modules.value = await fetchModulesByCourseAndSemester(
diff --git a/frontend/src/components/FaqPage.vue b/frontend/src/view/Faq.vue
similarity index 100%
rename from frontend/src/components/FaqPage.vue
rename to frontend/src/view/Faq.vue
diff --git a/frontend/src/view/AdditionalModules.vue b/frontend/src/view/create/AdditionalModules.vue
similarity index 90%
rename from frontend/src/view/AdditionalModules.vue
rename to frontend/src/view/create/AdditionalModules.vue
index 0848563..1ca45ef 100644
--- a/frontend/src/view/AdditionalModules.vue
+++ b/frontend/src/view/create/AdditionalModules.vue
@@ -17,9 +17,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
 <script lang="ts" setup>
-import moduleStore from "../store/moduleStore";
-import router from "../router";
-import AdditionalModuleTable from "../components/AdditionalModuleTable.vue";
+import moduleStore from "@/store/moduleStore";
+import router from "@/router";
+import AdditionalModuleTable from "@/components/AdditionalModuleTable.vue";
 
 const store = moduleStore();
 
diff --git a/frontend/src/components/RenameModules.vue b/frontend/src/view/create/RenameModules.vue
similarity index 95%
rename from frontend/src/components/RenameModules.vue
rename to frontend/src/view/create/RenameModules.vue
index 671ea24..a230459 100644
--- a/frontend/src/components/RenameModules.vue
+++ b/frontend/src/view/create/RenameModules.vue
@@ -17,13 +17,13 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
 <script setup lang="ts">
-import moduleStore from "../store/moduleStore.ts";
-import { createIndividualFeed } from "../api/createFeed.ts";
-import router from "../router";
-import tokenStore from "../store/tokenStore.ts";
+import moduleStore from "@/store/moduleStore.ts";
+import { createIndividualFeed } from "@/api/createFeed.ts";
+import router from "@/router";
+import tokenStore from "@/store/tokenStore.ts";
 import { Ref, computed, inject, ref, onMounted } from "vue";
-import ModuleTemplateDialog from "./ModuleTemplateDialog.vue";
-import { onlyWhitespace } from "../helpers/strings.ts";
+import ModuleTemplateDialog from "@/components/ModuleTemplateDialog.vue";
+import { onlyWhitespace } from "@/helpers/strings.ts";
 import { useI18n } from "vue-i18n";
 import { Module } from "@/model/module.ts";
 import { useToast } from "primevue/usetoast";
diff --git a/frontend/src/view/editCalendar/EditAdditionalModules.vue b/frontend/src/view/edit/EditAdditionalModules.vue
similarity index 91%
rename from frontend/src/view/editCalendar/EditAdditionalModules.vue
rename to frontend/src/view/edit/EditAdditionalModules.vue
index 849c9fb..f58e786 100644
--- a/frontend/src/view/editCalendar/EditAdditionalModules.vue
+++ b/frontend/src/view/edit/EditAdditionalModules.vue
@@ -18,12 +18,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from "vue";
-import moduleStore from "../../store/moduleStore";
-import router from "../../router";
+import moduleStore from "@/store/moduleStore";
+import router from "@/router";
 
 const store = moduleStore();
 const AdditionalModuleTable = defineAsyncComponent(
-  () => import("../../components/AdditionalModuleTable.vue"),
+  () => import("@/components/AdditionalModuleTable.vue"),
 );
 
 async function nextStep() {
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/edit/EditCalendar.vue
similarity index 91%
rename from frontend/src/view/EditCalendarView.vue
rename to frontend/src/view/edit/EditCalendar.vue
index 8bf44c9..199b17c 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/edit/EditCalendar.vue
@@ -18,14 +18,14 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 <script setup lang="ts">
 import { Ref, ref } from "vue";
-import { Module } from "../model/module";
-import moduleStore from "../store/moduleStore";
-import { getCalender } from "../api/loadCalendar";
-import router from "../router";
-import tokenStore from "../store/tokenStore";
+import { Module } from "@/model/module";
+import moduleStore from "@/store/moduleStore";
+import { getCalender } from "@/api/loadCalendar";
+import router from "@/router";
+import tokenStore from "@/store/tokenStore";
 import { useToast } from "primevue/usetoast";
 import { useI18n } from "vue-i18n";
-import DynamicPage from "./DynamicPage.vue";
+import DynamicPage from "@/view/DynamicPage.vue";
 const { t } = useI18n({ useScope: "global" });
 
 const toast = useToast();
diff --git a/frontend/src/view/editCalendar/EditModules.vue b/frontend/src/view/edit/EditModules.vue
similarity index 97%
rename from frontend/src/view/editCalendar/EditModules.vue
rename to frontend/src/view/edit/EditModules.vue
index 18fc85d..88d2c4d 100644
--- a/frontend/src/view/editCalendar/EditModules.vue
+++ b/frontend/src/view/edit/EditModules.vue
@@ -19,12 +19,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 <script lang="ts" setup>
 import { computed, inject, Ref, ref } from "vue";
 import { Module } from "@/model/module.ts";
-import moduleStore from "../../store/moduleStore";
+import moduleStore from "@/store/moduleStore";
 import { fetchAllModules } from "@/api/fetchCourse.ts";
 import { deleteIndividualFeed, saveIndividualFeed } from "@/api/createFeed.ts";
-import tokenStore from "../../store/tokenStore";
+import tokenStore from "@/store/tokenStore";
 import router from "@/router";
-import ModuleTemplateDialog from "../../components/ModuleTemplateDialog.vue";
+import ModuleTemplateDialog from "@/components/ModuleTemplateDialog.vue";
 import { onlyWhitespace } from "@/helpers/strings.ts";
 import { useI18n } from "vue-i18n";
 import { useToast } from "primevue/usetoast";
diff --git a/frontend/src/view/FreeRooms.vue b/frontend/src/view/rooms/FreeRooms.vue
similarity index 100%
rename from frontend/src/view/FreeRooms.vue
rename to frontend/src/view/rooms/FreeRooms.vue
diff --git a/frontend/src/view/RoomFinder.vue b/frontend/src/view/rooms/RoomFinder.vue
similarity index 94%
rename from frontend/src/view/RoomFinder.vue
rename to frontend/src/view/rooms/RoomFinder.vue
index 0dfd523..b9159d7 100644
--- a/frontend/src/view/RoomFinder.vue
+++ b/frontend/src/view/rooms/RoomFinder.vue
@@ -18,9 +18,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 <script lang="ts" setup>
 import { Ref, computed, ref, watch } from "vue";
-import { fetchRoom } from "../api/fetchRoom.ts";
-import DynamicPage from "./DynamicPage.vue";
-import RoomOccupation from "../components/RoomOccupation.vue";
+import { fetchRoom } from "@/api/fetchRoom.ts";
+import DynamicPage from "@/view/DynamicPage.vue";
+import RoomOccupation from "@/components/RoomOccupation.vue";
 import { computedAsync } from "@vueuse/core";
 import router from "@/router";