diff --git a/src/app.js b/src/app.js
index a22cc5c762..f0df79c3e7 100644
--- a/src/app.js
+++ b/src/app.js
@@ -20,7 +20,7 @@ var Storage = require('./app/files/storage')
 var Browserfiles = require('./app/files/browser-files')
 var SharedFolder = require('./app/files/shared-folder')
 var Config = require('./app/config')
-var Editor = require('./app/editor')
+var Editor = require('./app/editor/editor')
 var Renderer = require('./app/ui/renderer')
 var Compiler = require('./app/compiler/compiler')
 var ExecutionContext = require('./app/execution-context')
diff --git a/src/app/editor.js b/src/app/editor/editor.js
similarity index 99%
rename from src/app/editor.js
rename to src/app/editor/editor.js
index a4cb8379ac..426f1b3886 100644
--- a/src/app/editor.js
+++ b/src/app/editor/editor.js
@@ -5,7 +5,7 @@ var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var ace = require('brace')
 var Range = ace.acequire('ace/range').Range
-require('../mode-solidity.js')
+require('./mode-solidity.js')
 
 var css = csjs`
   .ace-editor         {
diff --git a/src/mode-solidity.js b/src/app/editor/mode-solidity.js
similarity index 100%
rename from src/mode-solidity.js
rename to src/app/editor/mode-solidity.js