diff --git a/ci/makeMockCompiler.js b/ci/makeMockCompiler.js
index 042e8f4176..ba20151f18 100644
--- a/ci/makeMockCompiler.js
+++ b/ci/makeMockCompiler.js
@@ -5,7 +5,7 @@ var solc = require('solc/wrapper')
 var soljson = require('../soljson')
 var compiler = solc(soljson)
 
-var compilerInput = require('../src/app/compiler/compiler-input')
+var compilerInput = require('remix-solidty').CompilerInput
 var compilationResult = {}
 gatherCompilationResults('./test-browser/tests/', compilationResult)
 gatherCompilationResults('./test-browser/tests/units/', compilationResult)
diff --git a/src/app.js b/src/app.js
index b0841855a9..bb12028c75 100644
--- a/src/app.js
+++ b/src/app.js
@@ -20,7 +20,7 @@ var SharedFolder = require('./app/files/shared-folder')
 var Config = require('./config')
 var Editor = require('./app/editor/editor')
 var Renderer = require('./app/ui/renderer')
-var Compiler = require('./app/compiler/compiler')
+var Compiler = require('remix-solidity').Compiler
 var executionContext = require('./execution-context')
 var Debugger = require('./app/debugger/debugger')
 var StaticAnalysis = require('./app/staticanalysis/staticAnalysisView')