diff --git a/backend/src/auth/__init__.py b/backend/src/auth/__init__.py
index 8c941e4..565a0a8 100644
--- a/backend/src/auth/__init__.py
+++ b/backend/src/auth/__init__.py
@@ -61,7 +61,7 @@ async def get_current_user(db: SessionDependency, token: str = Depends(oauth2_sc
 
 def create_access_token(data: dict, expires_delta: timedelta | None = None):
     to_encode = data.copy()
-    config = AuthConfig()
+    config = AuthConfig
     if expires_delta:
         expire = datetime.now(timezone.utc) + expires_delta
     else:
diff --git a/backend/src/dowloadClients/__init__.py b/backend/src/dowloadClients/__init__.py
index 3220a4f..16b1e0c 100644
--- a/backend/src/dowloadClients/__init__.py
+++ b/backend/src/dowloadClients/__init__.py
@@ -3,7 +3,6 @@ from dowloadClients.qbittorrent import QbittorrentClient
 
 config = DownloadClientConfig()
 
-# TODO: add more elif when implementing more download clients
 if config.download_client == "qbit":
     client = QbittorrentClient()
 else:
diff --git a/backend/src/dowloadClients/genericDownloadClient.py b/backend/src/dowloadClients/genericDownloadClient.py
index e9580b7..a1211ac 100644
--- a/backend/src/dowloadClients/genericDownloadClient.py
+++ b/backend/src/dowloadClients/genericDownloadClient.py
@@ -9,7 +9,6 @@ class GenericDownloadClient(object):
             raise ValueError('name cannot be None')
         self.name = name
 
-    # TODO: change Torrents type to SeasonTorrents|MovieTorrents
     def download(self, torrent: TorrentMixin) -> TorrentMixin:
         """
         downloads a torrent
diff --git a/backend/src/main.py b/backend/src/main.py
index 7fa9454..44e2111 100644
--- a/backend/src/main.py
+++ b/backend/src/main.py
@@ -14,7 +14,7 @@ from fastapi import FastAPI
 import database.users
 import tv.router
 from auth import password
-from routers import users
+from users import routers
 
 LOGGING_CONFIG = {
     "version": 1,
@@ -44,7 +44,7 @@ dictConfig(LOGGING_CONFIG)
 
 database.init_db()
 app = FastAPI(root_path="/api/v1")
-app.include_router(users.router, tags=["users"])
+app.include_router(routers.router, tags=["users"])
 app.include_router(password.router, tags=["authentication"])
 app.include_router(tv.router.router, tags=["tv"])
 
diff --git a/backend/src/metadataProvider/abstractMetaDataProvider.py b/backend/src/metadataProvider/abstractMetaDataProvider.py
index 7a47c0a..862d89e 100644
--- a/backend/src/metadataProvider/abstractMetaDataProvider.py
+++ b/backend/src/metadataProvider/abstractMetaDataProvider.py
@@ -7,7 +7,7 @@ from database.tv import Show
 log = logging.getLogger(__name__)
 
 
-class MetadataProvider(ABC):
+class AbstractMetadataProvider(ABC):
     storage_path = config.BasicConfig().storage_directory
     @property
     @abstractmethod
@@ -26,6 +26,6 @@ class MetadataProvider(ABC):
 metadata_providers = {}
 
 
-def register_metadata_provider(metadata_provider: MetadataProvider):
+def register_metadata_provider(metadata_provider: AbstractMetadataProvider):
     log.info("Registering metadata provider:" + metadata_provider.name)
     metadata_providers[metadata_provider.name] = metadata_provider
diff --git a/backend/src/metadataProvider/tmdb.py b/backend/src/metadataProvider/tmdb.py
index 3f39427..f3f4195 100644
--- a/backend/src/metadataProvider/tmdb.py
+++ b/backend/src/metadataProvider/tmdb.py
@@ -7,7 +7,7 @@ from pydantic_settings import BaseSettings
 from tmdbsimple import TV, TV_Seasons
 
 from database.tv import Episode, Season, Show
-from metadataProvider.abstractMetaDataProvider import MetadataProvider, register_metadata_provider
+from metadataProvider.abstractMetaDataProvider import AbstractMetadataProvider, register_metadata_provider
 
 
 class TmdbConfig(BaseSettings):
@@ -18,7 +18,7 @@ config = TmdbConfig
 log = logging.getLogger(__name__)
 
 
-class TmdbMetadataProvider(MetadataProvider):
+class TmdbMetadataProvider(AbstractMetadataProvider):
     name = "tmdb"
 
     def get_show_metadata(self, id: int = None) -> Show:
diff --git a/backend/src/tv/router.py b/backend/src/tv/router.py
index f566e94..879d4e2 100644
--- a/backend/src/tv/router.py
+++ b/backend/src/tv/router.py
@@ -16,8 +16,8 @@ from database import SessionDependency
 from database.torrents import Torrent
 from database.tv import Season, Show
 from indexer import IndexerQueryResult
-from routers.users import Message
 from tv import log
+from users.routers import Message
 
 router = APIRouter(
     prefix="/tv",
diff --git a/backend/src/routers/__init__.py b/backend/src/users/__init__.py
similarity index 100%
rename from backend/src/routers/__init__.py
rename to backend/src/users/__init__.py
diff --git a/backend/src/routers/users.py b/backend/src/users/routers.py
similarity index 98%
rename from backend/src/routers/users.py
rename to backend/src/users/routers.py
index b9e1adc..471d875 100644
--- a/backend/src/routers/users.py
+++ b/backend/src/users/routers.py
@@ -7,7 +7,7 @@ from auth import get_current_user
 from auth.password import get_password_hash
 from database import SessionDependency
 from database.users import User, UserCreate, UserPublic
-from routers import log
+from users import log
 
 router = APIRouter(
     prefix="/users",