diff --git a/orm/__init__.py b/orm/__init__.py
index e701d202..81d8b7c2 100644
--- a/orm/__init__.py
+++ b/orm/__init__.py
@@ -1,4 +1,4 @@
-from base.orm import Base, engine
+from services.db import Base, engine
 from orm.shout import Shout
 
 
diff --git a/orm/author.py b/orm/author.py
index 2293a45d..1f83ebbd 100644
--- a/orm/author.py
+++ b/orm/author.py
@@ -2,7 +2,7 @@ from datetime import datetime
 from sqlalchemy import JSON as JSONType
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
-from base.orm import Base, local_session
+from services.db import Base, local_session
 
 
 class AuthorRating(Base):
diff --git a/orm/collection.py b/orm/collection.py
index 9a4fee3b..9bd14742 100644
--- a/orm/collection.py
+++ b/orm/collection.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from sqlalchemy import Column, DateTime, ForeignKey, String
-from base.orm import Base
+from services.db import Base
 
 
 class ShoutCollection(Base):
diff --git a/orm/community.py b/orm/community.py
index e5040ed7..2579a918 100644
--- a/orm/community.py
+++ b/orm/community.py
@@ -2,7 +2,7 @@ from datetime import datetime
 from sqlalchemy import Column, String, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 
-from base.orm import Base, local_session
+from services.db import Base, local_session
 from orm.author import Author
 
 
diff --git a/orm/reaction.py b/orm/reaction.py
index a0fcf05a..3e300922 100644
--- a/orm/reaction.py
+++ b/orm/reaction.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from enum import Enum as Enumeration
 from sqlalchemy import Column, DateTime, Enum, ForeignKey, String
-from base.orm import Base
+from services.db import Base
 
 
 class ReactionKind(Enumeration):
diff --git a/orm/shout.py b/orm/shout.py
index 4178f02c..7a5a65d2 100644
--- a/orm/shout.py
+++ b/orm/shout.py
@@ -11,7 +11,7 @@ from sqlalchemy import (
     JSON,
 )
 from sqlalchemy.orm import column_property, relationship
-from base.orm import Base, local_session
+from services.db import Base, local_session
 from orm.community import Community
 from orm.reaction import Reaction
 from orm.topic import Topic
diff --git a/orm/topic.py b/orm/topic.py
index 9cefd581..af4f56bd 100644
--- a/orm/topic.py
+++ b/orm/topic.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, String
-from base.orm import Base
+from services.db import Base
 
 
 class TopicFollower(Base):
diff --git a/resolvers/author.py b/resolvers/author.py
index 2d1a7b40..ece55200 100644
--- a/resolvers/author.py
+++ b/resolvers/author.py
@@ -4,8 +4,8 @@ from sqlalchemy import and_, func, distinct, select, literal
 from sqlalchemy.orm import aliased
 
 from services.auth import login_required
-from base.orm import local_session
-from base.resolvers import mutation, query
+from services.db import local_session
+from services.schema import mutation, query
 from orm.shout import ShoutAuthor, ShoutTopic
 from orm.topic import Topic
 from orm.author import AuthorFollower, Author, AuthorRating
diff --git a/resolvers/community.py b/resolvers/community.py
index e29a3d0c..bfa12634 100644
--- a/resolvers/community.py
+++ b/resolvers/community.py
@@ -1,5 +1,5 @@
-from base.orm import local_session
-from base.resolvers import query
+from services.db import local_session
+from services.schema import query
 from orm.author import Author
 from orm.community import Community, CommunityAuthor
 from orm.shout import ShoutCommunity
diff --git a/resolvers/editor.py b/resolvers/editor.py
index 36560fa8..4828cc20 100644
--- a/resolvers/editor.py
+++ b/resolvers/editor.py
@@ -4,8 +4,8 @@ from sqlalchemy import and_, select
 from sqlalchemy.orm import joinedload
 
 from services.auth import login_required
-from base.orm import local_session
-from base.resolvers import mutation, query
+from services.db import local_session
+from services.schema import mutation, query
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic
 from reaction import reactions_follow, reactions_unfollow
diff --git a/resolvers/reaction.py b/resolvers/reaction.py
index 21ff5a7a..905fadcf 100644
--- a/resolvers/reaction.py
+++ b/resolvers/reaction.py
@@ -4,8 +4,8 @@ from sqlalchemy.orm import aliased
 from services.presence import notify_reaction
 from services.auth import login_required
 from base.exceptions import OperationNotAllowed
-from base.orm import local_session
-from base.resolvers import mutation, query
+from services.db import local_session
+from services.schema import mutation, query
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutReactionsFollower
 from orm.author import Author