diff --git a/api/chalicelib/core/sessions/sessions_favorite/__init__.py b/api/chalicelib/core/sessions/sessions_favorite/__init__.py
new file mode 100644
index 000000000..fb38a6706
--- /dev/null
+++ b/api/chalicelib/core/sessions/sessions_favorite/__init__.py
@@ -0,0 +1 @@
+from .sessions_favorite import *
diff --git a/api/chalicelib/core/sessions/sessions_favorite.py b/api/chalicelib/core/sessions/sessions_favorite/sessions_favorite.py
similarity index 100%
rename from api/chalicelib/core/sessions/sessions_favorite.py
rename to api/chalicelib/core/sessions/sessions_favorite/sessions_favorite.py
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index cbd047d00..ff714c1d0 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -216,7 +216,7 @@ Pipfile.lock
 /chalicelib/core/sessions/sessions.py
 /chalicelib/core/sessions/sessions_ch.py
 /chalicelib/core/sessions/sessions_devtool/sessions_devtool.py
-/chalicelib/core/sessions/sessions_favorite.py
+/chalicelib/core/sessions/sessions_favorite/sessions_favorite.py
 /chalicelib/core/sessions/sessions_assignments.py
 /chalicelib/core/sessions/sessions_metas.py
 /chalicelib/core/sessions/sessions_mobs.py
diff --git a/ee/api/chalicelib/core/sessions/__init__.py b/ee/api/chalicelib/core/sessions/__init__.py
index e03eb42f3..dc1dd4401 100644
--- a/ee/api/chalicelib/core/sessions/__init__.py
+++ b/ee/api/chalicelib/core/sessions/__init__.py
@@ -14,4 +14,3 @@ else:
     from . import sessions_search_exp
 
 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_favorite/__init__.py b/ee/api/chalicelib/core/sessions/sessions_favorite/__init__.py
new file mode 100644
index 000000000..3b55a6730
--- /dev/null
+++ b/ee/api/chalicelib/core/sessions/sessions_favorite/__init__.py
@@ -0,0 +1,2 @@
+from .sessions_favorite import *
+from .sessions_favorite_ee import *
diff --git a/ee/api/chalicelib/core/sessions/sessions_favorite_ee.py b/ee/api/chalicelib/core/sessions/sessions_favorite/sessions_favorite_ee.py
similarity index 95%
rename from ee/api/chalicelib/core/sessions/sessions_favorite_ee.py
rename to ee/api/chalicelib/core/sessions/sessions_favorite/sessions_favorite_ee.py
index a8de1d768..68390b8bf 100644
--- a/ee/api/chalicelib/core/sessions/sessions_favorite_ee.py
+++ b/ee/api/chalicelib/core/sessions/sessions_favorite/sessions_favorite_ee.py
@@ -4,14 +4,13 @@ from decouple import config
 
 import schemas
 from chalicelib.core.sessions import sessions_mobs, sessions_devtool
-from .sessions_favorite import add_favorite_session, remove_favorite_session, \
+from .sessions_favorite import add_favorite_session as _add_favorite_session, \
+    remove_favorite_session as _remove_favorite_session, \
     favorite_session_exists
 from chalicelib.utils import ch_client, exp_ch_helper
 from chalicelib.utils.storage import extra
 
 logger = logging.getLogger(__name__)
-_add_favorite_session = add_favorite_session
-_remove_favorite_session = remove_favorite_session
 
 
 def add_favorite_session(context: schemas.CurrentContext, project_id, session_id):
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index c59ccbbda..3851b99df 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -37,7 +37,7 @@ 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/sessions_devtool.py
-rm -rf ./chalicelib/core/sessions/sessions_favorite.py
+rm -rf ./chalicelib/core/sessions/sessions_favorite/sessions_favorite.py
 rm -rf ./chalicelib/core/sessions/sessions_assignments.py
 rm -rf ./chalicelib/core/sessions/sessions_metas.py
 rm -rf ./chalicelib/core/sessions/sessions_mobs.py