diff --git a/front/app/_editor/course/[courseid]/lecture/[lectureid]/edit/page.tsx b/front/app/_editor/course/[courseid]/lecture/[lectureid]/edit/page.tsx
index a10cb3b8..6dde926d 100644
--- a/front/app/_editor/course/[courseid]/lecture/[lectureid]/edit/page.tsx
+++ b/front/app/_editor/course/[courseid]/lecture/[lectureid]/edit/page.tsx
@@ -8,7 +8,7 @@ import { getLecture } from "@services/courses/lectures";
 import AuthProvider from "@components/Security/AuthProvider";
 import EditorWrapper from "@components/Editor/EditorWrapper";
 import useSWR, { mutate } from "swr";
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { swrFetcher } from "@services/utils/requests";
 
 
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/activity/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/activity/page.tsx
index 5a9707f3..83561c96 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/activity/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/activity/page.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { getAPIUrl, getBackendUrl } from "@services/config";
+import { getAPIUrl, getBackendUrl } from "@services/config/config";
 import { swrFetcher } from "@services/utils/requests";
 import React from "react";
 import { styled } from "styled-components";
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/collections/new/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/collections/new/page.tsx
index 7e766919..da1f8355 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/collections/new/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/collections/new/page.tsx
@@ -2,11 +2,11 @@
 import { useRouter } from "next/navigation";
 import React from "react";
 import { Title } from "@components/UI/Elements/Styles/Title";
