diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 9eaaa622..68636767 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -3,20 +3,20 @@ import LoginPage from "@/views/LoginPage.vue";
 import HomePage from "@/views/HomePage.vue";
 import MenuBar from "@/components/MenuBar.vue";
 import StudentHomepage from "@/views/StudentHomepage.vue";
-import StudentAssignments from "@/views/assignment/StudentAssignments.vue";
-import StudentClasses from "@/views/class/StudentClasses.vue";
-import StudentDiscussions from "@/views/discussion/StudentDiscussions.vue";
+import StudentAssignments from "@/views/assignments/StudentAssignments.vue";
+import StudentClasses from "@/views/classes/StudentClasses.vue";
+import StudentDiscussions from "@/views/discussions/StudentDiscussions.vue";
 import TeacherHomepage from "@/views/TeacherHomepage.vue";
-import TeacherAssignments from "@/views/assignment/TeacherAssignments.vue";
-import TeacherClasses from "@/views/class/TeacherClasses.vue";
-import TeacherDiscussions from "@/views/discussion/TeacherDiscussions.vue";
-import SingleAssignment from "@/views/assignment/SingleAssignment.vue";
-import SingleClass from "@/views/class/SingleClass.vue";
-import SingleDiscussion from "@/views/discussion/SingleDiscussion.vue";
+import TeacherAssignments from "@/views/assignments/TeacherAssignments.vue";
+import TeacherClasses from "@/views/classes/TeacherClasses.vue";
+import TeacherDiscussions from "@/views/discussions/TeacherDiscussions.vue";
+import SingleAssignment from "@/views/assignments/SingleAssignment.vue";
+import SingleClass from "@/views/classes/SingleClass.vue";
+import SingleDiscussion from "@/views/discussions/SingleDiscussion.vue";
 import NotFound from "@/components/errors/NotFound.vue";
-import CreateClass from "@/views/class/CreateClass.vue";
-import CreateAssignment from "@/views/assignment/CreateAssignment.vue";
-import CreateDiscussion from "@/views/discussion/CreateDiscussion.vue";
+import CreateClass from "@/views/classes/CreateClass.vue";
+import CreateAssignment from "@/views/assignments/CreateAssignment.vue";
+import CreateDiscussion from "@/views/discussions/CreateDiscussion.vue";
 
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
@@ -27,12 +27,12 @@ const router = createRouter({
             component: HomePage,
         },
         {
-            path: "/:role/login",
+            path: "/login",
             name: "LoginPage",
             component: LoginPage
         },
         {
-            path: "/:role/register",
+            path: "/register",
             name: "RegisterPage",
             component: () => {}
         },
diff --git a/frontend/src/views/LoginPage.vue b/frontend/src/views/LoginPage.vue
index 8bee61b1..85a69bfd 100644
--- a/frontend/src/views/LoginPage.vue
+++ b/frontend/src/views/LoginPage.vue
@@ -1,12 +1,4 @@
 <script setup lang="ts">
-import {useRoute} from 'vue-router';
-
-const route = useRoute();
-const role = route.params.role;
-
-if (role === "student") { /* Empty */
-} else { /* Empty */
-}
 </script>
 
 <template>
diff --git a/frontend/src/views/assignment/CreateAssignment.vue b/frontend/src/views/assignments/CreateAssignment.vue
similarity index 100%
rename from frontend/src/views/assignment/CreateAssignment.vue
rename to frontend/src/views/assignments/CreateAssignment.vue
diff --git a/frontend/src/views/assignment/SingleAssignment.vue b/frontend/src/views/assignments/SingleAssignment.vue
similarity index 100%
rename from frontend/src/views/assignment/SingleAssignment.vue
rename to frontend/src/views/assignments/SingleAssignment.vue
diff --git a/frontend/src/views/assignment/StudentAssignments.vue b/frontend/src/views/assignments/StudentAssignments.vue
similarity index 100%
rename from frontend/src/views/assignment/StudentAssignments.vue
rename to frontend/src/views/assignments/StudentAssignments.vue
diff --git a/frontend/src/views/assignment/TeacherAssignments.vue b/frontend/src/views/assignments/TeacherAssignments.vue
similarity index 100%
rename from frontend/src/views/assignment/TeacherAssignments.vue
rename to frontend/src/views/assignments/TeacherAssignments.vue
diff --git a/frontend/src/views/class/CreateClass.vue b/frontend/src/views/classes/CreateClass.vue
similarity index 100%
rename from frontend/src/views/class/CreateClass.vue
rename to frontend/src/views/classes/CreateClass.vue
diff --git a/frontend/src/views/class/SingleClass.vue b/frontend/src/views/classes/SingleClass.vue
similarity index 100%
rename from frontend/src/views/class/SingleClass.vue
rename to frontend/src/views/classes/SingleClass.vue
diff --git a/frontend/src/views/class/StudentClasses.vue b/frontend/src/views/classes/StudentClasses.vue
similarity index 100%
rename from frontend/src/views/class/StudentClasses.vue
rename to frontend/src/views/classes/StudentClasses.vue
diff --git a/frontend/src/views/class/TeacherClasses.vue b/frontend/src/views/classes/TeacherClasses.vue
similarity index 100%
rename from frontend/src/views/class/TeacherClasses.vue
rename to frontend/src/views/classes/TeacherClasses.vue
diff --git a/frontend/src/views/discussion/CreateDiscussion.vue b/frontend/src/views/discussions/CreateDiscussion.vue
similarity index 100%
rename from frontend/src/views/discussion/CreateDiscussion.vue
rename to frontend/src/views/discussions/CreateDiscussion.vue
diff --git a/frontend/src/views/discussion/SingleDiscussion.vue b/frontend/src/views/discussions/SingleDiscussion.vue
similarity index 100%
rename from frontend/src/views/discussion/SingleDiscussion.vue
rename to frontend/src/views/discussions/SingleDiscussion.vue
diff --git a/frontend/src/views/discussion/StudentDiscussions.vue b/frontend/src/views/discussions/StudentDiscussions.vue
similarity index 100%
rename from frontend/src/views/discussion/StudentDiscussions.vue
rename to frontend/src/views/discussions/StudentDiscussions.vue
diff --git a/frontend/src/views/discussion/TeacherDiscussions.vue b/frontend/src/views/discussions/TeacherDiscussions.vue
similarity index 100%
rename from frontend/src/views/discussion/TeacherDiscussions.vue
rename to frontend/src/views/discussions/TeacherDiscussions.vue