diff --git a/src/universal-dapp.js b/src/universal-dapp.js
index 4e1bdd38c2..f757cf6cee 100644
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -6,11 +6,12 @@ var async = require('async')
 var ethJSUtil = require('ethereumjs-util')
 var BN = ethJSUtil.BN
 var remixLib = require('remix-lib')
-var EventManager = require('./lib/events')
 var crypto = require('crypto')
 var TxRunner = remixLib.execution.txRunner
 var txHelper = remixLib.execution.txHelper
-var executionContext = require('./execution-context')
+var EventManager = remixLib.EventManager
+var executionContext = remixLib.execution.executionContext
+
 var globalRegistry = require('./global/registry')
 
 function UniversalDApp () {