diff --git a/api/chalicelib/core/sessions/sessions.py b/api/chalicelib/core/sessions/sessions.py
index f9f8498cb..ba549d55f 100644
--- a/api/chalicelib/core/sessions/sessions.py
+++ b/api/chalicelib/core/sessions/sessions.py
@@ -3,7 +3,7 @@ from typing import List, Union
 
 import schemas
 from chalicelib.core import events, metadata
-from chalicelib.core.sessions import performance_event
+from . import performance_event
 from chalicelib.utils import pg_client, helper, metrics_helper
 from chalicelib.utils import sql_helper as sh
 
diff --git a/api/chalicelib/core/sessions/sessions_assignments.py b/api/chalicelib/core/sessions/sessions_assignments.py
index 88c9919cf..011d18bc1 100644
--- a/api/chalicelib/core/sessions/sessions_assignments.py
+++ b/api/chalicelib/core/sessions/sessions_assignments.py
@@ -1,10 +1,12 @@
-from decouple import config
-from chalicelib.utils import helper
-from chalicelib.utils.TimeUTC import TimeUTC
-from chalicelib.utils import pg_client
-from chalicelib.core.issue_tracking import integrations_manager, base_issue
 import json
 
+from decouple import config
+
+from chalicelib.core.issue_tracking import integrations_manager, base_issue
+from chalicelib.utils import helper
+from chalicelib.utils import pg_client
+from chalicelib.utils.TimeUTC import TimeUTC
+
 
 def __get_saved_data(project_id, session_id, issue_id, tool):
     with pg_client.PostgresClient() as cur:
diff --git a/api/chalicelib/core/sessions/sessions_ch.py b/api/chalicelib/core/sessions/sessions_ch.py
index d6de1f6cf..bc73b26a6 100644
--- a/api/chalicelib/core/sessions/sessions_ch.py
+++ b/api/chalicelib/core/sessions/sessions_ch.py
@@ -3,7 +3,7 @@ from typing import List, Union
 
 import schemas
 from chalicelib.core import events, metadata
-from chalicelib.core.sessions import performance_event, sessions_legacy
+from . import performance_event, sessions as sessions_legacy
 from chalicelib.utils import pg_client, helper, metrics_helper, ch_client, exp_ch_helper
 from chalicelib.utils import sql_helper as sh
 
diff --git a/api/chalicelib/core/sessions/sessions_replay.py b/api/chalicelib/core/sessions/sessions_replay.py
index 7c1f7aff4..b4e9085d1 100644
--- a/api/chalicelib/core/sessions/sessions_replay.py
+++ b/api/chalicelib/core/sessions/sessions_replay.py
@@ -1,7 +1,7 @@
 import schemas
 from chalicelib.core import events, metadata, events_mobile, \
     issues, assist, canvas, user_testing
-from chalicelib.core.sessions import sessions_mobs, sessions_devtool
+from . import sessions_mobs, sessions_devtool
 from chalicelib.utils import errors_helper
 from chalicelib.utils import pg_client, helper
 from chalicelib.core.modules import MOB_KEY, get_file_key
diff --git a/api/chalicelib/core/sessions/sessions_search.py b/api/chalicelib/core/sessions/sessions_search.py
index ac87deec4..6a3c6c8c5 100644
--- a/api/chalicelib/core/sessions/sessions_search.py
+++ b/api/chalicelib/core/sessions/sessions_search.py
@@ -2,7 +2,7 @@ import logging
 
 import schemas
 from chalicelib.core import metadata, projects
-from chalicelib.core.sessions import sessions_favorite, sessions_legacy
+from . import sessions_favorite, sessions as sessions_legacy
 from chalicelib.utils import pg_client, helper
 
 logger = logging.getLogger(__name__)
diff --git a/api/chalicelib/core/sessions/sessions_viewed/__init__.py b/api/chalicelib/core/sessions/sessions_viewed/__init__.py
new file mode 100644
index 000000000..19cead0e3
--- /dev/null
+++ b/api/chalicelib/core/sessions/sessions_viewed/__init__.py
@@ -0,0 +1 @@
+from .sessions_viewed import *
\ No newline at end of file
diff --git a/api/chalicelib/core/sessions/sessions_viewed.py b/api/chalicelib/core/sessions/sessions_viewed/sessions_viewed.py
similarity index 100%
rename from api/chalicelib/core/sessions/sessions_viewed.py
rename to api/chalicelib/core/sessions/sessions_viewed/sessions_viewed.py
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index ff714c1d0..a6c0601d2 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -223,7 +223,7 @@ Pipfile.lock
 /chalicelib/core/sessions/sessions_replay.py
 /chalicelib/core/sessions/sessions_search.py
 /chalicelib/core/sessions/performance_event.py
