diff --git a/front/app/_orgs/[orgslug]/course/[courseid]/element/[elementid]/page.tsx b/front/app/_orgs/[orgslug]/course/[courseid]/element/[elementid]/page.tsx
index 7ca02e62..267c9051 100644
--- a/front/app/_orgs/[orgslug]/course/[courseid]/element/[elementid]/page.tsx
+++ b/front/app/_orgs/[orgslug]/course/[courseid]/element/[elementid]/page.tsx
@@ -5,7 +5,7 @@ import React, { useMemo } from "react";
 import Layout from "../../../../../../../components/UI/Layout";
 import { getElement } from "../../../../../../../services/courses/elements";
 import { getBackendUrl } from "../../../../../../../services/config";
-import Canva from "../../../../../../../components/Canva/Canva";
+import Canva from "../../../../../../../components/LectureViews/DynamicCanva/DynamicCanva";
 import styled from "styled-components";
 import { getCourse, getCourseMetadata } from "../../../../../../../services/courses/courses";
 
diff --git a/front/app/_orgs/[orgslug]/page.tsx b/front/app/_orgs/[orgslug]/page.tsx
index d9b48d09..5a9611b9 100644
--- a/front/app/_orgs/[orgslug]/page.tsx
+++ b/front/app/_orgs/[orgslug]/page.tsx
@@ -1,8 +1,5 @@
 "use client";
-import { useRouter, useSearchParams, useSelectedLayoutSegment } from "next/navigation";
-import Layout from "../../../components/UI/Layout";
-import { Title } from "../../../components/UI/Elements/Styles/Title";
-import { Header } from "../../../components/UI/Header";
+import { Title } from "@components/UI/Elements/Styles/Title";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
diff --git a/front/components/Canva/Canva.tsx b/front/components/LectureViews/DynamicCanva/DynamicCanva.tsx
similarity index 77%
rename from front/components/Canva/Canva.tsx
rename to front/components/LectureViews/DynamicCanva/DynamicCanva.tsx
index 3d203e6f..f8e66ccf 100644
--- a/front/components/Canva/Canva.tsx
+++ b/front/components/LectureViews/DynamicCanva/DynamicCanva.tsx
@@ -2,12 +2,12 @@ import React from "react";
 import { useEditor, EditorContent } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
 // Custom Extensions
-import InfoCallout from "../Editor/Extensions/Callout/Info/InfoCallout";
-import WarningCallout from "../Editor/Extensions/Callout/Warning/WarningCallout";
-import ImageBlock from "../Editor/Extensions/Image/ImageBlock";
+import InfoCallout from "@editor/Extensions/Callout/Info/InfoCallout";
+import WarningCallout from "@editor/Extensions/Callout/Warning/WarningCallout";
+import ImageBlock from "@editor/Extensions/Image/ImageBlock";
 import Youtube from "@tiptap/extension-youtube";
-import { EditorContentWrapper } from "../Editor/Editor";
-import VideoBlock from "../Editor/Extensions/Video/VideoBlock";
+import { EditorContentWrapper } from "@editor/Editor";
+import VideoBlock from "@editor/Extensions/Video/VideoBlock";
 import { styled } from "styled-components";
 
 interface Editor {
diff --git a/front/components/LectureViews/Video/Video.tsx b/front/components/LectureViews/Video/Video.tsx
new file mode 100644
index 00000000..05b1c650
--- /dev/null
+++ b/front/components/LectureViews/Video/Video.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+function Video() {
+  return (
+    <div>Video</div>
+  )
+}
+
+export default Video
\ No newline at end of file
diff --git a/front/components/Modals/CourseEdit/NewElement.tsx b/front/components/Modals/CourseEdit/NewElement.tsx
index e8a0f4ae..19aead43 100644
--- a/front/components/Modals/CourseEdit/NewElement.tsx
+++ b/front/components/Modals/CourseEdit/NewElement.tsx
@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import { ArrowLeftIcon, Cross1Icon } from "@radix-ui/react-icons";
 import Modal from "../Modal";
 import styled from "styled-components";
-import dynamic from "next/dynamic";
 import DynamicCanvaModal from "./NewElementModal/DynamicCanva";
 import VideoModal from "./NewElementModal/Video";
 
diff --git a/front/tsconfig.json b/front/tsconfig.json
index b5b4c798..a7ec212e 100644
--- a/front/tsconfig.json
+++ b/front/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -22,32 +18,17 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "baseUrl": ".",
+    "paths": {
+      "@components/*": ["components/*"],
+      "@public/*": ["public/*"],
+      "@images/*": ["public/img/*"],
+      "@services/*": ["services/*"],
+      "@editor/*": ["components/Editor/*"]
+    }
   },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts"
-  ],
-  "paths": {
-    "@components/*": [
-      "components/*"
-    ],
-    "@public/*": [
-      "public/*"
-    ],
-    "@images/*": [
-      "public/img/*"
-    ],
-    "@services/*": [
-      "services/*"
-    ],
-    "@editor/*": [
-      "components/Editor/*"
-    ]
-  },
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+
+  "exclude": ["node_modules"]
 }