diff --git a/remix-debug/src/debugger/SolidityLocals.js b/remix-debug/src/debugger/SolidityLocals.js
index 4c651cc4be..96588857c5 100644
--- a/remix-debug/src/debugger/SolidityLocals.js
+++ b/remix-debug/src/debugger/SolidityLocals.js
@@ -1,8 +1,8 @@
 var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
-var remixDebug = require('../../index.js')
-var localDecoder = remixDebug.SolidityDecoder.localDecoder
-var StorageViewer = remixDebug.storage.StorageViewer
+
+var localDecoder = require('../solidity-decoder/localDecoder')
+var StorageViewer = require('../storage/storageViewer')
 
 class DebuggerSolidityLocals {
 
diff --git a/remix-debug/src/debugger/VmDebugger.js b/remix-debug/src/debugger/VmDebugger.js
index 74175f8483..32562d5a86 100644
--- a/remix-debug/src/debugger/VmDebugger.js
+++ b/remix-debug/src/debugger/VmDebugger.js
@@ -1,9 +1,8 @@
-var remixDebug = require('../../index.js')
 var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
 var ui = remixLib.helpers.ui
-var StorageResolver = remixDebug.storage.StorageResolver
-var StorageViewer = remixDebug.storage.StorageViewer
+var StorageResolver = require('../storage/storageResolver')
+var StorageViewer = require('../storage/storageViewer')
 
 var DebuggerSolidityState = require('./solidityState')
 var DebuggerSolidityLocals = require('./solidityLocals')
diff --git a/remix-debug/src/debugger/solidityState.js b/remix-debug/src/debugger/solidityState.js
index 42881d0c32..8f2896c71c 100644
--- a/remix-debug/src/debugger/solidityState.js
+++ b/remix-debug/src/debugger/solidityState.js
@@ -1,8 +1,7 @@
 var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
-var remixDebug = require('../../index.js')
-var stateDecoder = remixDebug.SolidityDecoder.stateDecoder
-var StorageViewer = remixDebug.storage.StorageViewer
+var stateDecoder = require('../solidity-decoder/stateDecoder')
+var StorageViewer = require('../storage/storageViewer')
 
 class DebuggerSolidityState {