diff --git a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx
index f2bd7c06..2daca32a 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx
@@ -9,12 +9,11 @@ import { initialData, initialData2 } from "@components/Pages/CourseEdit/Draggabl
 import Chapter from "@components/Pages/CourseEdit/Draggables/Chapter";
 import { createChapter, deleteChapter, getCourseChaptersMetadata, updateChaptersMetadata } from "@services/courses/chapters";
 import { useRouter } from "next/navigation";
-import NewChapterModal from "@components/Pages/CourseEdit/NewChapter";
-import NewActivityModal from "@components/Pages/CourseEdit/NewActivity";
+import NewChapterModal from "@components/Modals/Chapters/NewChapter";
+import NewActivityModal from "@components/Modals/Activities/Create/NewActivity";
 import { createActivity, createFileActivity } from "@services/courses/activities";
 import { getOrganizationContextInfo } from "@services/organizations/orgs";
 import Modal from "@components/UI/Modal/Modal";
-import AuthProvider from "@components/Security/AuthProvider";
 import { denyAccessToUser } from "@services/utils/react/middlewares/views";
 
 function CourseEdit(params: any) {
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx
index 68b17623..3b95ae01 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx
@@ -10,7 +10,7 @@ import useSWR, { mutate } from "swr";
 import { swrFetcher } from "@services/utils/ts/requests";
 import { Edit2, Trash } from "lucide-react";
 import Modal from "@components/UI/Modal/Modal";
-import CreateCourseModal from "@components/Pages/CreateCourse/CreateCourse";
+import CreateCourseModal from "@components/Modals/Course/Create/CreateCourse";
 
 const CoursesIndexPage = (params: any) => {
   const router = useRouter();
diff --git a/front/components/Pages/CourseEdit/NewActivity.tsx b/front/components/Modals/Activities/Create/NewActivity.tsx
similarity index 100%
rename from front/components/Pages/CourseEdit/NewActivity.tsx
rename to front/components/Modals/Activities/Create/NewActivity.tsx
diff --git a/front/components/Pages/CourseEdit/NewActivityModal/DynamicCanva.tsx b/front/components/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx
similarity index 100%
rename from front/components/Pages/CourseEdit/NewActivityModal/DynamicCanva.tsx
rename to front/components/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx
diff --git a/front/components/Pages/CourseEdit/NewActivityModal/Video.tsx b/front/components/Modals/Activities/Create/NewActivityModal/Video.tsx
similarity index 100%
rename from front/components/Pages/CourseEdit/NewActivityModal/Video.tsx
rename to front/components/Modals/Activities/Create/NewActivityModal/Video.tsx
diff --git a/front/components/Pages/CourseEdit/NewChapter.tsx b/front/components/Modals/Chapters/NewChapter.tsx
similarity index 99%
rename from front/components/Pages/CourseEdit/NewChapter.tsx
rename to front/components/Modals/Chapters/NewChapter.tsx
index 6a73fa98..6f6c0cfa 100644
--- a/front/components/Pages/CourseEdit/NewChapter.tsx
+++ b/front/components/Modals/Chapters/NewChapter.tsx
@@ -26,7 +26,6 @@ function NewChapterModal({ submitChapter, closeModal }: any) {
   };
 
   return (
-
     <FormLayout onSubmit={handleSubmit}>
       <FormField name="chapter-name">
         <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
diff --git a/front/components/Pages/CreateCourse/CreateCourse.tsx b/front/components/Modals/Course/Create/CreateCourse.tsx
similarity index 100%
rename from front/components/Pages/CreateCourse/CreateCourse.tsx
rename to front/components/Modals/Course/Create/CreateCourse.tsx