-/chalicelib/core/sessions/sessions_viewed.py
+/chalicelib/core/sessions/sessions_viewed/sessions_viewed.py
 /chalicelib/core/sessions/unprocessed_sessions.py
 /chalicelib/core/metrics/modules
 /chalicelib/core/socket_ios.py
diff --git a/ee/api/chalicelib/core/sessions/__init__.py b/ee/api/chalicelib/core/sessions/__init__.py
index dc1dd4401..121520536 100644
--- a/ee/api/chalicelib/core/sessions/__init__.py
+++ b/ee/api/chalicelib/core/sessions/__init__.py
@@ -12,5 +12,3 @@ if config("EXP_SESSIONS_SEARCH", cast=bool, default=False):
 else:
     from . import sessions
     from . import sessions_search_exp
-
-from chalicelib.core.sessions import sessions_viewed_ee as sessions_viewed
diff --git a/ee/api/chalicelib/core/sessions/sessions_search_exp.py b/ee/api/chalicelib/core/sessions/sessions_search_exp.py
index 595fba510..ecca97821 100644
--- a/ee/api/chalicelib/core/sessions/sessions_search_exp.py
+++ b/ee/api/chalicelib/core/sessions/sessions_search_exp.py
@@ -3,7 +3,7 @@ import logging
 
 import schemas
 from chalicelib.core import metadata, projects
-from chalicelib.core.sessions import sessions_favorite, sessions_legacy, sessions, sessions_legacy_mobil
+from . import sessions_favorite, sessions as sessions_legacy, sessions_ch as sessions, sessions_legacy_mobil
 from chalicelib.utils import pg_client, helper, ch_client, exp_ch_helper
 
 logger = logging.getLogger(__name__)
diff --git a/ee/api/chalicelib/core/sessions/sessions_viewed/__init__.py b/ee/api/chalicelib/core/sessions/sessions_viewed/__init__.py
new file mode 100644
index 000000000..3a162bde7
--- /dev/null
+++ b/ee/api/chalicelib/core/sessions/sessions_viewed/__init__.py
@@ -0,0 +1,2 @@
+from .sessions_viewed import *
+from .sessions_viewed_ee import *
diff --git a/ee/api/chalicelib/core/sessions/sessions_viewed_ee.py b/ee/api/chalicelib/core/sessions/sessions_viewed/sessions_viewed_ee.py
similarity index 90%
rename from ee/api/chalicelib/core/sessions/sessions_viewed_ee.py
rename to ee/api/chalicelib/core/sessions/sessions_viewed/sessions_viewed_ee.py
index 0606ff9a7..a9656d8f7 100644
--- a/ee/api/chalicelib/core/sessions/sessions_viewed_ee.py
+++ b/ee/api/chalicelib/core/sessions/sessions_viewed/sessions_viewed_ee.py
@@ -1,9 +1,9 @@
-from chalicelib.utils import ch_client, exp_ch_helper
 import logging
-from decouple import config
-from chalicelib.core.sessions.sessions_viewed import *
 
-_view_session = view_session
+from decouple import config
+
+from chalicelib.utils import ch_client, exp_ch_helper
+from .sessions_viewed import view_session as _view_session
 
 logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
 
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index 3851b99df..a915a2f60 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -44,7 +44,7 @@ rm -rf ./chalicelib/core/sessions/sessions_mobs.py
 rm -rf ./chalicelib/core/sessions/sessions_replay.py
 rm -rf ./chalicelib/core/sessions/sessions_search.py
 rm -rf ./chalicelib/core/sessions/performance_event.py
-rm -rf ./chalicelib/core/sessions/sessions_viewed.py
+rm -rf ./chalicelib/core/sessions/sessions_viewed/sessions_viewed.py
 rm -rf ./chalicelib/core/sessions/unprocessed_sessions.py
 rm -rf ./chalicelib/core/metrics/modules
 rm -rf ./chalicelib/core/socket_ios.py