diff --git a/api/chalicelib/core/autocomplete/__init__.py b/api/chalicelib/core/autocomplete/__init__.py
index e69de29bb..0186c2f29 100644
--- a/api/chalicelib/core/autocomplete/__init__.py
+++ b/api/chalicelib/core/autocomplete/__init__.py
@@ -0,0 +1,11 @@
+import logging
+
+from decouple import config
+
+logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
+
+if config("EXP_AUTOCOMPLETE", cast=bool, default=False):
+    logging.info(">>> Using experimental autocomplete")
+    from . import autocomplete_ch as autocomplete
+else:
+    from . import autocomplete
diff --git a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py b/api/chalicelib/core/autocomplete/autocomplete_ch.py
similarity index 100%
rename from ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
rename to api/chalicelib/core/autocomplete/autocomplete_ch.py
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index 062cde81f..d5392c84d 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -187,7 +187,7 @@ Pipfile.lock
 /chalicelib/core/announcements.py
 /chalicelib/core/assist.py
 /chalicelib/core/authorizers.py
-/chalicelib/core/autocomplete/autocomplete.py
+/chalicelib/core/autocomplete
 /chalicelib/core/boarding.py
 /chalicelib/core/canvas.py
 /chalicelib/core/collaborations/__init__.py
diff --git a/ee/api/chalicelib/core/autocomplete/__init__.py b/ee/api/chalicelib/core/autocomplete/__init__.py
deleted file mode 100644
index 0186c2f29..000000000
--- a/ee/api/chalicelib/core/autocomplete/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import logging
-
-from decouple import config
-
-logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
-
-if config("EXP_AUTOCOMPLETE", cast=bool, default=False):
-    logging.info(">>> Using experimental autocomplete")
-    from . import autocomplete_ch as autocomplete
-else:
-    from . import autocomplete
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index 3162b3d4e..2e42c9d29 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -9,7 +9,7 @@ rm -rf ./build_crons.sh
 rm -rf ./chalicelib/core/announcements.py
 rm -rf ./chalicelib/core/assist.py
 rm -rf ./chalicelib/core/authorizers.py
-rm -rf ./chalicelib/core/autocomplete/autocomplete.py
+rm -rf ./chalicelib/core/autocomplete
 rm -rf ./chalicelib/core/collaborations/__init__.py
 rm -rf ./chalicelib/core/collaborations/collaboration_base.py
 rm -rf ./chalicelib/core/collaborations/collaboration_msteams.py