diff --git a/src/app/debugger/stepManager.js b/src/app/debugger/debugger/stepManager.js
similarity index 100%
rename from src/app/debugger/stepManager.js
rename to src/app/debugger/debugger/stepManager.js
diff --git a/src/app/debugger/debuggerUI.js b/src/app/debugger/debuggerUI.js
index 6bc83d560b..1765dc558c 100644
--- a/src/app/debugger/debuggerUI.js
+++ b/src/app/debugger/debuggerUI.js
@@ -3,7 +3,7 @@ var StepManagerUI = require('./debuggerUI/StepManager')
 var VmDebugger = require('./debuggerUI/VmDebugger')
 
 var Debugger = require('./debugger/debugger')
-var StepManager = require('./stepManager')
+var StepManager = require('./debugger/stepManager')
 var VmDebuggerLogic = require('./VmDebugger')
 
 var SourceHighlighter = require('../editor/sourceHighlighter')
@@ -180,8 +180,6 @@ class DebuggerUI {
       self.stepChanged(stepIndex)
     })
 
-    this.stepManager = this.stepManager
-
     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.andAddVmDebugger()