diff --git a/src/app/debugger/SolidityLocals.js b/src/app/debugger/debugger/SolidityLocals.js
similarity index 100%
rename from src/app/debugger/SolidityLocals.js
rename to src/app/debugger/debugger/SolidityLocals.js
diff --git a/src/app/debugger/VmDebugger.js b/src/app/debugger/debugger/VmDebugger.js
similarity index 100%
rename from src/app/debugger/VmDebugger.js
rename to src/app/debugger/debugger/VmDebugger.js
diff --git a/src/app/debugger/debugger/debugger.js b/src/app/debugger/debugger/debugger.js
index b3f8e40eeb..9cd0d22f61 100644
--- a/src/app/debugger/debugger/debugger.js
+++ b/src/app/debugger/debugger/debugger.js
@@ -4,6 +4,7 @@ var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
 
 var StepManager = require('./stepManager')
+var VmDebuggerLogic = require('./VmDebugger')
 
 function Debugger (options) {
   var self = this
@@ -89,6 +90,8 @@ Debugger.prototype.debug = function (parent) {
       }
     })
   })
+
+  this.vmDebuggerLogic = new VmDebuggerLogic(parent, this.debugger.traceManager, this.debugger.codeManager, this.debugger.solidityProxy, this.debugger.callTree)
 }
 
 module.exports = Debugger
diff --git a/src/app/debugger/solidityState.js b/src/app/debugger/debugger/solidityState.js
similarity index 100%
rename from src/app/debugger/solidityState.js
rename to src/app/debugger/debugger/solidityState.js
diff --git a/src/app/debugger/debuggerUI.js b/src/app/debugger/debuggerUI.js
index 63892aa302..73a3a332d6 100644
--- a/src/app/debugger/debuggerUI.js
+++ b/src/app/debugger/debuggerUI.js
@@ -3,7 +3,6 @@ var StepManagerUI = require('./debuggerUI/StepManager')
 var VmDebugger = require('./debuggerUI/VmDebugger')
 
 var Debugger = require('./debugger/debugger')
-var VmDebuggerLogic = require('./VmDebugger')
 
 var SourceHighlighter = require('../editor/sourceHighlighter')
 
@@ -173,8 +172,7 @@ class DebuggerUI {
       self.stepChanged(stepIndex)
     })
 
-    this.vmDebuggerLogic = new VmDebuggerLogic(this, this.transactionDebugger.debugger.traceManager, this.transactionDebugger.debugger.codeManager, this.transactionDebugger.debugger.solidityProxy, this.transactionDebugger.debugger.callTree)
-    this.vmDebugger = new VmDebugger(this.vmDebuggerLogic)
+    this.vmDebugger = new VmDebugger(this.transactionDebugger.vmDebuggerLogic)
     this.andAddVmDebugger()
 
     this.transactionDebugger.debugger.debug(tx)