issue/2472 aligned core with plugin folder structure

grunt/config/copy.js

@@ -48,17 +48,6 @@ module.exports = function (grunt, options) {
     };
 
     var mandatoryTasks = {
-        index: {
-            files: [
-                {
-                    expand: true,
-                    src: ['<%= sourcedir %>index.html'],
-                    dest: '<%= outputdir %>',
-                    filter: 'isFile',
-                    flatten: true
-                }
-            ]
-        },
         coreAssets: {
             files: [
                 {
@@ -184,30 +173,18 @@ module.exports = function (grunt, options) {
                 }
             ]
         },
-        scriptLoader: {
-            files: [
-                {
-                    expand: true,
-                    src: ['<%= sourcedir %>core/js/scriptLoader.js'],
-                    dest: '<%= outputdir %>adapt/js/',
-                    filter: 'isFile',
-                    flatten: true
-                }
-            ]
-        },
-        libraries: {
+        coreLibraries: {
             files: [
                 {
                     expand: true,
-                    src: [
-                        '<%= sourcedir %>core/js/libraries/**/*'
-                    ],
-                    dest: '<%= outputdir %>libraries/',
+                    src: ['core/libraries/**/*'],
+                    cwd: '<%= sourcedir %>',
+                    dest: '<%= outputdir %>/libraries/',
                     rename: _.partial(collate, "libraries")
-                }
+                },
             ]
         },
-        required: {
+        libraries: {
             files: [
                 {
                     expand: true,
@@ -219,9 +196,24 @@ module.exports = function (grunt, options) {
                     },
                     rename: _.partial(collate, "libraries")
                 },
+            ]
+        },
+        coreRequired: {
+            files: [
+                {
+                    expand: true,
+                    src: ['core/required/**/*'],
+                    cwd: '<%= sourcedir %>',
+                    dest: '<%= outputdir %>',
+                    rename: _.partial(collate, "required")
+                }
+            ]
+        },
+        required: {
+            files: [
                 {
                     expand: true,
-                    src: ['core/**/required/**/*', 'components/**/required/**/*', 'extensions/**/required/**/*', 'menu/<%= menu %>/required/**/*', 'theme/<%= theme %>/required/**/*'],
+                    src: ['components/**/required/**/*', 'extensions/**/required/**/*', 'menu/<%= menu %>/required/**/*', 'theme/<%= theme %>/required/**/*'],
                     cwd: '<%= sourcedir %>',
                     dest: '<%= outputdir %>',
                     filter: function(filepath) {

grunt/config/watch.js

@@ -25,24 +25,9 @@ module.exports = {
         tasks : ['copy:courseAssets']
     },
     js: {
-        files: [
-            '<%= sourcedir %>**/*.js',
-            '!<%= sourcedir %>components/components.js',
-            '!<%= sourcedir %>extensions/extensions.js',
-            '!<%= sourcedir %>menu/menu.js',
-            '!<%= sourcedir %>theme/theme.js',
-            '!<%= sourcedir %>templates/templates.js',
-            '!<%= sourcedir %>core/js/scriptLoader.js',
-            '!<%= sourcedir %>core/js/libraries/require.min.js',
-            '!<%= sourcedir %>core/js/libraries/modernizr.js',
-            '!<%= sourcedir %>core/js/libraries/jquery.min.js'
-        ],
+        files: ['<%= sourcedir %>**/*.js'],
         tasks: ['javascript:dev']
     },
-    index: {
-        files: ['<%= sourcedir %>index.html'],
-        tasks: ['copy:index']
-    },
     componentsAssets: {
         files: ['<%= sourcedir %>components/**/assets/**'],
         tasks: ['copy:componentAssets']
@@ -75,20 +60,12 @@ module.exports = {
         files: ['<%= sourcedir %>theme/<%= theme %>/**/fonts/**'],
         tasks: ['copy:themeFonts']
     },
-    scriptLoader: {
-        files: ['<%= sourcedir %>core/js/scriptLoader.js'],
-        tasks: ['copy:scriptLoader']
-    },
     libraries: {
-        files: [
-            '<%= sourcedir %>core/js/libraries/require.min.js',
-            '<%= sourcedir %>core/js/libraries/modernizr.js',
-            '<%= sourcedir %>core/js/libraries/jquery.min.js'
-        ],
+        files: ['<%= sourcedir %>core/libraries/**/*','<%= sourcedir %>*/*/libraries/**/*'],
         tasks: ['copy:libraries']
     },
     required: {
-        files: ['<%= sourcedir %>extensions/*/required/**/*', '<%= sourcedir %>extensions/*/libraries/**/*'],
+        files: ['<%= sourcedir %>core/required/**/*','<%= sourcedir %>*/*/required/**/*'],
         tasks: 'copy:required'
     }
 }

src/core/js/libraries/backbone.controller.js → src/core/libraries/backbone.controller.js

@@ -4,7 +4,7 @@
 	It still works exactly like Model, View and Collection, in that it has the Events API, .extend and an initialize function
 */
 define("backbone.controller", [
-	"backbone", 
+	"backbone",
 	"underscore"
 ], function(Backbone, _) {