diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index 3caf1c07c..0a8425ce8 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -60,8 +60,7 @@ services:
       POSTGRES_DB: fedn_db
     ports:
       - "5432:5432"
-
-
+  
   api-server:
     environment:
       - GET_HOSTS_FROM=dns
diff --git a/fedn/network/storage/statestore/stores/model_store.py b/fedn/network/storage/statestore/stores/model_store.py
index 8ee2bb1a5..c246f739b 100644
--- a/fedn/network/storage/statestore/stores/model_store.py
+++ b/fedn/network/storage/statestore/stores/model_store.py
@@ -10,7 +10,7 @@
 from sqlalchemy.sql import text
 
 from fedn.network.storage.statestore.stores.shared import EntityNotFound, from_document
-from fedn.network.storage.statestore.stores.sql_models import ModelModel
+from fedn.network.storage.statestore.stores.sql.shared import ModelModel
 from fedn.network.storage.statestore.stores.store import MongoDBStore, Session, SQLStore, Store
 
 
diff --git a/fedn/network/storage/statestore/stores/round_store.py b/fedn/network/storage/statestore/stores/round_store.py
index 12ff465ea..6619659e1 100644
--- a/fedn/network/storage/statestore/stores/round_store.py
+++ b/fedn/network/storage/statestore/stores/round_store.py
@@ -7,7 +7,7 @@
 from sqlalchemy import Integer, func, or_, select
 from sqlalchemy.sql import text
 
-from fedn.network.storage.statestore.stores.sql_models import RoundCombinerModel, RoundConfigModel, RoundDataModel, RoundModel
+from fedn.network.storage.statestore.stores.sql.shared import RoundCombinerModel, RoundConfigModel, RoundDataModel, RoundModel
 from fedn.network.storage.statestore.stores.store import MongoDBStore, Session, SQLStore, Store
 
 from .shared import EntityNotFound, from_document
diff --git a/fedn/network/storage/statestore/stores/session_store.py b/fedn/network/storage/statestore/stores/session_store.py
index 16ece2bc8..b8f5c8177 100644
--- a/fedn/network/storage/statestore/stores/session_store.py
+++ b/fedn/network/storage/statestore/stores/session_store.py
@@ -9,9 +9,10 @@
 from sqlalchemy.sql import text
 
 from fedn.network.storage.statestore.stores.shared import EntityNotFound, from_document
-from fedn.network.storage.statestore.stores.sql_models import SessionConfigModel, SessionModel
-from fedn.network.storage.statestore.stores.store import MongoDBStore, SQLStore, Store
+from fedn.network.storage.statestore.stores.sql.shared import SessionConfigModel, SessionModel
+from fedn.network.storage.statestore.stores.store import MongoDBStore
 from fedn.network.storage.statestore.stores.store import Session as SQLSession
+from fedn.network.storage.statestore.stores.store import SQLStore, Store
 
 
 class SessionConfig:
diff --git a/fedn/network/storage/statestore/stores/sql_models.py b/fedn/network/storage/statestore/stores/sql/shared.py
similarity index 100%
rename from fedn/network/storage/statestore/stores/sql_models.py
rename to fedn/network/storage/statestore/stores/sql/shared.py