diff --git a/api/chalicelib/core/sessions/sessions_devtool/__init__.py b/api/chalicelib/core/sessions/sessions_devtool/__init__.py
new file mode 100644
index 000000000..c4b9d9a37
--- /dev/null
+++ b/api/chalicelib/core/sessions/sessions_devtool/__init__.py
@@ -0,0 +1 @@
+from .sessions_devtool import *
diff --git a/api/chalicelib/core/sessions/sessions_devtool.py b/api/chalicelib/core/sessions/sessions_devtool/sessions_devtool.py
similarity index 81%
rename from api/chalicelib/core/sessions/sessions_devtool.py
rename to api/chalicelib/core/sessions/sessions_devtool/sessions_devtool.py
index 04b6e7236..5d226f287 100644
--- a/api/chalicelib/core/sessions/sessions_devtool.py
+++ b/api/chalicelib/core/sessions/sessions_devtool/sessions_devtool.py
@@ -4,7 +4,7 @@ import schemas
 from chalicelib.utils.storage import StorageClient
 
 
-def __get_devtools_keys(project_id, session_id):
+def get_devtools_keys(project_id, session_id):
     params = {
         "sessionId": session_id,
         "projectId": project_id
@@ -16,7 +16,7 @@ def __get_devtools_keys(project_id, session_id):
 
 def get_urls(session_id, project_id, context: schemas.CurrentContext, check_existence: bool = True):
     results = []
-    for k in __get_devtools_keys(project_id=project_id, session_id=session_id):
+    for k in get_devtools_keys(project_id=project_id, session_id=session_id):
         if check_existence and not StorageClient.exists(bucket=config("sessions_bucket"), key=k):
             continue
         results.append(StorageClient.get_presigned_url_for_sharing(
@@ -29,5 +29,5 @@ def get_urls(session_id, project_id, context: schemas.CurrentContext, check_exis
 
 def delete_mobs(project_id, session_ids):
     for session_id in session_ids:
-        for k in __get_devtools_keys(project_id=project_id, session_id=session_id):
+        for k in get_devtools_keys(project_id=project_id, session_id=session_id):
             StorageClient.tag_for_deletion(bucket=config("sessions_bucket"), key=k)
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index 449b562e1..cbd047d00 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -215,7 +215,7 @@ Pipfile.lock
 /chalicelib/core/saved_search.py
 /chalicelib/core/sessions/sessions.py
 /chalicelib/core/sessions/sessions_ch.py
-/chalicelib/core/sessions/sessions_devtool.py
+/chalicelib/core/sessions/sessions_devtool/sessions_devtool.py
 /chalicelib/core/sessions/sessions_favorite.py
 /chalicelib/core/sessions/sessions_assignments.py
 /chalicelib/core/sessions/sessions_metas.py
diff --git a/ee/api/chalicelib/core/sessions/__init__.py b/ee/api/chalicelib/core/sessions/__init__.py
index 9ae268be6..e03eb42f3 100644
--- a/ee/api/chalicelib/core/sessions/__init__.py
+++ b/ee/api/chalicelib/core/sessions/__init__.py
@@ -13,6 +13,5 @@ else:
     from . import sessions
     from . import sessions_search_exp
 
-from chalicelib.core.sessions import sessions_devtool_ee as sessions_devtool
 from chalicelib.core.sessions import sessions_viewed_ee as sessions_viewed
 from chalicelib.core.sessions import sessions_favorite_ee as sessions_favorite
diff --git a/ee/api/chalicelib/core/sessions/sessions_devtool/__init__.py b/ee/api/chalicelib/core/sessions/sessions_devtool/__init__.py
new file mode 100644
index 000000000..354a6a6f5
--- /dev/null
+++ b/ee/api/chalicelib/core/sessions/sessions_devtool/__init__.py
@@ -0,0 +1,3 @@
+from .sessions_devtool import *
+
+from .sessions_devtool_ee import get_urls
diff --git a/ee/api/chalicelib/core/sessions/sessions_devtool_ee.py b/ee/api/chalicelib/core/sessions/sessions_devtool/sessions_devtool_ee.py
similarity index 73%
rename from ee/api/chalicelib/core/sessions/sessions_devtool_ee.py
rename to ee/api/chalicelib/core/sessions/sessions_devtool/sessions_devtool_ee.py
index e62177236..bd1ee6678 100644
--- a/ee/api/chalicelib/core/sessions/sessions_devtool_ee.py
+++ b/ee/api/chalicelib/core/sessions/sessions_devtool/sessions_devtool_ee.py
@@ -1,13 +1,14 @@
 from fastapi.security import SecurityScopes
 
+import schemas
 from chalicelib.core import permissions
-from chalicelib.core.sessions.sessions_devtool import *
+from .sessions_devtool import get_urls as _get_urls
 
-_get_urls = get_urls
 SCOPES = SecurityScopes([schemas.Permissions.DEV_TOOLS])
 
 
 def get_urls(session_id, project_id, context: schemas.CurrentContext, check_existence: bool = True):
+    print("1>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
     if not permissions.check(security_scopes=SCOPES, context=context):
         return []
     return _get_urls(session_id=session_id, project_id=project_id, context=context, check_existence=check_existence)
diff --git a/ee/api/chalicelib/core/sessions/sessions_favorite_ee.py b/ee/api/chalicelib/core/sessions/sessions_favorite_ee.py
index 0b3d1b065..a8de1d768 100644
--- a/ee/api/chalicelib/core/sessions/sessions_favorite_ee.py
+++ b/ee/api/chalicelib/core/sessions/sessions_favorite_ee.py
@@ -4,7 +4,7 @@ from decouple import config
 
 import schemas
 from chalicelib.core.sessions import sessions_mobs, sessions_devtool
-from chalicelib.core.sessions.sessions_favorite import add_favorite_session, remove_favorite_session, \
+from .sessions_favorite import add_favorite_session, remove_favorite_session, \
     favorite_session_exists
 from chalicelib.utils import ch_client, exp_ch_helper
 from chalicelib.utils.storage import extra
@@ -33,7 +33,7 @@ def remove_favorite_session(context: schemas.CurrentContext, project_id, session
 def favorite_session(context: schemas.CurrentContext, project_id, session_id):
     keys = sessions_mobs.__get_mob_keys(project_id=project_id, session_id=session_id)
     keys += sessions_mobs.__get_mob_keys_deprecated(session_id=session_id)  # To support old sessions
-    keys += sessions_devtool.__get_devtools_keys(project_id=project_id, session_id=session_id)
+    keys += sessions_devtool.get_devtools_keys(project_id=project_id, session_id=session_id)
 
     if favorite_session_exists(user_id=context.user_id, session_id=session_id):
         tag = config('RETENTION_D_VALUE', default='default')
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index 696ceb4aa..c59ccbbda 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -36,7 +36,7 @@ rm -rf ./chalicelib/core/mobile.py
 rm -rf ./chalicelib/core/saved_search.py
 rm -rf ./chalicelib/core/sessions/sessions.py
 rm -rf ./chalicelib/core/sessions/sessions_ch.py
-rm -rf ./chalicelib/core/sessions/sessions_devtool.py
+rm -rf ./chalicelib/core/sessions/sessions_devtool/sessions_devtool.py
 rm -rf ./chalicelib/core/sessions/sessions_favorite.py
 rm -rf ./chalicelib/core/sessions/sessions_assignments.py
 rm -rf ./chalicelib/core/sessions/sessions_metas.py