-import { createCollection } from "@services/collections";
+import { createCollection } from "@services/courses/collections";
 import useSWR from "swr";
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { swrFetcher } from "@services/utils/requests";
-import { getOrganizationContextInfo } from "@services/orgs";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
 
 function NewCollection(params : any) {
   const orgslug = params.params.orgslug;
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/collections/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/collections/page.tsx
index f2c11b26..c74dd467 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/collections/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/collections/page.tsx
@@ -3,8 +3,8 @@ import Link from "next/link";
 import React from "react";
 import styled from "styled-components";
 import { Title } from "@components/UI/Elements/Styles/Title";
-import { deleteCollection } from "@services/collections";
-import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config";
+import { deleteCollection } from "@services/courses/collections";
+import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config";
 import { swrFetcher } from "@services/utils/requests";
 import useSWR, { mutate } from "swr";
 
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 ebf1fd6b..f1d7f8a7 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/edit/page.tsx
@@ -13,7 +13,7 @@ import { useRouter } from "next/navigation";
 import NewChapterModal from "@components/Modals/CourseEdit/NewChapter";
 import NewLectureModal from "@components/Modals/CourseEdit/NewLecture";
 import { createLecture, createFileLecture } from "@services/courses/lectures";
-import { getOrganizationContextInfo } from "@services/orgs";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
 
 function CourseEdit(params: any) {
   const router = useRouter();
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/lecture/[lectureid]/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/lecture/[lectureid]/page.tsx
index d66a3ec3..868205a3 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/lecture/[lectureid]/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/lecture/[lectureid]/page.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import React, { useMemo } from "react";
 import Layout from "@components/UI/Layout";
 import { getLecture } from "@services/courses/lectures";
-import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config";
+import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config";
 import Canva from "@components/LectureViews/DynamicCanva/DynamicCanva";
 import styled from "styled-components";
 import { getCourse } from "@services/courses/courses";
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx
index c76d2974..f81fdb8c 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx
@@ -4,7 +4,7 @@ import { closeActivity, createActivity } from "@services/courses/activity";
 import Link from "next/link";
 import React from "react";
 import styled from "styled-components";
-import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config";
+import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config";
 import useSWR, { mutate } from "swr";
 import { swrFetcher } from "@services/utils/requests";
 
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/courses/new/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/courses/new/page.tsx
index 8acc5a8a..435bbb24 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/courses/new/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/courses/new/page.tsx
@@ -5,8 +5,8 @@ import { Header } from "@components/UI/Header";
 import Layout from "@components/UI/Layout";
 import { Title } from "@components/UI/Elements/Styles/Title";
 import { createNewCourse } from "@services/courses/courses";
-import { getOrganizationContextInfo } from "@services/orgs";
-import { getUriWithOrg } from "@services/config";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { getUriWithOrg } from "@services/config/config";
 
 const NewCoursePage = (params: any) => {
   const router = useRouter();
diff --git a/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx b/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx
index b661d16f..ae143509 100644
--- a/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx
+++ b/front/app/_orgs/[orgslug]/(withmenu)/courses/page.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
 import React from "react";
 import styled from "styled-components";
 import { Title } from "@components/UI/Elements/Styles/Title";
-import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config";
+import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config";
 import { deleteCourseFromBackend } from "@services/courses/courses";
 import useSWR, { mutate } from "swr";
 import { swrFetcher } from "@services/utils/requests";
diff --git a/front/app/_orgs/[orgslug]/page.tsx b/front/app/_orgs/[orgslug]/page.tsx
index a613b7c8..15c70bda 100644
--- a/front/app/_orgs/[orgslug]/page.tsx
+++ b/front/app/_orgs/[orgslug]/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { Title } from "@components/UI/Elements/Styles/Title";
-import { getUriWithOrg } from "@services/config";
+import { getUriWithOrg } from "@services/config/config";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
diff --git a/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx b/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx
index a415096b..4ecd1249 100644
--- a/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx
+++ b/front/app/_orgs/[orgslug]/settings/organization/general/page.tsx
@@ -2,7 +2,7 @@
 import React from 'react'
 import useSWR, { mutate } from "swr";
 import { swrFetcher } from "@services/utils/requests";
-import { getAPIUrl } from '@services/config';
+import { getAPIUrl } from '@services/config/config';
 import { Field, Form, Formik } from 'formik';
 import { updateOrganization } from '@services/settings/org';
 
diff --git a/front/app/organizations/new/page.tsx b/front/app/organizations/new/page.tsx
index ece50646..a645e3d8 100644
--- a/front/app/organizations/new/page.tsx
+++ b/front/app/organizations/new/page.tsx
@@ -2,7 +2,7 @@
 import React from "react";
 import Layout from "../../../components/UI/Layout";
 import { Title } from "../../../components/UI/Elements/Styles/Title";
-import { createNewOrganization } from "../../../services/orgs";
+import { createNewOrganization } from "../../../services/organizations/orgs";
 
 const Organizations = () => {
   const [name, setName] = React.useState("");
diff --git a/front/app/organizations/page.tsx b/front/app/organizations/page.tsx
index 544f7c52..93ef7e4d 100644
--- a/front/app/organizations/page.tsx
+++ b/front/app/organizations/page.tsx
@@ -3,10 +3,10 @@ import Link from "next/link";
 import React from "react";
 import Layout from "../../components/UI/Layout";
 import { Title } from "../../components/UI/Elements/Styles/Title";
-import { deleteOrganizationFromBackend } from "@services/orgs";
+import { deleteOrganizationFromBackend } from "@services/organizations/orgs";
 import useSWR, { mutate } from "swr";
 import { swrFetcher } from "@services/utils/requests";
-import { getAPIUrl, getUriWithOrg } from "@services/config";
+import { getAPIUrl, getUriWithOrg } from "@services/config/config";
 
 const Organizations = () => {
   const { data : organizations , error } = useSWR(`${getAPIUrl()}orgs/user/page/1/limit/10`, swrFetcher)
diff --git a/front/components/Drags/Lecture.tsx b/front/components/Drags/Lecture.tsx
index 513b686a..ffb805df 100644
--- a/front/components/Drags/Lecture.tsx
+++ b/front/components/Drags/Lecture.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import {  Draggable } from "react-beautiful-dnd";
 import { EyeOpenIcon, Pencil2Icon } from '@radix-ui/react-icons'
 import styled from "styled-components";
-import { getUriWithOrg } from "@services/config";
+import { getUriWithOrg } from "@services/config/config";
 
 function Lecture(props: any) {
 
diff --git a/front/components/Editor/Editor.tsx b/front/components/Editor/Editor.tsx
index 4bf794d5..e8945cdc 100644
--- a/front/components/Editor/Editor.tsx
+++ b/front/components/Editor/Editor.tsx
@@ -9,7 +9,7 @@ import { ToolbarButtons } from "./Toolbar/ToolbarButtons";
 import { motion, AnimatePresence } from "framer-motion";
 import Image from "next/legacy/image";
 import styled from "styled-components";
-import { getBackendUrl } from "../../services/config";
+import { getBackendUrl } from "@services/config/config";
 import { SlashIcon } from "@radix-ui/react-icons";
 import Avvvatars from "avvvatars-react";
 // extensions
diff --git a/front/components/Editor/Extensions/Image/ImageBlock.ts b/front/components/Editor/Extensions/Image/ImageBlock.ts
index 143c9076..2301b5f3 100644
--- a/front/components/Editor/Extensions/Image/ImageBlock.ts
+++ b/front/components/Editor/Extensions/Image/ImageBlock.ts
@@ -11,7 +11,7 @@ export default Node.create({
 
   addAttributes() {
     return {
-      fileObject: {
+      blockObject: {
         default: null,
       },
     };
diff --git a/front/components/Editor/Extensions/Image/ImageBlockComponent.tsx b/front/components/Editor/Extensions/Image/ImageBlockComponent.tsx
index 950d4740..c3088977 100644
--- a/front/components/Editor/Extensions/Image/ImageBlockComponent.tsx
+++ b/front/components/Editor/Extensions/Image/ImageBlockComponent.tsx
@@ -2,13 +2,13 @@ import { NodeViewWrapper } from "@tiptap/react";
 import React from "react";
 import styled from "styled-components";
 import { AlertCircle, AlertTriangle, Image, ImagePlus, Info } from "lucide-react";
-import { getImageFile, uploadNewImageFile } from "../../../../services/files/images";
-import { getBackendUrl } from "../../../../services/config";
+import { getImageFile, uploadNewImageFile } from "../../../../services/blocks/Image/images";
+import { getBackendUrl } from "../../../../services/config/config";
 
 function ImageBlockComponent(props: any) {
   const [image, setImage] = React.useState(null);
   const [isLoading, setIsLoading] = React.useState(false);
-  const [fileObject, setfileObject] = React.useState(props.node.attrs.fileObject);
+  const [blockObject, setblockObject] = React.useState(props.node.attrs.blockObject);
 
   const handleImageChange = (event: React.ChangeEvent<any>) => {
     setImage(event.target.files[0]);
@@ -19,15 +19,15 @@ function ImageBlockComponent(props: any) {
     setIsLoading(true);
     let object = await uploadNewImageFile(image, props.extension.options.lecture.lecture_id);
     setIsLoading(false);
-    setfileObject(object);
+    setblockObject(object);
     props.updateAttributes({
-      fileObject: object,
+      blockObject: object,
     });
   };
 
   return (
     <NodeViewWrapper className="block-image">
-      {!fileObject && (
+      {!blockObject && (
         <BlockImageWrapper contentEditable={props.extension.options.editable}>
           <div>
             <Image color="#e1e0e0" size={50} />
@@ -38,11 +38,11 @@ function ImageBlockComponent(props: any) {
           <button onClick={handleSubmit}>Submit</button>
         </BlockImageWrapper>
       )}
-      {fileObject && (
+      {blockObject && (
         <BlockImage>
           <img
-            src={`${getBackendUrl()}content/uploads/files/images/${props.extension.options.lecture.lecture_id}/${fileObject.file_id}.${
-              fileObject.file_format
+            src={`${getBackendUrl()}content/uploads/files/lectures/${props.extension.options.lecture.lecture_id}/blocks/imageBlock/${blockObject.block_id}/${blockObject.block_data.file_id}.${
+              blockObject.block_data.file_format
             }`}
             alt=""
           />
diff --git a/front/components/Editor/Extensions/PDF/PDFBlock.ts b/front/components/Editor/Extensions/PDF/PDFBlock.ts
index d329b79e..36fa3fde 100644
--- a/front/components/Editor/Extensions/PDF/PDFBlock.ts
+++ b/front/components/Editor/Extensions/PDF/PDFBlock.ts
@@ -11,7 +11,7 @@ export default Node.create({
 
   addAttributes() {
     return {
-      fileObject: {
+      blockObject: {
         default: null,
       },
     };
diff --git a/front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx b/front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx
index 57099699..2ecc8cbc 100644
--- a/front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx
+++ b/front/components/Editor/Extensions/PDF/PDFBlockComponent.tsx
@@ -2,13 +2,13 @@ import { NodeViewWrapper } from "@tiptap/react";
 import React from "react";
 import styled from "styled-components";
 import { AlertCircle, AlertTriangle, FileText, Image, ImagePlus, Info } from "lucide-react";
-import { getPDFFile, uploadNewPDFFile } from "../../../../services/files/documents";
-import { getBackendUrl } from "../../../../services/config";
+import { getPDFFile, uploadNewPDFFile } from "../../../../services/blocks/Pdf/pdf";
+import { getBackendUrl } from "../../../../services/config/config";
 
 function PDFBlockComponent(props: any) {
   const [pdf, setPDF] = React.useState(null);
   const [isLoading, setIsLoading] = React.useState(false);
-  const [fileObject, setfileObject] = React.useState(props.node.attrs.fileObject);
+  const [blockObject, setblockObject] = React.useState(props.node.attrs.blockObject);
 
   const handlePDFChange = (event: React.ChangeEvent<any>) => {
     setPDF(event.target.files[0]);
@@ -19,15 +19,15 @@ function PDFBlockComponent(props: any) {
     setIsLoading(true);
     let object = await uploadNewPDFFile(pdf, props.extension.options.lecture.lecture_id);
     setIsLoading(false);
-    setfileObject(object);
+    setblockObject(object);
     props.updateAttributes({
-      fileObject: object,
+      blockObject: object,
     });
   };
 
   return (
     <NodeViewWrapper className="block-pdf">
-      {!fileObject && (
+      {!blockObject && (
         <BlockPDFWrapper contentEditable={props.extension.options.editable}>
           <div>
             <FileText color="#e1e0e0" size={50} />
@@ -38,11 +38,11 @@ function PDFBlockComponent(props: any) {
           <button onClick={handleSubmit}>Submit</button>
         </BlockPDFWrapper>
       )}
-      {fileObject && (
+      {blockObject && (
         <BlockPDF>
           <iframe
-            src={`${getBackendUrl()}content/uploads/files/documents/${props.extension.options.lecture.lecture_id}/${fileObject.file_id}.${
-              fileObject.file_format
+            src={`${getBackendUrl()}content/uploads/files/lectures/${props.extension.options.lecture.lecture_id}/blocks/pdfBlock/${blockObject.block_id}/${blockObject.block_data.file_id}.${
+              blockObject.block_data.file_format
             }`}
           />
         </BlockPDF>
diff --git a/front/components/Editor/Extensions/Video/VideoBlock.ts b/front/components/Editor/Extensions/Video/VideoBlock.ts
index 1f7d727f..c38495ac 100644
--- a/front/components/Editor/Extensions/Video/VideoBlock.ts
+++ b/front/components/Editor/Extensions/Video/VideoBlock.ts
@@ -10,7 +10,7 @@ export default Node.create({
   
   addAttributes() {
     return {
-      fileObject: {
+      blockObject: {
         default: null,
       },
     };
diff --git a/front/components/Editor/Extensions/Video/VideoBlockComponent.tsx b/front/components/Editor/Extensions/Video/VideoBlockComponent.tsx
index eb82929f..3faff885 100644
--- a/front/components/Editor/Extensions/Video/VideoBlockComponent.tsx
+++ b/front/components/Editor/Extensions/Video/VideoBlockComponent.tsx
@@ -2,13 +2,13 @@ import { NodeViewWrapper } from "@tiptap/react";
 import { AlertTriangle, Image, Video } from "lucide-react";
 import React from "react";
 import styled from "styled-components";
-import { getBackendUrl } from "../../../../services/config";
-import { uploadNewVideoFile } from "../../../../services/files/video";
+import { getBackendUrl } from "../../../../services/config/config";
+import { uploadNewVideoFile } from "../../../../services/blocks/Video/video";
 
 function VideoBlockComponents(props: any) {
   const [video, setVideo] = React.useState(null);
   const [isLoading, setIsLoading] = React.useState(false);
-  const [fileObject, setfileObject] = React.useState(props.node.attrs.fileObject);
+  const [blockObject, setblockObject] = React.useState(props.node.attrs.blockObject);
 
   const handleVideoChange = (event: React.ChangeEvent<any>) => {
     setVideo(event.target.files[0]);
@@ -19,15 +19,15 @@ function VideoBlockComponents(props: any) {
     setIsLoading(true);
     let object = await uploadNewVideoFile(video, props.extension.options.lecture.lecture_id);
     setIsLoading(false);
-    setfileObject(object);
+    setblockObject(object);
     props.updateAttributes({
-      fileObject: object,
+      blockObject: object,
     });
   };
 
   return (
     <NodeViewWrapper className="block-video">
-      {!fileObject && (
+      {!blockObject && (
         <BlockVideoWrapper contentEditable={props.extension.options.editable}>
           <div>
             <Video color="#e1e0e0" size={50} />
@@ -38,12 +38,12 @@ function VideoBlockComponents(props: any) {
           <button onClick={handleSubmit}>Submit</button>
         </BlockVideoWrapper>
       )}
-      {fileObject && (
+      {blockObject && (
         <BlockVideo>
           <video
             controls
-            src={`${getBackendUrl()}content/uploads/files/videos/${props.extension.options.lecture.lecture_id}/${fileObject.file_id}.${
-              fileObject.file_format
+            src={`${getBackendUrl()}content/uploads/files/lectures/${props.extension.options.lecture.lecture_id}/blocks/videoBlock/${blockObject.block_id}/${blockObject.block_data.file_id}.${
+              blockObject.block_data.file_format
             }`}
           ></video>
         </BlockVideo>
diff --git a/front/components/LectureViews/Video/Video.tsx b/front/components/LectureViews/Video/Video.tsx
index 4dca7f8d..c8398f13 100644
--- a/front/components/LectureViews/Video/Video.tsx
+++ b/front/components/LectureViews/Video/Video.tsx
@@ -1,4 +1,4 @@
-import { getBackendUrl } from "@services/config";
+import { getBackendUrl } from "@services/config/config";
 import React from "react";
 import styled from "styled-components";
 
diff --git a/front/components/UI/Elements/Menu.tsx b/front/components/UI/Elements/Menu.tsx
index 9d888ccc..2a39f59f 100644
--- a/front/components/UI/Elements/Menu.tsx
+++ b/front/components/UI/Elements/Menu.tsx
@@ -8,7 +8,7 @@ import Link from "next/link";
 import Image from "next/image";
 import { useRouter, useSearchParams, usePathname } from "next/navigation";
 import { headers } from "next/headers";
-import { getOrgFromUri, getUriWithOrg } from "@services/config";
+import { getOrgFromUri, getUriWithOrg } from "@services/config/config";
 
 export const Menu = (params : any) => {
   const router = useRouter();
diff --git a/front/services/auth/auth.ts b/front/services/auth/auth.ts
index 56e61322..2eb90630 100644
--- a/front/services/auth/auth.ts
+++ b/front/services/auth/auth.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 
 interface LoginAndGetTokenResponse {
   access_token: "string";
diff --git a/front/services/files/images.ts b/front/services/blocks/Image/images.ts
similarity index 93%
rename from front/services/files/images.ts
rename to front/services/blocks/Image/images.ts
index 157a74fa..3e8db1ad 100644
--- a/front/services/files/images.ts
+++ b/front/services/blocks/Image/images.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody, RequestBodyForm } from "@services/utils/requests";
 
 export async function uploadNewImageFile(file: any, lecture_id: string) {
diff --git a/front/services/files/documents.ts b/front/services/blocks/Pdf/pdf.ts
similarity index 72%
rename from front/services/files/documents.ts
rename to front/services/blocks/Pdf/pdf.ts
index c0f04d61..5b3b1c22 100644
--- a/front/services/files/documents.ts
+++ b/front/services/blocks/Pdf/pdf.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody, RequestBodyForm } from "@services/utils/requests";
 
 export async function uploadNewPDFFile(file: any, lecture_id: string) {
@@ -7,14 +7,14 @@ export async function uploadNewPDFFile(file: any, lecture_id: string) {
   formData.append("file_object", file);
   formData.append("lecture_id", lecture_id);
 
-  return fetch(`${getAPIUrl()}blocks/document`, RequestBodyForm("POST", formData))
+  return fetch(`${getAPIUrl()}blocks/pdf`, RequestBodyForm("POST", formData))
     .then((result) => result.json())
     .catch((error) => console.log("error", error));
 }
 
 export async function getPDFFile(file_id: string) {
   // todo : add course id to url
-  return fetch(`${getAPIUrl()}blocks/document?file_id=${file_id}`, RequestBody("GET", null))
+  return fetch(`${getAPIUrl()}blocks/pdf?file_id=${file_id}`, RequestBody("GET", null))
     .then((result) => result.json())
     .catch((error) => console.log("error", error));
 }
diff --git a/front/services/blocks/Quiz/quiz.ts b/front/services/blocks/Quiz/quiz.ts
index e881c624..24e29b96 100644
--- a/front/services/blocks/Quiz/quiz.ts
+++ b/front/services/blocks/Quiz/quiz.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody, RequestBodyForm } from "@services/utils/requests";
 
 
diff --git a/front/services/files/video.ts b/front/services/blocks/Video/video.ts
similarity index 93%
rename from front/services/files/video.ts
rename to front/services/blocks/Video/video.ts
index 3fadc936..fc9bccaf 100644
--- a/front/services/files/video.ts
+++ b/front/services/blocks/Video/video.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody, RequestBodyForm } from "@services/utils/requests";
 
 export async function uploadNewVideoFile(file: any, lecture_id: string) {
diff --git a/front/services/config.ts b/front/services/config/config.ts
similarity index 100%
rename from front/services/config.ts
rename to front/services/config/config.ts
diff --git a/front/services/courses/activity.ts b/front/services/courses/activity.ts
index 82e29a6e..d2d41c85 100644
--- a/front/services/courses/activity.ts
+++ b/front/services/courses/activity.ts
@@ -1,5 +1,5 @@
 import { RequestBody } from "@services/utils/requests";
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 
 /*
  This file includes only POST, PUT, DELETE requests
diff --git a/front/services/courses/chapters.ts b/front/services/courses/chapters.ts
index 68c713f6..5cf8077c 100644
--- a/front/services/courses/chapters.ts
+++ b/front/services/courses/chapters.ts
@@ -1,5 +1,5 @@
 import { initialData } from "../../components/Drags/data";
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody } from "@services/utils/requests";
 
 /*
diff --git a/front/services/collections.ts b/front/services/courses/collections.ts
similarity index 87%
rename from front/services/collections.ts
rename to front/services/courses/collections.ts
index 839ba84d..2f213f0b 100644
--- a/front/services/collections.ts
+++ b/front/services/courses/collections.ts
@@ -1,5 +1,5 @@
-import { getAPIUrl } from "./config";
-import { RequestBody } from "./utils/requests";
+import { getAPIUrl } from "../config/config";
+import { RequestBody } from "../utils/requests";
 
 /*
  This file includes only POST, PUT, DELETE requests
diff --git a/front/services/courses/courses.ts b/front/services/courses/courses.ts
index 8f957613..d7307e70 100644
--- a/front/services/courses/courses.ts
+++ b/front/services/courses/courses.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody, RequestBodyForm } from "@services/utils/requests";
 
 /*
diff --git a/front/services/courses/lectures.ts b/front/services/courses/lectures.ts
index 4c20f9fd..05458e80 100644
--- a/front/services/courses/lectures.ts
+++ b/front/services/courses/lectures.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody, RequestBodyForm } from "@services/utils/requests";
 
 export async function createLecture(data: any, chapter_id: any, org_id: any) {
diff --git a/front/services/orgs.ts b/front/services/organizations/orgs.ts
similarity index 88%
rename from front/services/orgs.ts
rename to front/services/organizations/orgs.ts
index 44e74cdb..ddd6fde4 100644
--- a/front/services/orgs.ts
+++ b/front/services/organizations/orgs.ts
@@ -1,5 +1,5 @@
-import { getAPIUrl } from "@services/config";
-import { RequestBody } from "./utils/requests";
+import { getAPIUrl } from "@services/config/config";
+import { RequestBody } from "../utils/requests";
 
 /*
  This file includes only POST, PUT, DELETE requests
diff --git a/front/services/settings/org.ts b/front/services/settings/org.ts
index 2f77ee67..10842ca2 100644
--- a/front/services/settings/org.ts
+++ b/front/services/settings/org.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody } from "@services/utils/requests";
 
 /*
diff --git a/front/services/settings/password.ts b/front/services/settings/password.ts
index 3f1c00b4..b4c13bb3 100644
--- a/front/services/settings/password.ts
+++ b/front/services/settings/password.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody } from "@services/utils/requests";
 
 /*
diff --git a/front/services/settings/profile.ts b/front/services/settings/profile.ts
index 8b954c68..bb1a048a 100644
--- a/front/services/settings/profile.ts
+++ b/front/services/settings/profile.ts
@@ -1,4 +1,4 @@
-import { getAPIUrl } from "@services/config";
+import { getAPIUrl } from "@services/config/config";
 import { RequestBody } from "@services/utils/requests";
 
 /*
diff --git a/src/routers/blocks.py b/src/routers/blocks.py
index 9103e587..96317012 100644
--- a/src/routers/blocks.py
+++ b/src/routers/blocks.py
@@ -1,21 +1,24 @@
 from fastapi import APIRouter, Depends, UploadFile, Form, Request
 from src.dependencies.auth import get_current_user
 from fastapi import HTTPException, status, UploadFile
-from src.services.blocks.imageBlock.images import create_image_file, get_image_file
-from src.services.blocks.videoBlock.videos import create_video_file, get_video_file
-from src.services.blocks.pdfBlock.documents import create_document_file, get_document_file
-from src.services.blocks.quizBlock.quizBlock import create_quiz_block, get_quiz_block_answers, get_quiz_block_options, quizBlock
+from src.services.blocks.block_types.imageBlock.images import create_image_block, get_image_block  
+from src.services.blocks.block_types.videoBlock.videoBlock import create_video_block, get_video_block
+from src.services.blocks.block_types.pdfBlock.pdfBlock import create_pdf_block, get_pdf_block
+from src.services.blocks.block_types.quizBlock.quizBlock import create_quiz_block, get_quiz_block_answers, get_quiz_block_options, quizBlock
 from src.services.users.users import PublicUser
 
 router = APIRouter()
 
+####################
+# Image Block
+####################
 
 @router.post("/image")
 async def api_create_image_file_block(request: Request, file_object: UploadFile, lecture_id: str = Form(),  current_user: PublicUser = Depends(get_current_user)):
     """
     Create new image file
     """
-    return await create_image_file(request, file_object, lecture_id)
+    return await create_image_block(request, file_object, lecture_id)
 
 
 @router.get("/image")
@@ -23,39 +26,51 @@ async def api_get_image_file_block(request: Request, file_id: str, current_user:
     """
     Get image file
     """
-    return await get_image_file(request, file_id, current_user)
+    return await get_image_block(request, file_id, current_user)
+
+####################
+# Video Block
+####################
 
 @router.post("/video")
 async def api_create_video_file_block(request: Request, file_object: UploadFile, lecture_id: str = Form(), current_user: PublicUser = Depends(get_current_user)):
     """
     Create new video file
     """
-    return await create_video_file(request, file_object, lecture_id)
+    return await create_video_block(request, file_object, lecture_id)
+
 
 @router.get("/video")
 async def api_get_video_file_block(request: Request, file_id: str, current_user: PublicUser = Depends(get_current_user)):
     """
     Get video file
     """
-    return await get_video_file(request, file_id, current_user)
+    return await get_video_block(request, file_id, current_user)
 
+####################
+# PDF Block
+####################
 
-@router.post("/document")
-async def api_create_document_file_block(request: Request, file_object: UploadFile, lecture_id: str = Form(), current_user: PublicUser = Depends(get_current_user)):
+@router.post("/pdf")
+async def api_create_pdf_file_block(request: Request, file_object: UploadFile, lecture_id: str = Form(), current_user: PublicUser = Depends(get_current_user)):
     """
-    Create new document file
+    Create new pdf file
     """
-    return await create_document_file(request, file_object, lecture_id)
+    return await create_pdf_block(request, file_object, lecture_id)
 
 
-@router.get("/document")
-async def api_get_document_file_block(request: Request, file_id: str, current_user: PublicUser = Depends(get_current_user)):
+@router.get("/pdf")
+async def api_get_pdf_file_block(request: Request, file_id: str, current_user: PublicUser = Depends(get_current_user)):
     """
-    Get document file
+    Get pdf file
     """
-    return await get_document_file(request, file_id, current_user)
+    return await get_pdf_block(request, file_id, current_user)
 
 
+####################
+# Quiz Block
+####################
+
 @router.post("/quiz/{lecture_id}")
 async def api_create_quiz_block(request: Request, quiz_block: quizBlock, lecture_id: str, current_user: PublicUser = Depends(get_current_user)):
     """
diff --git a/src/services/blocks/__init__.py b/src/services/blocks/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/services/blocks/block_types/imageBlock/images.py b/src/services/blocks/block_types/imageBlock/images.py
new file mode 100644
index 00000000..b07a4771
--- /dev/null
+++ b/src/services/blocks/block_types/imageBlock/images.py
@@ -0,0 +1,47 @@
+from uuid import uuid4
+from pydantic import BaseModel
+from fastapi import HTTPException, status, UploadFile, Request
+from fastapi.responses import StreamingResponse
+import os
+from src.services.blocks.schemas.blocks import Block
+from src.services.blocks.utils.upload_files import upload_file_and_return_file_object
+
+from src.services.users.users import PublicUser
+
+
+async def create_image_block(request: Request, image_file: UploadFile, lecture_id: str):
+    blocks = request.app.db["blocks"]
+    lecture = request.app.db["lectures"]
+
+    block_type = "imageBlock"
+
+    # get org_id from lecture
+    lecture = await lecture.find_one({"lecture_id": lecture_id}, {"_id": 0, "org_id": 1})
+    org_id = lecture["org_id"]
+
+    # get block id
+    block_id = str(f"block_{uuid4()}")
+
+    block_data = await upload_file_and_return_file_object(request, image_file,  lecture_id, block_id, ["jpg", "jpeg", "png", "gif"], block_type)
+
+    # create block
+    block = Block(block_id=block_id, lecture_id=lecture_id,
+                  block_type=block_type, block_data=block_data, org_id=org_id)
+
+    # insert block
+    await blocks.insert_one(block.dict())
+
+    return block
+
+
+async def get_image_block(request: Request, file_id: str, current_user: PublicUser):
+    blocks = request.app.db["blocks"]
+
+    video_block = await blocks.find_one({"block_id": file_id})
+
+    if video_block:
+        return Block(**video_block)
+
+    else:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="Image block does not exist")
diff --git a/src/services/blocks/block_types/pdfBlock/pdfBlock.py b/src/services/blocks/block_types/pdfBlock/pdfBlock.py
new file mode 100644
index 00000000..738edd89
--- /dev/null
+++ b/src/services/blocks/block_types/pdfBlock/pdfBlock.py
@@ -0,0 +1,47 @@
+from uuid import uuid4
+from pydantic import BaseModel
+from fastapi import HTTPException, status, UploadFile, Request
+from fastapi.responses import StreamingResponse
+import os
+from src.services.blocks.schemas.blocks import Block
+from src.services.blocks.utils.upload_files import upload_file_and_return_file_object
+
+from src.services.users.users import PublicUser
+
+
+async def create_pdf_block(request: Request, pdf_file: UploadFile, lecture_id: str):
+    blocks = request.app.db["blocks"]
+    lecture = request.app.db["lectures"]
+
+    block_type = "pdfBlock"
+
+    # get org_id from lecture
+    lecture = await lecture.find_one({"lecture_id": lecture_id}, {"_id": 0, "org_id": 1})
+    org_id = lecture["org_id"]
+
+    # get block id
+    block_id = str(f"block_{uuid4()}")
+
+    block_data = await upload_file_and_return_file_object(request, pdf_file,  lecture_id, block_id, ["pdf"], block_type)
+
+    # create block
+    block = Block(block_id=block_id, lecture_id=lecture_id,
+                  block_type=block_type, block_data=block_data, org_id=org_id)
+
+    # insert block
+    await blocks.insert_one(block.dict())
+
+    return block
+
+
+async def get_pdf_block(request: Request, file_id: str, current_user: PublicUser):
+    blocks = request.app.db["blocks"]
+
+    pdf_block = await blocks.find_one({"block_id": file_id})
+
+    if pdf_block:
+        return Block(**pdf_block)
+
+    else:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="Video file does not exist")
diff --git a/src/services/blocks/quizBlock/quizBlock.py b/src/services/blocks/block_types/quizBlock/quizBlock.py
similarity index 82%
rename from src/services/blocks/quizBlock/quizBlock.py
rename to src/services/blocks/block_types/quizBlock/quizBlock.py
index 1d5e43fa..5576b12c 100644
--- a/src/services/blocks/quizBlock/quizBlock.py
+++ b/src/services/blocks/block_types/quizBlock/quizBlock.py
@@ -2,7 +2,7 @@ from typing import List, Literal
 from uuid import uuid4
 from fastapi import Request
 from pydantic import BaseModel
-from src.services.blocks.blocks import Block
+from src.services.blocks.schemas.blocks import Block
 from src.services.users.users import PublicUser
 
 
@@ -30,11 +30,17 @@ class quizBlock(BaseModel):
 
 async def create_quiz_block(request: Request, quizBlock: quizBlock, lecture_id: str, user: PublicUser):
     blocks = request.app.db["blocks"]
+    lectures = request.app.db["lectures"]
+
+    # Get org_id from lecture
+    lecture = await lectures.find_one({"lecture_id": lecture_id}, {"_id": 0, "org_id": 1})
+    org_id = lecture["org_id"]
+
     block_id = str(f"block_{uuid4()}")
 
     # create block
     block = Block(block_id=block_id, lecture_id=lecture_id,
-                  block_type="quizBlock", block_data=quizBlock)
+                  block_type="quizBlock", block_data=quizBlock, org_id=org_id)
 
     # insert block
     await blocks.insert_one(block.dict())
diff --git a/src/services/blocks/block_types/videoBlock/videoBlock.py b/src/services/blocks/block_types/videoBlock/videoBlock.py
new file mode 100644
index 00000000..bb71902f
--- /dev/null
+++ b/src/services/blocks/block_types/videoBlock/videoBlock.py
@@ -0,0 +1,47 @@
+from uuid import uuid4
+from pydantic import BaseModel
+import os
+from fastapi import HTTPException, status, UploadFile, Request
+from fastapi.responses import StreamingResponse
+from src.services.blocks.schemas.blocks import Block
+from src.services.blocks.utils.upload_files import upload_file_and_return_file_object
+
+from src.services.users.users import PublicUser
+
+
+async def create_video_block(request: Request, video_file: UploadFile, lecture_id: str):
+    blocks = request.app.db["blocks"]
+    lecture = request.app.db["lectures"]
+
+    block_type = "videoBlock"
+    
+    # get org_id from lecture
+    lecture = await lecture.find_one({"lecture_id": lecture_id}, {"_id": 0, "org_id": 1})
+    org_id = lecture["org_id"]
+
+    # get block id
+    block_id = str(f"block_{uuid4()}")
+
+    block_data = await upload_file_and_return_file_object(request, video_file,  lecture_id, block_id, ["mp4", "webm", "ogg"], block_type)
+
+    # create block
+    block = Block(block_id=block_id, lecture_id=lecture_id,
+                  block_type=block_type, block_data=block_data, org_id=org_id)
+
+    # insert block
+    await blocks.insert_one(block.dict())
+
+    return block
+
+
+async def get_video_block(request: Request, file_id: str, current_user: PublicUser):
+    blocks = request.app.db["blocks"]
+
+    video_block = await blocks.find_one({"block_id": file_id})
+
+    if video_block:
+        return Block(**video_block)
+
+    else:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="Video file does not exist")
diff --git a/src/services/blocks/imageBlock/images.py b/src/services/blocks/imageBlock/images.py
deleted file mode 100644
index 0ceba3bf..00000000
--- a/src/services/blocks/imageBlock/images.py
+++ /dev/null
@@ -1,112 +0,0 @@
-from uuid import uuid4
-from pydantic import BaseModel
-from fastapi import HTTPException, status, UploadFile, Request
-from fastapi.responses import StreamingResponse
-import os
-
-from src.services.users.users import PublicUser
-
-
-class PhotoFile(BaseModel):
-    file_id: str
-    file_format: str
-    file_name: str
-    file_size: int
-    file_type: str
-    lecture_id: str
-
-
-async def create_image_file(request: Request,image_file: UploadFile, lecture_id: str):
-    photos = request.app.db["files"]
-
-    # generate file_id
-    file_id = str(f"file_{uuid4()}")
-
-    # get file format
-    file_format = image_file.filename.split(".")[-1]
-
-    # validate file format
-    if file_format not in ["jpg", "jpeg", "png", "gif"]:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Image file format not supported")
-
-    # create file
-    file = await image_file.read()
-
-    # get file size
-    file_size = len(file)
-
-    # get file type
-    file_type = image_file.content_type
-
-    # get file name
-    file_name = image_file.filename
-
-    # create file object
-    uploadable_file = PhotoFile(
-        file_id=file_id,
-        file_format=file_format,
-        file_name=file_name,
-        file_size=file_size,
-        file_type=file_type,
-        lecture_id=lecture_id
-    )
-
-    # create folder for lecture
-    if not os.path.exists(f"content/uploads/files/images/{lecture_id}"):
-        os.mkdir(f"content/uploads/files/images/{lecture_id}")
-
-    # upload file to server
-    with open(f"content/uploads/files/images/{lecture_id}/{file_id}.{file_format}", 'wb') as f:
-        f.write(file)
-        f.close()
-
-    # insert file object into database
-    photo_file_in_db = await photos.insert_one(uploadable_file.dict())
-
-    if not photo_file_in_db:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Photo file could not be created")
-
-    return uploadable_file
-
-
-async def get_image_object(request: Request,file_id: str):
-    photos = request.app.db["files"]
-
-    photo_file = await photos.find_one({"file_id": file_id})
-
-    if photo_file:
-        photo_file = PhotoFile(**photo_file)
-        return photo_file
-
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Photo file does not exist")
-
-
-async def get_image_file(request: Request,file_id: str, current_user: PublicUser):
-    photos = request.app.db["files"]
-
-    photo_file = await photos.find_one({"file_id": file_id})
-
-    # TODO : check if user has access to file
-
-    if photo_file:
-
-        # check media type
-        if photo_file.format not in ["jpg", "jpeg", "png", "gif"]:
-            raise HTTPException(
-                status_code=status.HTTP_409_CONFLICT, detail="Photo file format not supported")
-
-        # stream file
-        photo_file = PhotoFile(**photo_file)
-        file_format = photo_file.file_format
-        lecture_id = photo_file.lecture_id
-        file = open(
-            f"content/uploads/files/images/{lecture_id}/{file_id}.{file_format}", 'rb')
-        return StreamingResponse(file, media_type=photo_file.file_type)
-
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Photo file does not exist")
diff --git a/src/services/blocks/pdfBlock/documents.py b/src/services/blocks/pdfBlock/documents.py
deleted file mode 100644
index eeb861ea..00000000
--- a/src/services/blocks/pdfBlock/documents.py
+++ /dev/null
@@ -1,112 +0,0 @@
-from uuid import uuid4
-from pydantic import BaseModel
-from fastapi import HTTPException, status, UploadFile, Request
-from fastapi.responses import StreamingResponse
-import os
-
-from src.services.users.users import PublicUser
-
-
-class DocumentFile(BaseModel):
-    file_id: str
-    file_format: str
-    file_name: str
-    file_size: int
-    file_type: str
-    lecture_id: str
-
-
-async def create_document_file(request: Request, document_file: UploadFile, lecture_id: str):
-    documents = request.app.db["files"]
-
-    # generate file_id
-    file_id = str(f"file_{uuid4()}")
-
-    # get file format
-    file_format = document_file.filename.split(".")[-1]
-
-    # validate file format
-    if file_format not in ["pdf"]:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Document file format not supported")
-
-    # create file
-    file = await document_file.read()
-
-    # get file size
-    file_size = len(file)
-
-    # get file type
-    file_type = document_file.content_type
-
-    # get file name
-    file_name = document_file.filename
-
-    # create file object
-    uploadable_file = DocumentFile(
-        file_id=file_id,
-        file_format=file_format,
-        file_name=file_name,
-        file_size=file_size,
-        file_type=file_type,
-        lecture_id=lecture_id
-    )
-    # TODO : this is probably not working as intended
-    # create folder for lecture
-    if not os.path.exists(f"content/uploads/files/documents/{lecture_id}"):
-        os.mkdir(f"content/uploads/files/documents/{lecture_id}")
-
-    # upload file to server
-    with open(f"content/uploads/files/documents/{lecture_id}/{file_id}.{file_format}", 'wb') as f:
-        f.write(file)
-        f.close()
-
-    # insert file object into database
-    document_file_in_db = await documents.insert_one(uploadable_file.dict())
-
-    if not document_file_in_db:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Document file could not be created")
-
-    return uploadable_file
-
-
-async def get_document_object(request: Request, file_id: str):
-    documents = request.app.db["files"]
-
-    document_file = await documents.find_one({"file_id": file_id})
-
-    if document_file:
-        document_file = DocumentFile(**document_file)
-        return document_file
-
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Document file does not exist")
-
-
-async def get_document_file(request: Request, file_id: str, current_user: PublicUser):
-    documents = request.app.db["files"]
-
-    document_file = await documents.find_one({"file_id": file_id})
-
-    # TODO : check if user has access to file
-
-    if document_file:
-
-        # check media type
-        if document_file.format not in ["pdf"]:
-            raise HTTPException(
-                status_code=status.HTTP_409_CONFLICT, detail="Document file format not supported")
-
-        # stream file
-        document_file = DocumentFile(**document_file)
-        file_format = document_file.file_format
-        lecture_id = document_file.lecture_id
-        file = open(
-            f"content/uploads/files/documents/{lecture_id}/{file_id}.{file_format}", 'rb')
-        return StreamingResponse(file, media_type=document_file.file_type)
-
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Document file does not exist")
diff --git a/src/services/blocks/blocks.py b/src/services/blocks/schemas/blocks.py
similarity index 68%
rename from src/services/blocks/blocks.py
rename to src/services/blocks/schemas/blocks.py
index d146e633..8fea3827 100644
--- a/src/services/blocks/blocks.py
+++ b/src/services/blocks/schemas/blocks.py
@@ -8,5 +8,6 @@ from pydantic import BaseModel
 class Block(BaseModel):
     block_id: str
     lecture_id: str
-    block_type: Literal["quizBlock", "videoBlock", "pdfBlock"]
+    org_id: str
+    block_type: Literal["quizBlock", "videoBlock", "pdfBlock", "imageBlock"]
     block_data: Any
diff --git a/src/services/blocks/schemas/files.py b/src/services/blocks/schemas/files.py
new file mode 100644
index 00000000..397d2535
--- /dev/null
+++ b/src/services/blocks/schemas/files.py
@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+
+class BlockFile(BaseModel):
+    file_id: str
+    file_format: str
+    file_name: str
+    file_size: int
+    file_type: str
+    lecture_id: str
\ No newline at end of file
diff --git a/src/services/blocks/utils/upload_files.py b/src/services/blocks/utils/upload_files.py
new file mode 100644
index 00000000..c57e76ff
--- /dev/null
+++ b/src/services/blocks/utils/upload_files.py
@@ -0,0 +1,55 @@
+import os
+import uuid
+from fastapi import HTTPException, Request, UploadFile, status
+from src.services.blocks.schemas.files import BlockFile
+
+from src.services.users.schemas.users import PublicUser
+
+
+async def upload_file_and_return_file_object(request: Request, file: UploadFile, lecture_id: str, block_id: str, list_of_allowed_file_formats: list, type_of_block: str):
+    # get file id
+    file_id = str(uuid.uuid4())
+
+    # get file format
+    file_format = file.filename.split(".")[-1]
+
+    # validate file format
+    if file_format not in list_of_allowed_file_formats:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="File format not supported")
+    
+    # create file
+    file_binary = await file.read()
+
+    # get file size
+    file_size = len(await file.read())
+
+    # get file type
+    file_type = file.content_type
+
+    # get file name
+    file_name = file.filename
+
+    # create file object
+    uploadable_file = BlockFile(
+        file_id=file_id,
+        file_format=file_format,
+        file_name=file_name,
+        file_size=file_size,
+        file_type=file_type,
+        lecture_id=lecture_id
+    )
+
+    # create folder for lecture
+    if not os.path.exists(f"content/uploads/files/lectures/{lecture_id}/blocks/{type_of_block}/{block_id}"):
+        # create folder for lecture
+        os.makedirs(f"content/uploads/files/lectures/{lecture_id}/blocks/{type_of_block}/{block_id}")
+
+    # upload file to server
+    with open(f"content/uploads/files/lectures/{lecture_id}/blocks/{type_of_block}/{block_id}/{file_id}.{file_format}", 'wb') as f:
+        f.write(file_binary)
+        f.close()
+
+    # TODO: do some error handling here
+
+    return uploadable_file
diff --git a/src/services/blocks/videoBlock/videos.py b/src/services/blocks/videoBlock/videos.py
deleted file mode 100644
index 768d6adb..00000000
--- a/src/services/blocks/videoBlock/videos.py
+++ /dev/null
@@ -1,115 +0,0 @@
-from uuid import uuid4
-from pydantic import BaseModel
-import os
-from fastapi import HTTPException, status, UploadFile,Request
-from fastapi.responses import StreamingResponse
-
-from src.services.users.users import PublicUser
-
-
-class VideoFile(BaseModel):
-    file_id: str
-    file_format: str
-    file_name: str
-    file_size: int
-    file_type: str
-    lecture_id: str
-
-
-async def create_video_file(request: Request,video_file: UploadFile, lecture_id: str):
-    files = request.app.db["files"]
-
-    # generate file_id
-    file_id = str(f"file_{uuid4()}")
-
-    # get file format
-    file_format = video_file.filename.split(".")[-1]
-
-    # validate file format
-    if file_format not in ["mp4", "webm", "ogg"]:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Video file format not supported")
-
-    # create file
-    file = await video_file.read()
-
-    # get file size
-    file_size = len(file)
-
-    # get file type
-    file_type = video_file.content_type
-
-    # get file name
-    file_name = video_file.filename
-
-    # create file object
-    uploadable_file = VideoFile(
-        file_id=file_id,
-        file_format=file_format,
-        file_name=file_name,
-        file_size=file_size,
-        file_type=file_type,
-        lecture_id=lecture_id
-    )
-
-    # create folder for lecture
-    if not os.path.exists(f"content/uploads/files/videos/{lecture_id}"):
-        os.mkdir(f"content/uploads/files/videos/{lecture_id}")
-
-    # upload file to server
-    with open(f"content/uploads/files/videos/{lecture_id}/{file_id}.{file_format}", 'wb') as f:
-        f.write(file)
-        f.close()
-
-    # insert file object into database
-    video_file_in_db = await files.insert_one(uploadable_file.dict())
-
-    if not video_file_in_db:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Video file could not be created")
-
-    return uploadable_file
-
-
-async def get_video_object(request: Request,file_id: str, current_user: PublicUser):
-    photos = request.app.db["files"]
-
-    video_file = await photos.find_one({"file_id": file_id})
-
-    if video_file:
-        video_file = VideoFile(**video_file)
-        return video_file
-
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Photo file does not exist")
-
-
-async def get_video_file(request: Request,file_id: str, current_user: PublicUser):
-    photos = request.app.db["files"]
-
-    video_file = await photos.find_one({"file_id": file_id})
-
-    # TODO : check if user has access to file
-
-    if video_file:
-
-        # check media type
-        if video_file.format not in ["mp4", "webm", "ogg"]:
-            raise HTTPException(
-                status_code=status.HTTP_409_CONFLICT, detail="Video file format not supported")
-
-        # stream file
-        video_file = VideoFile(**video_file)
-        file_format = video_file.file_format
-        lecture_id = video_file.lecture_id
-
-        def iterfile():  #
-            #
-            with open(f"content/uploads/files/videos/{lecture_id}/{file_id}.{file_format}", mode="rb") as file_like:
-                yield from file_like
-        return StreamingResponse(iterfile(), media_type=video_file.file_type)
-
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT, detail="Video file does not exist")