diff --git a/src/app.js b/src/app.js
index 43daf3f829..bc26258e72 100644
--- a/src/app.js
+++ b/src/app.js
@@ -22,7 +22,7 @@ var SharedFolder = require('./app/files/shared-folder')
 var Config = require('./app/config')
 var Editor = require('./app/editor')
 var Renderer = require('./app/renderer')
-var Compiler = require('./app/compiler')
+var Compiler = require('./app/compiler/compiler')
 var ExecutionContext = require('./app/execution-context')
 var Debugger = require('./app/debugger')
 var StaticAnalysis = require('./app/staticanalysis/staticAnalysisView')
diff --git a/src/app/compiler-worker.js b/src/app/compiler/compiler-worker.js
similarity index 100%
rename from src/app/compiler-worker.js
rename to src/app/compiler/compiler-worker.js
diff --git a/src/app/compiler.js b/src/app/compiler/compiler.js
similarity index 99%
rename from src/app/compiler.js
rename to src/app/compiler/compiler.js
index 3f5254528a..2570d55b5c 100644
--- a/src/app/compiler.js
+++ b/src/app/compiler/compiler.js
@@ -4,7 +4,7 @@ var solc = require('solc/wrapper')
 var solcABI = require('solc/abi')
 
 var webworkify = require('webworkify')
-var utils = require('./utils')
+var utils = require('../utils')
 
 var EventManager = require('ethereum-remix').lib.EventManager