diff --git a/client/src/components/cockpit/AssignmentSubmissionProgress.vue b/client/src/components/assignment/AssignmentSubmissionProgress.vue
similarity index 100%
rename from client/src/components/cockpit/AssignmentSubmissionProgress.vue
rename to client/src/components/assignment/AssignmentSubmissionProgress.vue
diff --git a/client/src/components/assignmentEvaluation/EvaluationContainer.vue b/client/src/components/assignment/evaluation/EvaluationContainer.vue
similarity index 95%
rename from client/src/components/assignmentEvaluation/EvaluationContainer.vue
rename to client/src/components/assignment/evaluation/EvaluationContainer.vue
index 48c0b2e6..d2c33323 100644
--- a/client/src/components/assignmentEvaluation/EvaluationContainer.vue
+++ b/client/src/components/assignment/evaluation/EvaluationContainer.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import EvaluationIntro from "@/components/assignmentEvaluation/EvaluationIntro.vue";
-import EvaluationSummary from "@/components/assignmentEvaluation/EvaluationSummary.vue";
-import EvaluationTask from "@/components/assignmentEvaluation/EvaluationTask.vue";
+import EvaluationIntro from "@/components/assignment/evaluation/EvaluationIntro.vue";
+import EvaluationSummary from "@/components/assignment/evaluation/EvaluationSummary.vue";
+import EvaluationTask from "@/components/assignment/evaluation/EvaluationTask.vue";
 import type {
   Assignment,
   AssignmentCompletion,
diff --git a/client/src/components/assignmentEvaluation/EvaluationIntro.vue b/client/src/components/assignment/evaluation/EvaluationIntro.vue
similarity index 100%
rename from client/src/components/assignmentEvaluation/EvaluationIntro.vue
rename to client/src/components/assignment/evaluation/EvaluationIntro.vue
diff --git a/client/src/components/assignmentEvaluation/EvaluationSummary.vue b/client/src/components/assignment/evaluation/EvaluationSummary.vue
similarity index 100%
rename from client/src/components/assignmentEvaluation/EvaluationSummary.vue
rename to client/src/components/assignment/evaluation/EvaluationSummary.vue
diff --git a/client/src/components/assignmentEvaluation/EvaluationTask.vue b/client/src/components/assignment/evaluation/EvaluationTask.vue
similarity index 100%
rename from client/src/components/assignmentEvaluation/EvaluationTask.vue
rename to client/src/components/assignment/evaluation/EvaluationTask.vue
diff --git a/client/src/components/cockpit/SubmissionsOverview.vue b/client/src/components/cockpit/SubmissionsOverview.vue
index 3a49ebe9..a4f894fd 100644
--- a/client/src/components/cockpit/SubmissionsOverview.vue
+++ b/client/src/components/cockpit/SubmissionsOverview.vue
@@ -1,6 +1,6 @@
 2
 <script setup lang="ts">
-import AssignmentSubmissionProgress from "@/components/cockpit/AssignmentSubmissionProgress.vue";
+import AssignmentSubmissionProgress from "@/components/assignment/AssignmentSubmissionProgress.vue";
 import type {
   CourseSession,
   LearningContent,
@@ -10,7 +10,7 @@ import type {
 import log from "loglevel";
 import { computed } from "vue";
 import { useTranslation } from "i18next-vue";
-import FeedbackSubmissionProgress from "@/components/learningMentor/FeedbackSubmissionProgress.vue";
+import FeedbackSubmissionProgress from "@/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue";
 import { learningContentTypeData } from "@/utils/typeMaps";
 import {
   useCourseDataWithCompletion,
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 03f405ce..a5363b4a 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -18,7 +18,6 @@ import CoursePreviewBar from "@/components/header/CoursePreviewBar.vue";
 import {
   getCockpitUrl,
   getCompetenceNaviUrl,
-  getLearningMentorManagementUrl,
   getLearningMentorUrl,
   getLearningPathUrl,
   getMediaCenterUrl,
@@ -110,26 +109,6 @@ const hasNotificationsMenu = computed(() => {
   return userStore.loggedIn;
 });
 
-// FIXME: Will be removed -> WIP
-const hasDeprecatedLearningMentor = computed(() => {
-  if (!inCourse()) {
-    return false;
-  }
-
-  if (!courseSessionsStore.currentCourseSession) {
-    return false;
-  }
-
-  const courseSession = courseSessionsStore.currentCourseSession;
-  const course = courseSession.course;
-
-  if (!course.configuration.enable_learning_mentor) {
-    return false;
-  }
-
-  return courseSession.actions.includes("deprecated-mentor");
-});
-
 const hasLearningMentor = computed(() => {
   if (!inCourse()) {
     return false;
@@ -275,19 +254,6 @@ const hasLearningMentor = computed(() => {
                     {{ t("competences.title") }}
                   </router-link>
 
-                  <router-link
-                    v-if="hasDeprecatedLearningMentor"
-                    data-cy="navigation-learning-mentor-link"
-                    :to="
-                      getLearningMentorManagementUrl(
-                        courseSessionsStore.currentCourseSession.course.slug
-                      )
-                    "
-                    class="nav-item"
-                    :class="{ 'nav-item--active': inLearningMentor() }"
-                  >
-                    {{ t("a.Lernbegleitung") }}🗑️
-                  </router-link>
                   <router-link
                     v-if="hasLearningMentor"
                     data-cy="navigation-learning-mentor-link"
diff --git a/client/src/components/mentor/NoMentorInformationPanel.vue b/client/src/components/learningMentor/NoMentorInformationPanel.vue
similarity index 94%
rename from client/src/components/mentor/NoMentorInformationPanel.vue
rename to client/src/components/learningMentor/NoMentorInformationPanel.vue
index d6170bc3..e7d41789 100644
--- a/client/src/components/mentor/NoMentorInformationPanel.vue
+++ b/client/src/components/learningMentor/NoMentorInformationPanel.vue
@@ -17,7 +17,7 @@ const currentCourseSession = useCurrentCourseSession();
       </div>
       <router-link
         :to="{
-          name: 'learningMentorManagement',
+          name: 'learningMentor',
           params: { courseSlug: currentCourseSession.course.slug },
         }"
         class="btn-blue px-4 py-2 font-bold"
diff --git a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
index 4bf13f1d..b217bd18 100644
--- a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
+++ b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
@@ -13,7 +13,7 @@ import { UPSERT_ASSIGNMENT_COMPLETION_MUTATION } from "@/graphql/mutations";
 import type { Assignment } from "@/types";
 import DateEmbedding from "@/components/dueDates/DateEmbedding.vue";
 import { useMyLearningMentors } from "@/composables";
-import NoMentorInformationPanel from "@/components/mentor/NoMentorInformationPanel.vue";
+import NoMentorInformationPanel from "@/components/learningMentor/NoMentorInformationPanel.vue";
 
 const props = defineProps<{
   submissionDeadlineStart?: string | null;
diff --git a/client/src/components/learningMentor/FeedbackSubmissionProgress.vue b/client/src/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue
similarity index 100%
rename from client/src/components/learningMentor/FeedbackSubmissionProgress.vue
rename to client/src/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue
diff --git a/client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue b/client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue
index 1b626833..886d5797 100644
--- a/client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue
+++ b/client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useCurrentCourseSession } from "@/composables";
 import { ASSIGNMENT_COMPLETION_QUERY } from "@/graphql/queries";
-import EvaluationContainer from "@/components/assignmentEvaluation/EvaluationContainer.vue";
+import EvaluationContainer from "@/components/assignment/evaluation/EvaluationContainer.vue";
 import AssignmentSubmissionResponses from "@/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionResponses.vue";
 import type { Assignment, AssignmentCompletion, CourseSessionUser } from "@/types";
 import { useQuery } from "@urql/vue";
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index cdb64aec..b988ff51 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -11,7 +11,7 @@ import type {
 } from "@/types";
 import log from "loglevel";
 import { computed, onMounted, reactive } from "vue";
-import AssignmentSubmissionProgress from "@/components/cockpit/AssignmentSubmissionProgress.vue";
+import AssignmentSubmissionProgress from "@/components/assignment/AssignmentSubmissionProgress.vue";
 import { useCourseSessionDetailQuery } from "@/composables";
 import { formatDueDate } from "../../../components/dueDates/dueDatesUtils";
 import { stringifyParse } from "@/utils/utils";
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index c5a934b3..80e7d4ba 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -19,7 +19,7 @@ import * as log from "loglevel";
 import { computed, onMounted, ref, watchEffect } from "vue";
 import { useTranslation } from "i18next-vue";
 import { learningContentTypeData } from "@/utils/typeMaps";
-import EvaluationSummary from "@/components/assignmentEvaluation/EvaluationSummary.vue";
+import EvaluationSummary from "@/components/assignment/evaluation/EvaluationSummary.vue";
 import { bustItGetCache } from "@/fetchHelpers";
 
 const { t } = useTranslation();
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
index 29902dc7..615638b0 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
@@ -3,7 +3,7 @@ import type { LearningUnit, LearningUnitPerformanceCriteria } from "@/types";
 import { useMyLearningMentors } from "@/composables";
 import { computed, ref } from "vue";
 import ItButton from "@/components/ui/ItButton.vue";
-import NoMentorInformationPanel from "@/components/mentor/NoMentorInformationPanel.vue";
+import NoMentorInformationPanel from "@/components/learningMentor/NoMentorInformationPanel.vue";
 import { useSelfEvaluationFeedback } from "@/services/selfEvaluationFeedback";
 import FeedbackRequestedInformationPanel from "@/components/selfEvaluationFeedback/FeedbackRequestedInformationPanel.vue";
 import FeedbackReceived from "@/components/selfEvaluationFeedback/FeedbackReceived.vue";
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index abe6b431..23ad1a17 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -140,12 +140,6 @@ const router = createRouter({
         import("../pages/learningPath/learningContentPage/LearningContentPage.vue"),
       props: true,
     },
-    {
-      path: "/course/:courseSlug/mentor",
-      component: () => import("@/pages/learningMentor/MentorManagementPage.vue"),
-      props: true,
-      name: "learningMentorManagement",
-    },
     {
       path: "/lernbegleitung/:courseId/invitation/:invitationId",
       component: () => import("@/pages/learningMentor/InvitationAcceptPage.vue"),
diff --git a/client/src/utils/utils.ts b/client/src/utils/utils.ts
index de32b6ea..2892cf6d 100644
--- a/client/src/utils/utils.ts
+++ b/client/src/utils/utils.ts
@@ -37,10 +37,6 @@ export function getCockpitUrl(courseSlug: string | undefined): string {
   return createCourseUrl(courseSlug, "cockpit");
 }
 
-export function getLearningMentorManagementUrl(courseSlug: string | undefined): string {
-  return createCourseUrl(courseSlug, "mentor");
-}
-
 export function getAssignmentTypeTitle(assignmentType: AssignmentType): string {
   const { t } = useTranslation();