diff --git a/src/hellocomputer/db.py b/src/hellocomputer/db/__init__.py
similarity index 99%
rename from src/hellocomputer/db.py
rename to src/hellocomputer/db/__init__.py
index 528ac00..be93fa7 100644
--- a/src/hellocomputer/db.py
+++ b/src/hellocomputer/db/__init__.py
@@ -1,7 +1,8 @@
 from enum import StrEnum
-from sqlalchemy import create_engine, text
 from pathlib import Path
 
+from sqlalchemy import create_engine, text
+
 
 class StorageEngines(StrEnum):
     local = "Local"
diff --git a/src/hellocomputer/sessions.py b/src/hellocomputer/db/sessions.py
similarity index 99%
rename from src/hellocomputer/sessions.py
rename to src/hellocomputer/db/sessions.py
index dd96104..95de577 100644
--- a/src/hellocomputer/sessions.py
+++ b/src/hellocomputer/db/sessions.py
@@ -6,7 +6,7 @@ from typing_extensions import Self
 
 from hellocomputer.db import StorageEngines
 
-from .db import DDB
+from . import DDB
 
 
 class SessionDB(DDB):
diff --git a/src/hellocomputer/users.py b/src/hellocomputer/db/users.py
similarity index 98%
rename from src/hellocomputer/users.py
rename to src/hellocomputer/db/users.py
index a5cf93d..5a166ad 100644
--- a/src/hellocomputer/users.py
+++ b/src/hellocomputer/db/users.py
@@ -8,7 +8,7 @@ from uuid import UUID, uuid4
 import duckdb
 import polars as pl
 
-from .db import DDB, StorageEngines
+from . import DDB, StorageEngines
 
 
 class UserDB(DDB):
diff --git a/src/hellocomputer/routers/analysis.py b/src/hellocomputer/routers/analysis.py
index ab39b98..ef307fa 100644
--- a/src/hellocomputer/routers/analysis.py
+++ b/src/hellocomputer/routers/analysis.py
@@ -1,10 +1,9 @@
 from fastapi import APIRouter
 from fastapi.responses import PlainTextResponse
 
-
 from hellocomputer.db import StorageEngines
+from hellocomputer.db.sessions import SessionDB
 from hellocomputer.extraction import extract_code_block
-from hellocomputer.sessions import SessionDB
 
 from ..config import settings
 from ..models import Chat
diff --git a/src/hellocomputer/routers/auth.py b/src/hellocomputer/routers/auth.py
index aad7883..58bd85a 100644
--- a/src/hellocomputer/routers/auth.py
+++ b/src/hellocomputer/routers/auth.py
@@ -5,7 +5,7 @@ from starlette.requests import Request
 
 from hellocomputer.config import settings
 from hellocomputer.db import StorageEngines
-from hellocomputer.users import UserDB
+from hellocomputer.db.users import UserDB
 
 router = APIRouter()
 
diff --git a/src/hellocomputer/routers/files.py b/src/hellocomputer/routers/files.py
index da1057e..d3bf9cb 100644
--- a/src/hellocomputer/routers/files.py
+++ b/src/hellocomputer/routers/files.py
@@ -7,8 +7,8 @@ from starlette.requests import Request
 
 from ..config import settings
 from ..db import StorageEngines
-from ..sessions import SessionDB
-from ..users import OwnershipDB
+from ..db.sessions import SessionDB
+from ..db.users import OwnershipDB
 
 router = APIRouter()
 
diff --git a/src/hellocomputer/routers/sessions.py b/src/hellocomputer/routers/sessions.py
index f1446f1..b67af48 100644
--- a/src/hellocomputer/routers/sessions.py
+++ b/src/hellocomputer/routers/sessions.py
@@ -1,12 +1,12 @@
+from typing import List
 from uuid import uuid4
 
 from fastapi import APIRouter
 from fastapi.responses import PlainTextResponse
 from starlette.requests import Request
-from typing import List
 
 from hellocomputer.db import StorageEngines
-from hellocomputer.users import OwnershipDB
+from hellocomputer.db.users import OwnershipDB
 
 from ..config import settings
 
diff --git a/test/test_data.py b/test/test_data.py
index 2a8849c..1d82b1e 100644
--- a/test/test_data.py
+++ b/test/test_data.py
@@ -2,7 +2,7 @@ from pathlib import Path
 
 import hellocomputer
 from hellocomputer.db import StorageEngines
-from hellocomputer.sessions import SessionDB
+from hellocomputer.db.sessions import SessionDB
 
 TEST_STORAGE = StorageEngines.local
 TEST_XLS_PATH = (
diff --git a/test/test_query.py b/test/test_query.py
index 65b306d..0364503 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -6,7 +6,7 @@ from hellocomputer.config import settings
 from hellocomputer.db import StorageEngines
 from hellocomputer.extraction import extract_code_block
 from hellocomputer.models import Chat
-from hellocomputer.sessions import SessionDB
+from hellocomputer.db.sessions import SessionDB
 
 TEST_STORAGE = StorageEngines.local
 TEST_OUTPUT_FOLDER = Path(hellocomputer.__file__).parents[2] / "test" / "output"
diff --git a/test/test_user.py b/test/test_user.py
index df97785..eb38df0 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -2,7 +2,7 @@ from pathlib import Path
 
 import hellocomputer
 from hellocomputer.db import StorageEngines
-from hellocomputer.users import OwnershipDB, UserDB
+from hellocomputer.db.users import OwnershipDB, UserDB
 
 TEST_STORAGE = StorageEngines.local
 TEST_OUTPUT_FOLDER = Path(hellocomputer.__file__).parents[2] / "test" / "output"