diff --git a/lms/envs/common.py b/lms/envs/common.py
index 336c47f715..db156ef3f2 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -301,11 +301,19 @@ PIPELINE_CSS = {
 
 PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss', 'sass/ie.scss']
 
+courseware_only_js = [PROJECT_ROOT / 'static/coffee/src/' + pth + '.coffee' for pth in ['courseware', 'histogram', 'navigation', 'time', ] ]
+courseware_only_js += [pth for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/src/modules/**/*.coffee') ]
+
 PIPELINE_JS = {
     'application': {
-        'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/src/**/*.coffee')],
+        # Application will contain all paths not in courseware_only_js
+        'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/src/**/*.coffee') if pth not in courseware_only_js],
         'output_filename': 'js/application.js'
     },
+    'courseware' : {
+        'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in courseware_only_js],
+        'output_filename': 'js/courseware.js'
+    },
     'spec': {
         'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/spec/**/*.coffee')],
         'output_filename': 'js/spec.js'
diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index 599383c3e2..1a72a6eab7 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -4,15 +4,46 @@
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
 <%block name="headextra">
-<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
+  <link rel="stylesheet" href="${static.url('css/vendor/jquery.treeview.css')}" type="text/css" media="all" />
+
+  ## codemirror
+  <link rel="stylesheet" href="/static/css/codemirror.css" type="text/css" media="all" />
+  <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
+
+  ## alternate codemirror
+  ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/lib/codemirror.js')}"></script>
+  ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/xml/xml.js')}"></script>
+  ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/python/python.js')}"></script>
+
+  ## image input: for clicking on images (see imageinput.html)
+  <script type="text/javascript" src="${static.url('js/vendor/imageinput.js')}"></script>
+
+  ## TODO (cpennington): Remove this when we have a good way for modules to specify js to load on the page
+  ## and in the wiki
+  <script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
+  
+  
+  % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
+   <%static:js group='courseware'/>
+  % endif
+
+  % if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
+    % for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['courseware']['source_filenames'] ]:
+      <script type="text/javascript" src="${jsfn}"></script>
+    % endfor
+  % endif
+  
+
+  <%include file="mathjax_include.html" />
 </%block>
 
 <%block name="js_extra">
-<!-- TODO: http://docs.jquery.com/Plugins/Validation -->
-<script type="text/javascript">
-  document.write('\x3Cscript type="text/javascript" src="' +
-      document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
-</script>
+  <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
+  <script type="text/javascript">
+    document.write('\x3Cscript type="text/javascript" src="' +
+        document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
+  </script>
 </%block>
 
 <%include file="course_navigation.html" args="active_page='courseware'" />
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 245d1b4737..6182ecf1b2 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -7,7 +7,6 @@
   <link rel="icon" type="image/image/x-icon" href="${static.url('images/favicon.ico')}" />
   
   <link href='http://fonts.googleapis.com/css?family=Open+Sans:800italic,400,800' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="${static.url('css/vendor/jquery.treeview.css')}" type="text/css" media="all" />
 
 % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
  <%static:css group='application'/>
@@ -30,10 +29,6 @@
   <script type="text/javascript" src="${static.url('js/vendor/jquery.qtip.min.js')}"></script>
   <script type="text/javascript" src="${static.url('js/form.ext.js')}"></script>
 
-  ## TODO (cpennington): Remove this when we have a good way for modules to specify js to load on the page
-  ## and in the wiki
-  <script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
-
 % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
  <%static:js group='application'/>
 % endif
@@ -44,29 +39,12 @@
   % endfor
 % endif
 
-## codemirror
-  <link rel="stylesheet" href="/static/css/codemirror.css" type="text/css" media="all" />
-  <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
-
-## alternate codemirror
-##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/lib/codemirror.js')}"></script>
-##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/xml/xml.js')}"></script>
-##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/python/python.js')}"></script>
-
-## image input: for clicking on images (see imageinput.html)
-  <script type="text/javascript" src="${static.url('js/vendor/imageinput.js')}"></script>
-
-##  <script type="text/javascript">
-##    var codemirror_set = {};		// track all codemirror textareas, so they can be refreshed on page changes
-##  </script>
-
   <!--[if lt IE 9]>
   <script src="${static.url('js/html5shiv.js')}"></script>
   <![endif]-->
 
  <%block name="headextra"/>
 
-  <%include file="mathjax_include.html" />
   <meta name="path_prefix" content="${MITX_ROOT_URL}">
 </head>
 
diff --git a/lms/templates/simplewiki/simplewiki_base.html b/lms/templates/simplewiki/simplewiki_base.html
index e3da3a754d..b70dab9f40 100644
--- a/lms/templates/simplewiki/simplewiki_base.html
+++ b/lms/templates/simplewiki/simplewiki_base.html
@@ -11,6 +11,10 @@
 <%block name="headextra">
 <script type="text/javascript" src="${static.url('js/simplewiki-AutoSuggest_c_2.0.js')}"></script>
 
+## TODO (cpennington): Remove this when we have a good way for modules to specify js to load on the page
+## and in the wiki
+<script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
+
   <script type="text/javascript">
     function set_related_article_id(s) {
       document.getElementById('wiki_related_input_id').value = s.id;