diff --git a/remix-debug/src/Ethdebugger.js b/remix-debug/src/Ethdebugger.js
index defc723c30..0b63056a75 100644
--- a/remix-debug/src/Ethdebugger.js
+++ b/remix-debug/src/Ethdebugger.js
@@ -3,10 +3,11 @@
 var StorageViewer = require('./storage/storageViewer')
 var StorageResolver = require('./storage/storageResolver')
 
-var SolidityProxy = require('./decoder/solidityProxy')
-var stateDecoder = require('./decoder/stateDecoder')
-var localDecoder = require('./decoder/localDecoder')
-var InternalCallTree = require('./decoder/internalCallTree')
+var SolidityDecoder = require('./solidity-decoder')
+var SolidityProxy = SolidityDecoder.SolidityProxy
+var stateDecoder = SolidityDecoder.stateDecoder
+var localDecoder = SolidityDecoder.localDecoder
+var InternalCallTree = SolidityDecoder.InternalCallTree
 
 var remixLib = require('remix-lib')
 var TraceManager = remixLib.trace.TraceManager
diff --git a/remix-debug/src/decoder/astHelper.js b/remix-debug/src/solidity-decoder/astHelper.js
similarity index 100%
rename from remix-debug/src/decoder/astHelper.js
rename to remix-debug/src/solidity-decoder/astHelper.js
diff --git a/remix-debug/src/decoder/decodeInfo.js b/remix-debug/src/solidity-decoder/decodeInfo.js
similarity index 100%
rename from remix-debug/src/decoder/decodeInfo.js
rename to remix-debug/src/solidity-decoder/decodeInfo.js
diff --git a/remix-debug/src/solidity-decoder/index.js b/remix-debug/src/solidity-decoder/index.js
new file mode 100644
index 0000000000..ed92273450
--- /dev/null
+++ b/remix-debug/src/solidity-decoder/index.js
@@ -0,0 +1,11 @@
+var SolidityProxy = require('./solidityProxy')
+var stateDecoder = require('./stateDecoder')
+var localDecoder = require('./localDecoder')
+var InternalCallTree = require('./internalCallTree')
+
+module.exports = {
+  SolidityProxy: SolidityProxy,
+  stateDecoder: stateDecoder,
+  localDecoder: localDecoder,
+  InternalCallTree: InternalCallTree
+}
diff --git a/remix-debug/src/decoder/internalCallTree.js b/remix-debug/src/solidity-decoder/internalCallTree.js
similarity index 100%
rename from remix-debug/src/decoder/internalCallTree.js
rename to remix-debug/src/solidity-decoder/internalCallTree.js
diff --git a/remix-debug/src/decoder/localDecoder.js b/remix-debug/src/solidity-decoder/localDecoder.js
similarity index 100%
rename from remix-debug/src/decoder/localDecoder.js
rename to remix-debug/src/solidity-decoder/localDecoder.js
diff --git a/remix-debug/src/decoder/solidityProxy.js b/remix-debug/src/solidity-decoder/solidityProxy.js
similarity index 100%
rename from remix-debug/src/decoder/solidityProxy.js
rename to remix-debug/src/solidity-decoder/solidityProxy.js
diff --git a/remix-debug/src/decoder/stateDecoder.js b/remix-debug/src/solidity-decoder/stateDecoder.js
similarity index 100%
rename from remix-debug/src/decoder/stateDecoder.js
rename to remix-debug/src/solidity-decoder/stateDecoder.js
diff --git a/remix-debug/src/decoder/types/Address.js b/remix-debug/src/solidity-decoder/types/Address.js
similarity index 100%
rename from remix-debug/src/decoder/types/Address.js
rename to remix-debug/src/solidity-decoder/types/Address.js
diff --git a/remix-debug/src/decoder/types/ArrayType.js b/remix-debug/src/solidity-decoder/types/ArrayType.js
similarity index 100%
rename from remix-debug/src/decoder/types/ArrayType.js
rename to remix-debug/src/solidity-decoder/types/ArrayType.js
diff --git a/remix-debug/src/decoder/types/Bool.js b/remix-debug/src/solidity-decoder/types/Bool.js
similarity index 100%
rename from remix-debug/src/decoder/types/Bool.js
rename to remix-debug/src/solidity-decoder/types/Bool.js
diff --git a/remix-debug/src/decoder/types/DynamicByteArray.js b/remix-debug/src/solidity-decoder/types/DynamicByteArray.js
similarity index 100%
rename from remix-debug/src/decoder/types/DynamicByteArray.js
rename to remix-debug/src/solidity-decoder/types/DynamicByteArray.js
diff --git a/remix-debug/src/decoder/types/Enum.js b/remix-debug/src/solidity-decoder/types/Enum.js
similarity index 100%
rename from remix-debug/src/decoder/types/Enum.js
rename to remix-debug/src/solidity-decoder/types/Enum.js
diff --git a/remix-debug/src/decoder/types/FixedByteArray.js b/remix-debug/src/solidity-decoder/types/FixedByteArray.js
similarity index 100%
rename from remix-debug/src/decoder/types/FixedByteArray.js
rename to remix-debug/src/solidity-decoder/types/FixedByteArray.js
diff --git a/remix-debug/src/decoder/types/Int.js b/remix-debug/src/solidity-decoder/types/Int.js
similarity index 100%
rename from remix-debug/src/decoder/types/Int.js
rename to remix-debug/src/solidity-decoder/types/Int.js
diff --git a/remix-debug/src/decoder/types/Mapping.js b/remix-debug/src/solidity-decoder/types/Mapping.js
similarity index 100%
rename from remix-debug/src/decoder/types/Mapping.js
rename to remix-debug/src/solidity-decoder/types/Mapping.js
diff --git a/remix-debug/src/decoder/types/RefType.js b/remix-debug/src/solidity-decoder/types/RefType.js
similarity index 100%
rename from remix-debug/src/decoder/types/RefType.js
rename to remix-debug/src/solidity-decoder/types/RefType.js
diff --git a/remix-debug/src/decoder/types/StringType.js b/remix-debug/src/solidity-decoder/types/StringType.js
similarity index 100%
rename from remix-debug/src/decoder/types/StringType.js
rename to remix-debug/src/solidity-decoder/types/StringType.js
diff --git a/remix-debug/src/decoder/types/Struct.js b/remix-debug/src/solidity-decoder/types/Struct.js
similarity index 100%
rename from remix-debug/src/decoder/types/Struct.js
rename to remix-debug/src/solidity-decoder/types/Struct.js
diff --git a/remix-debug/src/decoder/types/Uint.js b/remix-debug/src/solidity-decoder/types/Uint.js
similarity index 100%
rename from remix-debug/src/decoder/types/Uint.js
rename to remix-debug/src/solidity-decoder/types/Uint.js
diff --git a/remix-debug/src/decoder/types/ValueType.js b/remix-debug/src/solidity-decoder/types/ValueType.js
similarity index 100%
rename from remix-debug/src/decoder/types/ValueType.js
rename to remix-debug/src/solidity-decoder/types/ValueType.js
diff --git a/remix-debug/src/decoder/types/util.js b/remix-debug/src/solidity-decoder/types/util.js
similarity index 100%
rename from remix-debug/src/decoder/types/util.js
rename to remix-debug/src/solidity-decoder/types/util.js
diff --git a/remix-debug/test/decoder/decodeInfo.js b/remix-debug/test/decoder/decodeInfo.js
index 4e100f2b79..6a41f0d9d4 100644
--- a/remix-debug/test/decoder/decodeInfo.js
+++ b/remix-debug/test/decoder/decodeInfo.js
@@ -1,14 +1,14 @@
 'use strict'
 var tape = require('tape')
 var compiler = require('solc')
