diff --git a/cms/urls.py b/cms/urls.py
index 811d47657f..47db1c024b 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -44,6 +44,8 @@ urlpatterns = ('',
 
     # temporary landing page for edge
     url(r'^edge$', 'contentstore.views.edge', name='edge'),
+
+    url(r'^heartbeat$', include('heartbeat.urls')),
 )
 
 # User creation and updating views
diff --git a/lms/djangoapps/heartbeat/__init__.py b/common/djangoapps/heartbeat/__init__.py
similarity index 100%
rename from lms/djangoapps/heartbeat/__init__.py
rename to common/djangoapps/heartbeat/__init__.py
diff --git a/lms/djangoapps/heartbeat/urls.py b/common/djangoapps/heartbeat/urls.py
similarity index 100%
rename from lms/djangoapps/heartbeat/urls.py
rename to common/djangoapps/heartbeat/urls.py
diff --git a/lms/djangoapps/heartbeat/views.py b/common/djangoapps/heartbeat/views.py
similarity index 100%
rename from lms/djangoapps/heartbeat/views.py
rename to common/djangoapps/heartbeat/views.py