diff --git a/cms/static/js/main.js b/cms/static/cms/js/main.js
similarity index 92%
rename from cms/static/js/main.js
rename to cms/static/cms/js/main.js
index d69f68f152..0cae898de3 100644
--- a/cms/static/js/main.js
+++ b/cms/static/cms/js/main.js
@@ -34,9 +34,7 @@
                         message = str.truncate(jqXHR.responseText, 300);
                     }
                 } else {
-                    message = gettext('This may be happening because of an error with our server' +
-                                      'or your internet connection. Try refreshing the page or making' +
-                                      'sure you are online.');
+                    message = gettext('This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.');  //jshint ignore:line
                 }
                 msg = new NotificationView.Error({
                     'title': gettext("Studio's having trouble saving your work"),
diff --git a/cms/static/cms/js/require-config.js b/cms/static/cms/js/require-config.js
index 964964b0cb..c8834969b6 100644
--- a/cms/static/cms/js/require-config.js
+++ b/cms/static/cms/js/require-config.js
@@ -247,7 +247,7 @@
                 exports: 'XBlock',
                 deps: ['xblock/core']
             },
-            'js/main': {
+            'cms/js/main': {
                 deps: ['coffee/src/ajax_prefix']
             },
             'js/src/logger': {
diff --git a/cms/static/cms/js/spec/main.js b/cms/static/cms/js/spec/main.js
index 05e30ae3bf..2262e4883f 100644
--- a/cms/static/cms/js/spec/main.js
+++ b/cms/static/cms/js/spec/main.js
@@ -199,7 +199,7 @@
             'mock-ajax': {
                 deps: ['jquery']
             },
-            'js/main': {
+            'cms/js/main': {
                 deps: ['coffee/src/ajax_prefix']
             },
             'coffee/src/ajax_prefix': {
@@ -217,6 +217,7 @@
     jasmine.getFixtures().fixturesPath += 'coffee/fixtures';
 
     testFiles = [
+        'cms/js/spec/main_spec',
         'cms/js/spec/xblock/cms.runtime.v1_spec',
         'coffee/spec/models/course_spec',
         'coffee/spec/models/metadata_spec',
@@ -229,7 +230,6 @@
         'coffee/spec/views/metadata_edit_spec',
         'coffee/spec/views/textbook_spec',
         'coffee/spec/views/upload_spec',
-        'js/spec/main_spec',
         'js/spec/video/transcripts/utils_spec',
         'js/spec/video/transcripts/editor_spec',
         'js/spec/video/transcripts/videolist_spec',
diff --git a/cms/static/js/spec/main_spec.js b/cms/static/cms/js/spec/main_spec.js
similarity index 77%
rename from cms/static/js/spec/main_spec.js
rename to cms/static/cms/js/spec/main_spec.js
index e2805ea918..235ce31e96 100644
--- a/cms/static/js/spec/main_spec.js
+++ b/cms/static/cms/js/spec/main_spec.js
@@ -1,10 +1,10 @@
 (function(sandbox) {
     'use strict';
-    require(["jquery", "backbone", "js/main", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "jquery.cookie"],
+    require(["jquery", "backbone", "cms/js/main", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "jquery.cookie"],
             function($, Backbone, main, AjaxHelpers) {
         describe("CMS", function() {
-            return it("should initialize URL", function() {
-                return expect(window.CMS.URL).toBeDefined();
+            it("should initialize URL", function() {
+                expect(window.CMS.URL).toBeDefined();
             });
         });
         describe("main helper", function() {
@@ -22,17 +22,17 @@
                 return $.ajaxSettings;
             });
             it("turn on Backbone emulateHTTP", function() {
-                return expect(Backbone.emulateHTTP).toBeTruthy();
+                expect(Backbone.emulateHTTP).toBeTruthy();
             });
-            return it("setup AJAX CSRF token", function() {
-                return expect($.ajaxSettings.headers["X-CSRFToken"]).toEqual("stubCSRFToken");
+            it("setup AJAX CSRF token", function() {
+                expect($.ajaxSettings.headers["X-CSRFToken"]).toEqual("stubCSRFToken");
             });
         });
         describe("AJAX Errors", function() {
             var server;
             server = null;
             beforeEach(function() {
-                return appendSetFixtures(sandbox({
+                appendSetFixtures(sandbox({
                     id: "page-notification"
                 }));
             });
@@ -49,7 +49,7 @@
                 $.ajax("/test");
                 expect($("#page-notification")).toBeEmpty();
                 server.respond();
-                return expect($("#page-notification")).toBeEmpty();
+                expect($("#page-notification")).toBeEmpty();
             });
             it("AJAX request with error should pop an error notification", function() {
                 server = AjaxHelpers.server([
@@ -60,7 +60,7 @@
                 $.ajax("/test");
                 server.respond();
                 expect($("#page-notification")).not.toBeEmpty();
-                return expect($("#page-notification")).toContainElement('div.wrapper-notification-error');
+                expect($("#page-notification")).toContainElement('div.wrapper-notification-error');
             });
             it("can override AJAX request with error so it does not pop an error notification", function() {
                 server = AjaxHelpers.server([
@@ -73,7 +73,7 @@
                     notifyOnError: false
                 });
                 server.respond();
-                return expect($("#page-notification")).toBeEmpty();
+                expect($("#page-notification")).toBeEmpty();
             });
         });
     });
diff --git a/cms/static/cms/js/spec/main_squire.js b/cms/static/cms/js/spec/main_squire.js
index 9cc9d7659e..afc62e0092 100644
--- a/cms/static/cms/js/spec/main_squire.js
+++ b/cms/static/cms/js/spec/main_squire.js
@@ -174,7 +174,7 @@
                 exports: 'XBlock',
                 deps: ['xblock/core']
             },
-            'js/main': {
+            'cms/js/main': {
                 deps: ['coffee/src/ajax_prefix']
             },
             'coffee/src/ajax_prefix': {
diff --git a/cms/static/coffee/spec/models/textbook_spec.coffee b/cms/static/coffee/spec/models/textbook_spec.coffee
index 0d6145d2e5..dc10df8a47 100644
--- a/cms/static/coffee/spec/models/textbook_spec.coffee
+++ b/cms/static/coffee/spec/models/textbook_spec.coffee
@@ -1,5 +1,5 @@
 
-define ["backbone", "js/models/textbook", "js/collections/textbook", "js/models/chapter", "js/collections/chapter", "js/main"],
+define ["backbone", "js/models/textbook", "js/collections/textbook", "js/models/chapter", "js/collections/chapter", "cms/js/main"],
 (Backbone, Textbook, TextbookSet, Chapter, ChapterSet, main) ->
 
     describe "Textbook model", ->
diff --git a/cms/static/coffee/spec/views/metadata_edit_spec.coffee b/cms/static/coffee/spec/views/metadata_edit_spec.coffee
index 17df629586..3eb5d41f2b 100644
--- a/cms/static/coffee/spec/views/metadata_edit_spec.coffee
+++ b/cms/static/coffee/spec/views/metadata_edit_spec.coffee
@@ -1,4 +1,4 @@
-define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "js/main"],
+define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "cms/js/main"],
 (MetadataModel, MetadataCollection, MetadataView, main) ->
   verifyInputType = (input, expectedType) ->
       # Some browsers (e.g. FireFox) do not support the "number"
diff --git a/cms/static/js/certificates/models/certificate.js b/cms/static/js/certificates/models/certificate.js
index b6411faea6..5518867312 100644
--- a/cms/static/js/certificates/models/certificate.js
+++ b/cms/static/js/certificates/models/certificate.js
@@ -6,7 +6,7 @@ define([
         'backbone-relational',
         'backbone.associations',
         'gettext',
-        'js/main',
+        'cms/js/main',
         'js/certificates/models/signatory',
         'js/certificates/collections/signatories'
     ],
diff --git a/cms/static/js/factories/base.js b/cms/static/js/factories/base.js
index 21ca8a49f2..ac5a706c62 100644
--- a/cms/static/js/factories/base.js
+++ b/cms/static/js/factories/base.js
@@ -1,2 +1,2 @@
-define(['js/base', 'js/main', 'js/src/logger', 'datepair', 'accessibility',
+define(['js/base', 'cms/js/main', 'js/src/logger', 'datepair', 'accessibility',
 'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']);
diff --git a/cms/static/js/factories/container.js b/cms/static/js/factories/container.js
index af6532e34b..9f780111dd 100644
--- a/cms/static/js/factories/container.js
+++ b/cms/static/js/factories/container.js
@@ -1,6 +1,6 @@
 define([
     'jquery', 'underscore', 'js/models/xblock_container_info', 'js/views/pages/container',
-    'js/collections/component_template', 'xmodule', 'js/main',
+    'js/collections/component_template', 'xmodule', 'cms/js/main',
     'xblock/cms.runtime.v1'
 ],
 function($, _, XBlockContainerInfo, ContainerPage, ComponentTemplates, xmoduleLoader) {
diff --git a/cms/static/js/factories/edit_tabs.js b/cms/static/js/factories/edit_tabs.js
index 376952dcb5..c6f8f930e9 100644
--- a/cms/static/js/factories/edit_tabs.js
+++ b/cms/static/js/factories/edit_tabs.js
@@ -1,5 +1,5 @@
 define([
-    'js/models/explicit_url', 'js/views/tabs', 'xmodule', 'js/main', 'xblock/cms.runtime.v1'
+    'js/models/explicit_url', 'js/views/tabs', 'xmodule', 'cms/js/main', 'xblock/cms.runtime.v1'
 ], function (TabsModel, TabsEditView, xmoduleLoader) {
     'use strict';
     return function (courseLocation, explicitUrl) {
diff --git a/cms/static/js/factories/library.js b/cms/static/js/factories/library.js
index 3b558c3aff..83412b0339 100644
--- a/cms/static/js/factories/library.js
+++ b/cms/static/js/factories/library.js
@@ -1,6 +1,6 @@
 define([
     'jquery', 'underscore', 'js/models/xblock_info', 'js/views/pages/paged_container',
-    'js/views/library_container', 'js/collections/component_template', 'xmodule', 'js/main',
+    'js/views/library_container', 'js/collections/component_template', 'xmodule', 'cms/js/main',
     'xblock/cms.runtime.v1'
 ],
 function($, _, XBlockInfo, PagedContainerPage, LibraryContainerView, ComponentTemplates, xmoduleLoader) {
diff --git a/cms/static/js/models/group_configuration.js b/cms/static/js/models/group_configuration.js
index 043b6f0495..7211ddd56d 100644
--- a/cms/static/js/models/group_configuration.js
+++ b/cms/static/js/models/group_configuration.js
@@ -1,6 +1,6 @@
 define([
     'backbone', 'underscore', 'gettext', 'js/models/group', 'js/collections/group',
-    'backbone.associations', 'js/main'
+    'backbone.associations', 'cms/js/main'
 ],
 function(Backbone, _, gettext, GroupModel, GroupCollection) {
     'use strict';
diff --git a/cms/static/js/models/textbook.js b/cms/static/js/models/textbook.js
index f0b8fe3d34..e796a52474 100644
--- a/cms/static/js/models/textbook.js
+++ b/cms/static/js/models/textbook.js
@@ -1,5 +1,5 @@
 define(["backbone", "underscore", "gettext", "js/models/chapter", "js/collections/chapter",
-        "backbone.associations", "js/main"],
+        "backbone.associations", "cms/js/main"],
     function(Backbone, _, gettext, ChapterModel, ChapterCollection) {
 
     var Textbook = Backbone.AssociatedModel.extend({
diff --git a/cms/static/js/spec/models/group_configuration_spec.js b/cms/static/js/spec/models/group_configuration_spec.js
index 75ea29a165..30d2b19955 100644
--- a/cms/static/js/spec/models/group_configuration_spec.js
+++ b/cms/static/js/spec/models/group_configuration_spec.js
@@ -1,5 +1,5 @@
 define([
-    'backbone', 'js/main', 'js/models/group_configuration',
+    'backbone', 'cms/js/main', 'js/models/group_configuration',
     'js/models/group', 'js/collections/group', 'squire'
 ], function (Backbone, main, GroupConfigurationModel, GroupModel, GroupCollection, Squire) {
     'use strict';
diff --git a/cms/static/js/spec/views/container_spec.js b/cms/static/js/spec/views/container_spec.js
index 170f0ad8d3..49b796663e 100644
--- a/cms/static/js/spec/views/container_spec.js
+++ b/cms/static/js/spec/views/container_spec.js
@@ -1,6 +1,6 @@
 define([ "jquery", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "js/spec_helpers/edit_helpers",
     "js/views/container", "js/models/xblock_info", "jquery.simulate",
-    "xmodule", "js/main", "xblock/cms.runtime.v1"],
+    "xmodule", "cms/js/main", "xblock/cms.runtime.v1"],
     function ($, AjaxHelpers, EditHelpers, ContainerView, XBlockInfo) {
 
         describe("Container View", function () {
diff --git a/cms/static/js/spec/views/xblock_spec.js b/cms/static/js/spec/views/xblock_spec.js
index 9f173a653b..4dedc78a89 100644
--- a/cms/static/js/spec/views/xblock_spec.js
+++ b/cms/static/js/spec/views/xblock_spec.js
@@ -1,5 +1,5 @@
 define(["jquery", "URI", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "common/js/components/utils/view_utils",
-        "js/views/xblock", "js/models/xblock_info", "xmodule", "js/main", "xblock/cms.runtime.v1"],
+        "js/views/xblock", "js/models/xblock_info", "xmodule", "cms/js/main", "xblock/cms.runtime.v1"],
     function ($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
         "use strict";
         describe("XBlockView", function() {
diff --git a/cms/static/js/spec_helpers/edit_helpers.js b/cms/static/js/spec_helpers/edit_helpers.js
index de1bc47b60..7c355efc62 100644
--- a/cms/static/js/spec_helpers/edit_helpers.js
+++ b/cms/static/js/spec_helpers/edit_helpers.js
@@ -3,7 +3,7 @@
  */
 define(["jquery", "underscore", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers",
         "common/js/spec_helpers/template_helpers", "js/spec_helpers/modal_helpers", "js/views/modals/edit_xblock",
-        "js/collections/component_template", "xmodule", "js/main", "xblock/cms.runtime.v1"],
+        "js/collections/component_template", "xmodule", "cms/js/main", "xblock/cms.runtime.v1"],
     function($, _, AjaxHelpers, TemplateHelpers, modal_helpers, EditXBlockModal, ComponentTemplates) {
 
         var installMockXBlock, uninstallMockXBlock, installMockXModule, uninstallMockXModule,
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index d8bdda0c98..a5c81fceae 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -22,6 +22,7 @@ var options = {
     // Otherwise Istanbul which is used for coverage tracking will cause tests to not run.
     sourceFiles: [
         {pattern: 'coffee/src/**/!(*spec).js'},
+        {pattern: 'cms/js/**/!(*spec|djangojs).js'},
         {pattern: 'js/**/!(*spec|djangojs).js'}
     ],
 
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 6e0b206040..47ab031232 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -39,7 +39,7 @@ REQUIREJS_WAIT = {
     # Unit page
     re.compile(r'^Unit \|'): [
         "jquery", "js/base", "js/models/xblock_info", "js/views/pages/container",
-        "js/collections/component_template", "xmodule", "js/main", "xblock/cms.runtime.v1"],
+        "js/collections/component_template", "xmodule", "cms/js/main", "xblock/cms.runtime.v1"],
 
     # Content - Outline
     # Note that calling your org, course number, or display name, 'course' will mess this up
@@ -49,18 +49,18 @@ REQUIREJS_WAIT = {
     # Dashboard
     re.compile(r'^Studio Home \|'): [
         "js/sock", "gettext", "js/base",
-        "jquery.ui", "js/main", "underscore"],
+        "jquery.ui", "cms/js/main", "underscore"],
 
     # Upload
     re.compile(r'^\s*Files & Uploads'): [
-        'js/base', 'jquery.ui', 'js/main', 'underscore',
+        'js/base', 'jquery.ui', 'cms/js/main', 'underscore',
         'js/views/assets', 'js/views/asset'
     ],
 
     # Pages
     re.compile(r'^Pages \|'): [
         'js/models/explicit_url', 'js/views/tabs',
-        'xmodule', 'js/main', 'xblock/cms.runtime.v1'
+        'xmodule', 'cms/js/main', 'xblock/cms.runtime.v1'
     ],
 }