diff --git a/src/services/auth.py b/src/dependencies/auth.py
similarity index 100%
rename from src/services/auth.py
rename to src/dependencies/auth.py
diff --git a/src/routers/auth.py b/src/routers/auth.py
index 4fd27e01..691d5c97 100644
--- a/src/routers/auth.py
+++ b/src/routers/auth.py
@@ -1,7 +1,7 @@
 from urllib.request import Request
 from fastapi import Depends, APIRouter, HTTPException, status
 from fastapi.security import  OAuth2PasswordRequestForm
-from src.services.auth import *
+from src.dependencies.auth import *
 from src.services.users import *
 from datetime import  timedelta
 from fastapi.responses import JSONResponse
diff --git a/src/routers/courses/chapters.py b/src/routers/courses/chapters.py
index bd12b2cd..2bd25eaa 100644
--- a/src/routers/courses/chapters.py
+++ b/src/routers/courses/chapters.py
@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, UploadFile, Form
 
 from src.services.courses.chapters import CourseChapter, CourseChapterMetaData, create_coursechapter, delete_coursechapter, get_coursechapter, get_coursechapters, get_coursechapters_meta, update_coursechapter, update_coursechapters_meta
 from src.services.users import PublicUser
-from src.services.auth import get_current_user
+from src.dependencies.auth import get_current_user
 
 router = APIRouter()
 
@@ -24,7 +24,7 @@ async def api_get_coursechapter(coursechapter_id: str, current_user: PublicUser
 
 
 @router.get("/meta/{course_id}")
-async def api_get_coursechapter(course_id: str, current_user: PublicUser = Depends(get_current_user)):
+async def api_get_coursechapter_meta(course_id: str, current_user: PublicUser = Depends(get_current_user)):
     """
     Get coursechapter metadata
     """
diff --git a/src/routers/courses/collections.py b/src/routers/courses/collections.py
index 65702dae..f62f3b32 100644
--- a/src/routers/courses/collections.py
+++ b/src/routers/courses/collections.py
@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends
-from src.services.auth import get_current_user
+from src.dependencies.auth import get_current_user
 from src.services.users import PublicUser, User
 from src.services.courses.collections import Collection, create_collection, get_collection, get_collections, update_collection, delete_collection
 
diff --git a/src/routers/courses/courses.py b/src/routers/courses/courses.py
index 3e4f0a55..a4eae909 100644
--- a/src/routers/courses/courses.py
+++ b/src/routers/courses/courses.py
@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, UploadFile, Form
-from src.services.auth import get_current_user
+from src.dependencies.auth import get_current_user
 
 from src.services.courses.courses import Course,  create_course,  get_course, get_courses, update_course, delete_course, update_course_thumbnail
 from src.services.users import PublicUser
diff --git a/src/routers/houses.py b/src/routers/houses.py
index 4845a9d4..f1770ac8 100644
--- a/src/routers/houses.py
+++ b/src/routers/houses.py
@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends
-from src.services.auth import get_current_user
+from src.dependencies.auth import get_current_user
 
 from src.services.houses import House, HouseInDB, create_house, get_house, get_houses, update_house, delete_house
 from src.services.users import PublicUser, User
diff --git a/src/routers/orgs.py b/src/routers/orgs.py
index a08ad678..58fd8fdc 100644
--- a/src/routers/orgs.py
+++ b/src/routers/orgs.py
@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends
-from src.services.auth import get_current_user
+from src.dependencies.auth import get_current_user
 from src.services.orgs import Organization, create_org, delete_org, get_organization, get_organization_by_slug, get_orgs, get_orgs_by_user, update_org
 from src.services.users import PublicUser, User
 
diff --git a/src/routers/roles.py b/src/routers/roles.py
index 35c3e0a0..9a1496d9 100644
--- a/src/routers/roles.py
+++ b/src/routers/roles.py
@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends
-from src.services.auth import get_current_user
+from src.dependencies.auth import get_current_user
 
 from src.services.roles import Role, create_role, delete_role, get_role, get_roles, update_role
 from src.services.users import PublicUser, User
diff --git a/src/routers/users.py b/src/routers/users.py
index 7f980ac8..b6dadc3e 100644
--- a/src/routers/users.py
+++ b/src/routers/users.py
@@ -1,7 +1,7 @@
 from fastapi import Depends, FastAPI, APIRouter
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from pydantic import BaseModel
-from src.services.auth import *
+from src.dependencies.auth import *
 from src.services.users import *
 
 
diff --git a/src/services/courses/chapters.py b/src/services/courses/chapters.py
index 3e8a48e4..d903eab8 100644
--- a/src/services/courses/chapters.py
+++ b/src/services/courses/chapters.py
@@ -91,7 +91,7 @@ async def get_coursechapters_meta(course_id: str, current_user: PublicUser):
         {"course_id": course_id}).sort("name", 1)
 
     course = courses.find_one({"course_id": course_id})
-    course = Course(**course)
+    course = Course(**course)  # type: ignore
 
     # chapters
     chapters = {}
@@ -120,7 +120,7 @@ async def update_coursechapters_meta(course_id: str, coursechapters_metadata: Co
     courses = learnhouseDB["courses"]
 
     course = courses.find_one({"course_id": course_id})
-    course = Course(**course)
+    course = Course(**course)  # type: ignore
 
     # update chapters in course
     courseInDB = courses.update_one({"course_id": course_id}, {
diff --git a/src/services/courses/elements.py b/src/services/courses/elements.py
new file mode 100644
index 00000000..e69de29b