diff --git a/src/aross_stations_db/api/v1/output.py b/src/aross_stations_db/api/v1/output.py
index afe8495..9bedd22 100644
--- a/src/aross_stations_db/api/v1/output.py
+++ b/src/aross_stations_db/api/v1/output.py
@@ -11,7 +11,7 @@
 from pydantic import BaseModel
 from sqlalchemy import Row
 
-from aross_stations_db.tables import Station
+from aross_stations_db.db.tables import Station
 
 StationsGeoJson = FeatureCollection[Feature[Point, dict[str, object]]]
 
diff --git a/src/aross_stations_db/db.py b/src/aross_stations_db/db/__init__.py
similarity index 95%
rename from src/aross_stations_db/db.py
rename to src/aross_stations_db/db/__init__.py
index 16a990e..092a777 100644
--- a/src/aross_stations_db/db.py
+++ b/src/aross_stations_db/db/__init__.py
@@ -3,7 +3,7 @@
 
 from sqlalchemy.orm import Session
 
-from aross_stations_db.tables import Base, Event, Station
+from aross_stations_db.db.tables import Base, Event, Station
 
 
 def create_tables(session: Session) -> None:
diff --git a/src/aross_stations_db/tables.py b/src/aross_stations_db/db/tables.py
similarity index 100%
rename from src/aross_stations_db/tables.py
rename to src/aross_stations_db/db/tables.py
diff --git a/src/aross_stations_db/query.py b/src/aross_stations_db/query.py
index 9727faa..9cd6e4c 100644
--- a/src/aross_stations_db/query.py
+++ b/src/aross_stations_db/query.py
@@ -5,7 +5,7 @@
 from sqlalchemy.orm.query import RowReturningQuery
 from sqlalchemy.types import DateTime, Float
 
-from aross_stations_db.tables import Event, Station
+from aross_stations_db.db.tables import Event, Station
 
 
 def stations_query(