diff --git a/src/app.js b/src/app.js
index d1baf2a44d..b5c2125aa2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -10,7 +10,7 @@ var yo = require('yo-yo')
 var remix = require('ethereum-remix')
 var EventManager = remix.lib.EventManager
 
-var UniversalDApp = require('./app/runtime/universal-dapp.js')
+var UniversalDApp = require('./universal-dapp.js')
 var Remixd = require('./lib/remixd')
 var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
 
@@ -19,11 +19,11 @@ var GistHandler = require('./lib/gist-handler')
 var Storage = require('./app/files/storage')
 var Browserfiles = require('./app/files/browser-files')
 var SharedFolder = require('./app/files/shared-folder')
-var Config = require('./app/runtime/config')
+var Config = require('./config')
 var Editor = require('./app/editor/editor')
 var Renderer = require('./app/ui/renderer')
 var Compiler = require('./app/compiler/compiler')
-var ExecutionContext = require('./app/runtime/execution-context')
+var ExecutionContext = require('./execution-context')
 var Debugger = require('./app/debugger/debugger')
 var StaticAnalysis = require('./app/staticanalysis/staticAnalysisView')
 var FilePanel = require('./app/panels/file-panel')
diff --git a/src/app/runtime/config.js b/src/config.js
similarity index 100%
rename from src/app/runtime/config.js
rename to src/config.js
diff --git a/src/app/runtime/execution-context.js b/src/execution-context.js
similarity index 100%
rename from src/app/runtime/execution-context.js
rename to src/execution-context.js
diff --git a/src/app/runtime/universal-dapp.js b/src/universal-dapp.js
similarity index 97%
rename from src/app/runtime/universal-dapp.js
rename to src/universal-dapp.js
index b5dba67069..6192f594bb 100644
--- a/src/app/runtime/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -8,19 +8,19 @@ var BN = ethJSUtil.BN
 var EventManager = require('ethereum-remix').lib.EventManager
 var crypto = require('crypto')
 var async = require('async')
-var TxRunner = require('../execution/txRunner')
+var TxRunner = require('./app/execution/txRunner')
 var yo = require('yo-yo')
-var txFormat = require('../execution/txFormat')
-var txHelper = require('../execution/txHelper')
-var txExecution = require('../execution/txExecution')
-var helper = require('../../lib/helper')
+var txFormat = require('./app/execution/txFormat')
+var txHelper = require('./app/execution/txHelper')
+var txExecution = require('./app/execution/txExecution')
+var helper = require('./lib/helper')
 
 // copy to copyToClipboard
 const copy = require('clipboard-copy')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('../ui/style-guide')
+var styleGuide = require('./app/ui/style-guide')
 var styles = styleGuide()
 
 var css = csjs`