diff --git a/src/app.js b/src/app.js
index c7634f24d9..d1baf2a44d 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('./universal-dapp.js')
+var UniversalDApp = require('./app/runtime/universal-dapp.js')
 var Remixd = require('./lib/remixd')
 var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
 
diff --git a/src/universal-dapp.js b/src/app/runtime/universal-dapp.js
similarity index 97%
rename from src/universal-dapp.js
rename to src/app/runtime/universal-dapp.js
index 6192f594bb..b5dba67069 100644
--- a/src/universal-dapp.js
+++ b/src/app/runtime/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('./app/execution/txRunner')
+var TxRunner = require('../execution/txRunner')
 var yo = require('yo-yo')
-var txFormat = require('./app/execution/txFormat')
-var txHelper = require('./app/execution/txHelper')
-var txExecution = require('./app/execution/txExecution')
-var helper = require('./lib/helper')
+var txFormat = require('../execution/txFormat')
+var txHelper = require('../execution/txHelper')
+var txExecution = require('../execution/txExecution')
+var helper = require('../../lib/helper')
 
 // copy to copyToClipboard
 const copy = require('clipboard-copy')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var styleGuide = require('./app/ui/style-guide')
+var styleGuide = require('../ui/style-guide')
 var styles = styleGuide()
 
 var css = csjs`