diff --git a/openedx/core/djangoapps/ace_common/__init__.py b/openedx/core/djangoapps/ace_common/__init__.py
new file mode 100644
index 0000000000..af927a92b1
--- /dev/null
+++ b/openedx/core/djangoapps/ace_common/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'openedx.core.djangoapps.ace_common.apps.AceCommonConfig'
diff --git a/openedx/core/djangoapps/ace_common/apps.py b/openedx/core/djangoapps/ace_common/apps.py
new file mode 100644
index 0000000000..96ba22cd0f
--- /dev/null
+++ b/openedx/core/djangoapps/ace_common/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class AceCommonConfig(AppConfig):
+    name = 'openedx.core.djangoapps.ace_common'
+    verbose_name = _('ACE Common')
diff --git a/openedx/core/djangoapps/schedules/template_context.py b/openedx/core/djangoapps/ace_common/template_context.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/template_context.py
rename to openedx/core/djangoapps/ace_common/template_context.py
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/base_body.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
similarity index 100%
rename from openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/base_body.html
rename to openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/base_head.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_head.html
similarity index 100%
rename from openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/base_head.html
rename to openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_head.html
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/return_to_course_cta.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
similarity index 100%
rename from openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/return_to_course_cta.html
rename to openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/upsell_cta.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/upsell_cta.html
similarity index 100%
rename from openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/upsell_cta.html
rename to openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/upsell_cta.html
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/upsell_cta.txt b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/upsell_cta.txt
similarity index 100%
rename from openedx/core/djangoapps/schedules/templates/schedules/edx_ace/common/upsell_cta.txt
rename to openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/upsell_cta.txt
diff --git a/openedx/core/djangoapps/schedules/templatetags/__init__.py b/openedx/core/djangoapps/ace_common/templatetags/__init__.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/templatetags/__init__.py
rename to openedx/core/djangoapps/ace_common/templatetags/__init__.py
diff --git a/openedx/core/djangoapps/schedules/templatetags/ace.py b/openedx/core/djangoapps/ace_common/templatetags/ace.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/templatetags/ace.py
rename to openedx/core/djangoapps/ace_common/templatetags/ace.py
diff --git a/openedx/core/djangoapps/ace_common/tests/__init__.py b/openedx/core/djangoapps/ace_common/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/djangoapps/schedules/tests/mixins.py b/openedx/core/djangoapps/ace_common/tests/mixins.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/tests/mixins.py
rename to openedx/core/djangoapps/ace_common/tests/mixins.py
diff --git a/openedx/core/djangoapps/schedules/tests/test_templatetags.py b/openedx/core/djangoapps/ace_common/tests/test_templatetags.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/tests/test_templatetags.py
rename to openedx/core/djangoapps/ace_common/tests/test_templatetags.py
diff --git a/openedx/core/djangoapps/schedules/tests/test_tracking.py b/openedx/core/djangoapps/ace_common/tests/test_tracking.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/tests/test_tracking.py
rename to openedx/core/djangoapps/ace_common/tests/test_tracking.py
diff --git a/openedx/core/djangoapps/schedules/tracking.py b/openedx/core/djangoapps/ace_common/tracking.py
similarity index 100%
rename from openedx/core/djangoapps/schedules/tracking.py
rename to openedx/core/djangoapps/ace_common/tracking.py
diff --git a/openedx/core/djangoapps/schedules/README.rst b/openedx/core/djangoapps/schedules/docs/README.rst
similarity index 100%
rename from openedx/core/djangoapps/schedules/README.rst
rename to openedx/core/djangoapps/schedules/docs/README.rst
diff --git a/openedx/core/djangoapps/schedules/img/system_diagram.png b/openedx/core/djangoapps/schedules/docs/img/system_diagram.png
similarity index 100%
rename from openedx/core/djangoapps/schedules/img/system_diagram.png
rename to openedx/core/djangoapps/schedules/docs/img/system_diagram.png