diff --git a/resolvers/author.py b/resolvers/author.py
index 98ba8f34..a8de242f 100644
--- a/resolvers/author.py
+++ b/resolvers/author.py
@@ -10,9 +10,9 @@ from services.schema import mutation, query
 from orm.shout import ShoutAuthor, ShoutTopic
 from orm.topic import Topic
 from orm.author import AuthorFollower, Author, AuthorRating
-from community import followed_communities
-from topic import followed_topics
-from reaction import reacted_shouts_updates as followed_reactions
+from resolvers.community import followed_communities
+from resolvers.topic import followed_topics
+from resolvers.reaction import reacted_shouts_updates as followed_reactions
 
 
 def add_author_stat_columns(q):
diff --git a/resolvers/editor.py b/resolvers/editor.py
index 17aeb848..18860474 100644
--- a/resolvers/editor.py
+++ b/resolvers/editor.py
@@ -6,7 +6,7 @@ from services.db import local_session
 from services.schema import mutation, query
 from orm.shout import Shout, ShoutAuthor, ShoutTopic, ShoutVisibility
 from orm.topic import Topic
-from reaction import reactions_follow, reactions_unfollow
+from resolvers.reaction import reactions_follow, reactions_unfollow
 from services.notify import notify_shout
 
 
diff --git a/services/search.py b/services/search.py
index 3ac05678..f482021f 100644
--- a/services/search.py
+++ b/services/search.py
@@ -2,7 +2,7 @@ import asyncio
 import json
 from services.rediscache import redis
 from orm.shout import Shout
-from resolvers.load import load_shouts_by
+from resolvers.reader import load_shouts_by
 
 
 class SearchService:
diff --git a/services/viewed.py b/services/viewed.py
index 005701f2..ad30fd1c 100644
--- a/services/viewed.py
+++ b/services/viewed.py
@@ -7,7 +7,7 @@ from gql import Client, gql
 from gql.transport.httpx import HTTPXAsyncTransport
 
 from services.db import local_session
-from orm import Topic
+from orm.topic import Topic
 from orm.shout import ShoutTopic, Shout
 
 load_facts = gql(
@@ -72,12 +72,8 @@ class ViewedStorage:
         self = ViewedStorage
         async with self.lock:
             if token:
-                self.client = create_client(
-                    {"Authorization": "Bearer %s" % str(token)}, schema=schema_str
-                )
-                print(
-                    "[services.viewed] * authorized permanentely by ackee.discours.io: %s" % token
-                )
+                self.client = create_client({"Authorization": "Bearer %s" % str(token)}, schema=schema_str)
+                print("[services.viewed] * authorized permanentely by ackee.discours.io: %s" % token)
             else:
                 print("[services.viewed] * please set ACKEE_TOKEN")
                 self.disabled = True
@@ -139,16 +135,12 @@ class ViewedStorage:
         return topic_views
 
     @staticmethod
-    def update_topics( shout_slug):
+    def update_topics(shout_slug):
         """updates topics counters by shout slug"""
         self = ViewedStorage
-        with local_session() as session:    
+        with local_session() as session:
             for [shout_topic, topic] in (
-                session.query(ShoutTopic, Topic)
-                .join(Topic)
-                .join(Shout)
-                .where(Shout.slug == shout_slug)
-                .all()
+                session.query(ShoutTopic, Topic).join(Topic).join(Shout).where(Shout.slug == shout_slug).all()
             ):
                 if not self.by_topics.get(topic.slug):
                     self.by_topics[topic.slug] = {}
@@ -192,10 +184,7 @@ class ViewedStorage:
             if failed == 0:
                 when = datetime.now(timezone.utc) + timedelta(seconds=self.period)
                 t = format(when.astimezone().isoformat())
-                print(
-                    "[services.viewed] ⎩ next update: %s"
-                    % (t.split("T")[0] + " " + t.split("T")[1].split(".")[0])
-                )
+                print("[services.viewed] ⎩ next update: %s" % (t.split("T")[0] + " " + t.split("T")[1].split(".")[0]))
                 await asyncio.sleep(self.period)
             else:
                 await asyncio.sleep(10)