diff --git a/public/app/app.js b/public/app/app.js
index 9c572e80fc2..b15bb43ddf5 100644
--- a/public/app/app.js
+++ b/public/app/app.js
@@ -9,7 +9,6 @@ define([
   'angular-strap',
   'angular-dragdrop',
   'angular-ui',
-  'extend-jquery',
   'bindonce',
   'app/core/core',
 ],
@@ -73,7 +72,6 @@ function (angular, $, _, appLevelRequire) {
     'app/services/all',
     'app/features/all',
     'app/controllers/all',
-    'app/components/partials',
   ];
 
   app.boot = function() {
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index 98f487b236f..6c9d0cea958 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -16,6 +16,9 @@
 ///<amd-dependency path="./directives/value_select_dropdown" />
 ///<amd-dependency path="./routes/all" />
 
+///<amd-dependency path="./jquery_extended" />
+///<amd-dependency path="./partials" />
+
 export * from './directives/array_join'
 export * from './directives/give_focus'
 export * from './filters/filters'
diff --git a/public/app/components/extend-jquery.js b/public/app/core/jquery_extended.js
similarity index 100%
rename from public/app/components/extend-jquery.js
rename to public/app/core/jquery_extended.js
diff --git a/public/app/components/lodash.extended.js b/public/app/core/lodash_extended.js
similarity index 100%
rename from public/app/components/lodash.extended.js
rename to public/app/core/lodash_extended.js
diff --git a/public/app/components/partials.js b/public/app/core/partials.js
similarity index 100%
rename from public/app/components/partials.js
rename to public/app/core/partials.js
diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index cb6258bb92a..56a64c4933f 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -1,7 +1,7 @@
 define([
   'angular',
   'lodash',
-  'app/core/config',
+  'vendor/filesaver'
 ],
 function (angular, _) {
   'use strict';
diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js
index 3ea0068b600..b723660abe7 100644
--- a/public/app/features/dashboard/shareModalCtrl.js
+++ b/public/app/features/dashboard/shareModalCtrl.js
@@ -84,9 +84,9 @@ function (angular, _, require, config) {
 
   module.directive('clipboardButton',function() {
     return function(scope, elem) {
-      require(['ZeroClipboard'], function(ZeroClipboard) {
+      require(['vendor/zero_clipboard'], function(ZeroClipboard) {
         ZeroClipboard.config({
-          swfPath: config.appSubUrl + '/public/vendor/ZeroClipboard.swf'
+          swfPath: config.appSubUrl + '/public/vendor/zero_clipboard.swf'
         });
         new ZeroClipboard(elem[0]);
       });
diff --git a/public/app/components/require.config.js b/public/app/require_config.js
similarity index 91%
rename from public/app/components/require.config.js
rename to public/app/require_config.js
index 1af01a91710..d9f8e90cad9 100644
--- a/public/app/components/require.config.js
+++ b/public/app/require_config.js
@@ -3,13 +3,11 @@ require.config({
   baseUrl: 'public',
 
   paths: {
-    'extend-jquery':          'app/components/extend-jquery',
-    lodash:                   'app/components/lodash.extended',
+    'lodash-src':             'vendor/lodash',
+    lodash:                   'app/core/lodash_extended',
 
     text:                     'vendor/requirejs-text/text',
     moment:                   'vendor/moment',
-    filesaver:                'vendor/filesaver',
-    ZeroClipboard:            'vendor/ZeroClipboard',
     angular:                  'vendor/angular/angular',
     'angular-route':          'vendor/angular-route/angular-route',
     'angular-sanitize':       'vendor/angular-sanitize/angular-sanitize',
@@ -21,10 +19,7 @@ require.config({
     bindonce:                 'vendor/angular-bindonce/bindonce',
     crypto:                   'vendor/crypto.min',
     spectrum:                 'vendor/spectrum',
-
-    'lodash-src':             'vendor/lodash',
     bootstrap:                'vendor/bootstrap/bootstrap',
-
     jquery:                   'vendor/jquery/dist/jquery',
 
     'jquery.flot':             'vendor/flot/jquery.flot',
@@ -42,6 +37,7 @@ require.config({
     'bootstrap-tagsinput':    'vendor/tagsinput/bootstrap-tagsinput',
     'aws-sdk':                'vendor/aws-sdk/dist/aws-sdk.min',
   },
+
   shim: {
 
     spectrum: {
@@ -52,10 +48,6 @@ require.config({
       exports: 'Crypto'
     },
 
-    ZeroClipboard: {
-      exports: 'ZeroClipboard'
-    },
-
     angular: {
       deps: ['jquery'],
       exports: 'angular'
diff --git a/public/test/test-main.js b/public/test/test-main.js
index 82197d75a19..119f1875475 100644
--- a/public/test/test-main.js
+++ b/public/test/test-main.js
@@ -2,7 +2,7 @@ require.config({
   baseUrl: 'http://localhost:9876/base/',
 
   paths: {
-    lodash:                'app/components/lodash.extended',
+    lodash:                'app/core/lodash_extended',
     'lodash-src':          'vendor/lodash',
 
     moment:                'vendor/moment',
@@ -21,7 +21,6 @@ require.config({
     bindonce:                 'vendor/angular-bindonce/bindonce',
     crypto:                   'vendor/crypto.min',
     spectrum:                 'vendor/spectrum',
-
     jquery:                   'vendor/jquery/dist/jquery',
 
     bootstrap:                'vendor/bootstrap/bootstrap',
@@ -40,7 +39,6 @@ require.config({
     'jquery.flot.fillbelow':   'vendor/flot/jquery.flot.fillbelow',
 
     modernizr:                'vendor/modernizr-2.6.1',
-    'aws-sdk':                'vendor/aws-sdk/dist/aws-sdk.min',
   },
 
   shim: {
diff --git a/public/vendor/ZeroClipboard.js b/public/vendor/zero_clipboard.js
similarity index 100%
rename from public/vendor/ZeroClipboard.js
rename to public/vendor/zero_clipboard.js
diff --git a/public/vendor/ZeroClipboard.swf b/public/vendor/zero_clipboard.swf
similarity index 100%
rename from public/vendor/ZeroClipboard.swf
rename to public/vendor/zero_clipboard.swf
diff --git a/public/views/index.html b/public/views/index.html
index d19e244fc99..5b4e2f5bd92 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -19,7 +19,7 @@
 
 		<!-- build:js [[.AppSubUrl]]/app/app.js -->
     <script src="[[.AppSubUrl]]/public/vendor/requirejs/require.js"></script>
-    <script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script>
+    <script src="[[.AppSubUrl]]/public/app/require_config.js"></script>
     <!-- endbuild -->
   </head>
 
diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
index a1636af98e5..d61aec067c2 100644
--- a/tasks/options/requirejs.js
+++ b/tasks/options/requirejs.js
@@ -6,7 +6,7 @@ module.exports = function(config,grunt) {
     var options = {
       appDir: '<%= genDir %>',
       dir:  '<%= tempDir %>',
-      mainConfigFile: '<%= genDir %>/app/components/require.config.js',
+      mainConfigFile: '<%= genDir %>/app/require_config.js',
       baseUrl: './',
       waitSeconds: 0,
 
@@ -41,16 +41,12 @@ module.exports = function(config,grunt) {
         // main/common module
         name: 'app/app',
         include: [
-          'kbn',
           'text',
           'jquery',
-          'angular',
-          'settings',
           'bootstrap',
           'modernizr',
           'timepicker',
           'datepicker',
-          'lodash',
           'jquery.flot',
           'angular-strap',
           'angular-dragdrop',
@@ -58,7 +54,6 @@ module.exports = function(config,grunt) {
           'app/services/all',
           'app/features/all',
           'app/controllers/all',
-          'app/components/partials',
           // bundle the datasources
           'app/plugins/datasource/grafana/datasource',
           'app/plugins/datasource/graphite/datasource',