diff --git a/src/code_manager/model/CodeMirrorEditor.js b/src/code_manager/model/CodeMirrorEditor.js
index 136dd8f34..4979288c5 100644
--- a/src/code_manager/model/CodeMirrorEditor.js
+++ b/src/code_manager/model/CodeMirrorEditor.js
@@ -2,7 +2,7 @@ var Backbone = require('backbone');
 var CodeMirror = require('codemirror/lib/codemirror');
 var htmlMode = require('codemirror/mode/htmlmixed/htmlmixed');
 var cssMode = require('codemirror/mode/css/css');
-var formatting = require('formatting');
+var formatting = require('codemirror-formatting');
 
 module.exports = Backbone.Model.extend({
 
diff --git a/src/commands/view/OpenLayers.js b/src/commands/view/OpenLayers.js
index fcf26e250..9274102be 100644
--- a/src/commands/view/OpenLayers.js
+++ b/src/commands/view/OpenLayers.js
@@ -1,4 +1,4 @@
-var Layers = require('Navigator');
+var Layers = require('navigator');
 
 module.exports = {
 
diff --git a/src/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js
index 915162135..e122be070 100644
--- a/src/commands/view/OpenStyleManager.js
+++ b/src/commands/view/OpenStyleManager.js
@@ -1,4 +1,4 @@
-var StyleManager = require('StyleManager');
+var StyleManager = require('style_manager');
 
 module.exports = {
 
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 5e67a99ca..9ded3d177 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -1,5 +1,5 @@
-var ToolbarView = require('DomComponents/view/ToolbarView');
-var Toolbar = require('DomComponents/model/Toolbar');
+var ToolbarView = require('dom_components/view/ToolbarView');
+var Toolbar = require('dom_components/model/Toolbar');
 var key = require('keymaster');
 
 module.exports = {
diff --git a/src/css_composer/model/Selectors.js b/src/css_composer/model/Selectors.js
index f6240466d..ec1f1e66f 100644
--- a/src/css_composer/model/Selectors.js
+++ b/src/css_composer/model/Selectors.js
@@ -11,7 +11,7 @@ module.exports = Backbone.Collection.extend({
 
         default:
           if(!this.ClassTag)
-            this.ClassTag = require("SelectorManager/model/Selector");
+            this.ClassTag = require("selector_manager/model/Selector");
           model = new this.ClassTag(attrs, opts);
 
       }
diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js
index e8b3b5ab3..3a1954934 100644
--- a/src/dom_components/model/Component.js
+++ b/src/dom_components/model/Component.js
@@ -1,7 +1,7 @@
 var Backbone = require('backbone');
 var Components = require('./Components');
-var Selectors = require('SelectorManager/model/Selectors');
-var Traits = require('TraitManager/model/Traits');
+var Selectors = require('selector_manager/model/Selectors');
+var Traits = require('trait_manager/model/Traits');
 
 module.exports = Backbone.Model.extend({
 
diff --git a/src/dom_components/view/ToolbarView.js b/src/dom_components/view/ToolbarView.js
index ec51c5933..719f2f377 100644
--- a/src/dom_components/view/ToolbarView.js
+++ b/src/dom_components/view/ToolbarView.js
@@ -1,18 +1,14 @@
-define(function(require, exports, module){
-  'use strict';
-  var Backbone = require('backbone');
-  var DomainViews = require('Abstract/view/DomainViews');
-  var ToolbarButtonView = require('./ToolbarButtonView');
+var Backbone = require('backbone');
+var DomainViews = require('domain_abstract/view/DomainViews');
+var ToolbarButtonView = require('./ToolbarButtonView');
 
-		module.exports = DomainViews.extend({
+module.exports = DomainViews.extend({
 
-			itemView: ToolbarButtonView,
+  itemView: ToolbarButtonView,
 
-			initialize: function(opts) {
-				this.config = {editor: opts.editor || ''};
-				this.listenTo(this.collection, 'reset', this.render);
-			},
+  initialize: function(opts) {
+    this.config = {editor: opts.editor || ''};
+    this.listenTo(this.collection, 'reset', this.render);
+  },
 
-		});
-
-});
\ No newline at end of file
+});
diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js
index 762544f7c..4f27a93e2 100644
--- a/src/domain_abstract/ui/InputColor.js
+++ b/src/domain_abstract/ui/InputColor.js
@@ -1,6 +1,6 @@
 var Backbone = require('backbone');
 var Input = require('./Input');
-var Spectrum = require('Spectrum');
+var Spectrum = require('spectrum-colorpicker');
 
 module.exports = Input.extend({
 
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 516819632..815a7b98b 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -1,25 +1,25 @@
 var deps = [
 require('Utils'),
-require('StorageManager'),
-require('DeviceManager'),
-require('Parser'),
-require('SelectorManager'),
-require('ModalDialog'),
-require('CodeManager'),
-require('Panels'),
-require('RichTextEditor'),
-require('StyleManager'),
-require('AssetManager'),
-require('CssComposer'),
-require('DomComponents'),
-require('Canvas'),
-require('Commands'),
-require('BlockManager'),
-require('TraitManager'),
+require('storage_manager'),
+require('device_manager'),
+require('parser'),
+require('selector_manager'),
+require('modal_dialog'),
+require('code_manager'),
+require('panels'),
+require('rich_text_editor'),
+require('style_manager'),
+require('asset_manager'),
+require('css_composer'),
+require('dom_components'),
+require('canvas'),
+require('commands'),
+require('block_manager'),
+require('trait_manager'),
 ];
 
 require('backbone');
-require('backboneUndo');
+require('backbone-undo');
 var key = require('keymaster');
 /*
 require('Utils');
diff --git a/src/style_manager/view/PropertyColorView.js b/src/style_manager/view/PropertyColorView.js
index 446b0fb50..0b796a06b 100644
--- a/src/style_manager/view/PropertyColorView.js
+++ b/src/style_manager/view/PropertyColorView.js
@@ -1,6 +1,6 @@
 var Backbone = require('backbone');
 var PropertyView = require('./PropertyView');
-var InputColor = require('Abstract/ui/InputColor');
+var InputColor = require('domain_abstract/ui/InputColor');
 
 module.exports = PropertyView.extend({
 
diff --git a/src/style_manager/view/PropertyIntegerView.js b/src/style_manager/view/PropertyIntegerView.js
index d6627e92f..a5bb072b1 100644
--- a/src/style_manager/view/PropertyIntegerView.js
+++ b/src/style_manager/view/PropertyIntegerView.js
@@ -1,6 +1,6 @@
 var Backbone = require('backbone');
 var PropertyView = require('./PropertyView');
-var InputNumber = require('Abstract/ui/InputNumber');
+var InputNumber = require('domain_abstract/ui/InputNumber');
 
 module.exports = PropertyView.extend({
 
diff --git a/src/trait_manager/view/TraitColorView.js b/src/trait_manager/view/TraitColorView.js
index 6c68404f9..076620b2f 100644
--- a/src/trait_manager/view/TraitColorView.js
+++ b/src/trait_manager/view/TraitColorView.js
@@ -1,5 +1,5 @@
 var TraitView = require('./TraitView');
-var InputColor = require('Abstract/ui/InputColor');
+var InputColor = require('domain_abstract/ui/InputColor');
 
 module.exports = TraitView.extend({
   /**
diff --git a/src/trait_manager/view/TraitNumberView.js b/src/trait_manager/view/TraitNumberView.js
index 2fa36b1e3..1f49a79da 100644
--- a/src/trait_manager/view/TraitNumberView.js
+++ b/src/trait_manager/view/TraitNumberView.js
@@ -1,5 +1,5 @@
 var TraitView = require('./TraitView');
-var InputNumber = require('Abstract/ui/InputNumber');
+var InputNumber = require('domain_abstract/ui/InputNumber');
 
 module.exports = TraitView.extend({
 
diff --git a/src/trait_manager/view/TraitsView.js b/src/trait_manager/view/TraitsView.js
index 244bdfc7f..25d773737 100644
--- a/src/trait_manager/view/TraitsView.js
+++ b/src/trait_manager/view/TraitsView.js
@@ -1,4 +1,4 @@
-var DomainViews = require('Abstract/view/DomainViews');
+var DomainViews = require('domain_abstract/view/DomainViews');
 var TraitView = require('./TraitView');
 var TraitSelectView = require('./TraitSelectView');
 var TraitCheckboxView = require('./TraitCheckboxView');
diff --git a/webpack.config.js b/webpack.config.js
index f9851d930..df1c6c303 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -39,38 +39,5 @@ module.exports = {
   },
   resolve: {
     modules: ['src', 'node_modules'],
-    alias: {
-      jquery: 'jquery/dist/jquery',
-      underscore: 'underscore/underscore',
-      backbone: 'backbone/backbone',
-      backboneUndo: 'backbone-undo/Backbone.Undo',
-      keymaster: 'keymaster/keymaster',
-      text: 'requirejs-text/text',
-      Spectrum: 'spectrum-colorpicker/spectrum',
-      codemirror: 'codemirror',
-      formatting: 'codemirror-formatting/formatting',
-      PluginManager: 'plugin_manager',
-      Abstract: 'domain_abstract',
-      Editor: 'editor',
-      AssetManager: 'asset_manager',
-      BlockManager: 'block_manager',
-      TraitManager: 'trait_manager',
-      StyleManager: 'style_manager',
-      DeviceManager: 'device_manager',
-      StorageManager: 'storage_manager',
-      PluginManager: 'plugin_manager',
-      Navigator: 'navigator',
-      DomComponents: 'dom_components',
-      RichTextEditor: 'rich_text_editor',
-      SelectorManager: 'selector_manager',
-      ModalDialog: 'modal_dialog',
-      CodeManager: 'code_manager',
-      CssComposer: 'css_composer',
-      Commands: 'commands',
-      Canvas: 'canvas',
-      Panels: 'panels',
-      Parser: 'parser',
-      Utils: 'utils',
-    }
   },
 }