-var astHelper = require('../../src/decoder/astHelper')
-var decodeInfo = require('../../src/decoder/decodeInfo')
-var stateDecoder = require('../../src/decoder/stateDecoder')
+var astHelper = require('../../src/solidity-decoder/astHelper')
+var decodeInfo = require('../../src/solidity-decoder/decodeInfo')
+var stateDecoder = require('../../src/solidity-decoder/stateDecoder')
 var contracts = require('./contracts/miscContracts')
 var simplecontracts = require('./contracts/simpleContract')
 var remixLib = require('remix-lib')
 var compilerInput = remixLib.helpers.compiler.compilerInput
-var util = require('../../src/decoder/types/util')
+var util = require('../../src/solidity-decoder/types/util')
 
 tape('solidity', function (t) {
   t.test('astHelper, decodeInfo', function (st) {
diff --git a/remix-debug/test/decoder/localsTests/helper.js b/remix-debug/test/decoder/localsTests/helper.js
index 867f515d85..b30c39cb21 100644
--- a/remix-debug/test/decoder/localsTests/helper.js
+++ b/remix-debug/test/decoder/localsTests/helper.js
@@ -1,5 +1,5 @@
 'use strict'
-var localDecoder = require('../../../src/decoder/localDecoder')
+var localDecoder = require('../../../src/solidity-decoder/localDecoder')
 
 /*
   Decode local variable
diff --git a/remix-debug/test/decoder/localsTests/int.js b/remix-debug/test/decoder/localsTests/int.js
index 5fce05fd5b..bfb57fef3c 100644
--- a/remix-debug/test/decoder/localsTests/int.js
+++ b/remix-debug/test/decoder/localsTests/int.js
@@ -7,8 +7,8 @@ var TraceManager = remixLib.trace.TraceManager
 var CodeManager = remixLib.code.CodeManager
 
 var traceHelper = remixLib.helpers.trace
-var SolidityProxy = require('../../../src/decoder/solidityProxy')
-var InternalCallTree = require('../../../src/decoder/internalCallTree')
+var SolidityProxy = require('../../../src/solidity-decoder/solidityProxy')
+var InternalCallTree = require('../../../src/solidity-decoder/internalCallTree')
 var EventManager = remixLib.EventManager
 var helper = require('./helper')
 
diff --git a/remix-debug/test/decoder/localsTests/misc.js b/remix-debug/test/decoder/localsTests/misc.js
index 75a239d3ad..258b509902 100644
--- a/remix-debug/test/decoder/localsTests/misc.js
+++ b/remix-debug/test/decoder/localsTests/misc.js
@@ -2,8 +2,8 @@
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
-var SolidityProxy = require('../../../src/decoder/solidityProxy')
-var InternalCallTree = require('../../../src/decoder/internalCallTree')
+var SolidityProxy = require('../../../src/solidity-decoder/solidityProxy')
+var InternalCallTree = require('../../../src/solidity-decoder/internalCallTree')
 var EventManager = remixLib.EventManager
 var helper = require('./helper')
 
diff --git a/remix-debug/test/decoder/localsTests/misc2.js b/remix-debug/test/decoder/localsTests/misc2.js
index 9091dc1dfa..cde7ede1c3 100644
--- a/remix-debug/test/decoder/localsTests/misc2.js
+++ b/remix-debug/test/decoder/localsTests/misc2.js
@@ -2,8 +2,8 @@
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
-var SolidityProxy = require('../../../src/decoder/solidityProxy')
-var InternalCallTree = require('../../../src/decoder/internalCallTree')
+var SolidityProxy = require('../../../src/solidity-decoder/solidityProxy')
+var InternalCallTree = require('../../../src/solidity-decoder/internalCallTree')
 var EventManager = remixLib.EventManager
 var helper = require('./helper')
 
diff --git a/remix-debug/test/decoder/localsTests/structArray.js b/remix-debug/test/decoder/localsTests/structArray.js
index 878fd3babe..ca1845da97 100644
--- a/remix-debug/test/decoder/localsTests/structArray.js
+++ b/remix-debug/test/decoder/localsTests/structArray.js
@@ -2,8 +2,8 @@
 var vmCall = require('../vmCall')
 var remixLib = require('remix-lib')
 var traceHelper = remixLib.helpers.trace
-var SolidityProxy = require('../../../src/decoder/solidityProxy')
-var InternalCallTree = require('../../../src/decoder/internalCallTree')
+var SolidityProxy = require('../../../src/solidity-decoder/solidityProxy')
+var InternalCallTree = require('../../../src/solidity-decoder/internalCallTree')
 var EventManager = remixLib.EventManager
 var helper = require('./helper')
 
diff --git a/remix-debug/test/decoder/stateTests/mapping.js b/remix-debug/test/decoder/stateTests/mapping.js
index af9d87a301..28709c7903 100644
--- a/remix-debug/test/decoder/stateTests/mapping.js
+++ b/remix-debug/test/decoder/stateTests/mapping.js
@@ -3,7 +3,7 @@ var compilerInput = remixLib.helpers.compiler.compilerInput
 var TraceManager = remixLib.trace.TraceManager
 
 var compiler = require('solc')
-var stateDecoder = require('../../../src/decoder/stateDecoder')
+var stateDecoder = require('../../../src/solidity-decoder/stateDecoder')
 var vmCall = require('../vmCall')
 
 var StorageResolver = require('../../../src/storage/storageResolver')
diff --git a/remix-debug/test/decoder/storageDecoder.js b/remix-debug/test/decoder/storageDecoder.js
index 1c943e47fd..4b57247814 100644
--- a/remix-debug/test/decoder/storageDecoder.js
+++ b/remix-debug/test/decoder/storageDecoder.js
@@ -1,7 +1,7 @@
 'use strict'
 var tape = require('tape')
 var compiler = require('solc')
-var stateDecoder = require('../../src/decoder/stateDecoder')
+var stateDecoder = require('../../src/solidity-decoder/stateDecoder')
 var MockStorageResolver = require('./mockStorageResolver')
 var remixLib = require('remix-lib')
 var compilerInput = remixLib.helpers.compiler.compilerInput
diff --git a/remix-debug/test/decoder/storageLocation.js b/remix-debug/test/decoder/storageLocation.js
index fe4dc601d3..300adc467b 100644
--- a/remix-debug/test/decoder/storageLocation.js
+++ b/remix-debug/test/decoder/storageLocation.js
@@ -1,7 +1,7 @@
 'use strict'
 var tape = require('tape')
 var compiler = require('solc')
-var stateDecoder = require('../../src/decoder/stateDecoder')
+var stateDecoder = require('../../src/solidity-decoder/stateDecoder')
 var contracts = require('./contracts/miscContracts')
 var remixLib = require('remix-lib')
 var compilerInput = remixLib.helpers.compiler.compilerInput