diff --git a/remix-analyzer/index.js b/remix-analyzer/index.js
index 3fd9c0fd4a..01345200d8 100644
--- a/remix-analyzer/index.js
+++ b/remix-analyzer/index.js
@@ -1,4 +1,4 @@
-var CodeAnalysis = require('./src/analysis/staticAnalysisRunner')
+var CodeAnalysis = require('./src/solidity-analyzer')
 
 module.exports = {
   CodeAnalysis: CodeAnalysis
diff --git a/remix-analyzer/src/analysis/staticAnalysisRunner.js b/remix-analyzer/src/solidity-analyzer/index.js
similarity index 100%
rename from remix-analyzer/src/analysis/staticAnalysisRunner.js
rename to remix-analyzer/src/solidity-analyzer/index.js
diff --git a/remix-analyzer/src/analysis/modules/abstractAstView.js b/remix-analyzer/src/solidity-analyzer/modules/abstractAstView.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/abstractAstView.js
rename to remix-analyzer/src/solidity-analyzer/modules/abstractAstView.js
diff --git a/remix-analyzer/src/analysis/modules/assignAndCompare.js b/remix-analyzer/src/solidity-analyzer/modules/assignAndCompare.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/assignAndCompare.js
rename to remix-analyzer/src/solidity-analyzer/modules/assignAndCompare.js
diff --git a/remix-analyzer/src/analysis/modules/blockBlockhash.js b/remix-analyzer/src/solidity-analyzer/modules/blockBlockhash.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/blockBlockhash.js
rename to remix-analyzer/src/solidity-analyzer/modules/blockBlockhash.js
diff --git a/remix-analyzer/src/analysis/modules/blockTimestamp.js b/remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/blockTimestamp.js
rename to remix-analyzer/src/solidity-analyzer/modules/blockTimestamp.js
diff --git a/remix-analyzer/src/analysis/modules/categories.js b/remix-analyzer/src/solidity-analyzer/modules/categories.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/categories.js
rename to remix-analyzer/src/solidity-analyzer/modules/categories.js
diff --git a/remix-analyzer/src/analysis/modules/checksEffectsInteraction.js b/remix-analyzer/src/solidity-analyzer/modules/checksEffectsInteraction.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/checksEffectsInteraction.js
rename to remix-analyzer/src/solidity-analyzer/modules/checksEffectsInteraction.js
diff --git a/remix-analyzer/src/analysis/modules/constantFunctions.js b/remix-analyzer/src/solidity-analyzer/modules/constantFunctions.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/constantFunctions.js
rename to remix-analyzer/src/solidity-analyzer/modules/constantFunctions.js
diff --git a/remix-analyzer/src/analysis/modules/deleteDynamicArrays.js b/remix-analyzer/src/solidity-analyzer/modules/deleteDynamicArrays.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/deleteDynamicArrays.js
rename to remix-analyzer/src/solidity-analyzer/modules/deleteDynamicArrays.js
diff --git a/remix-analyzer/src/analysis/modules/functionCallGraph.js b/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/functionCallGraph.js
rename to remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.js
diff --git a/remix-analyzer/src/analysis/modules/gasCosts.js b/remix-analyzer/src/solidity-analyzer/modules/gasCosts.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/gasCosts.js
rename to remix-analyzer/src/solidity-analyzer/modules/gasCosts.js
diff --git a/remix-analyzer/src/analysis/modules/guardConditions.js b/remix-analyzer/src/solidity-analyzer/modules/guardConditions.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/guardConditions.js
rename to remix-analyzer/src/solidity-analyzer/modules/guardConditions.js
diff --git a/remix-analyzer/src/analysis/modules/inlineAssembly.js b/remix-analyzer/src/solidity-analyzer/modules/inlineAssembly.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/inlineAssembly.js
rename to remix-analyzer/src/solidity-analyzer/modules/inlineAssembly.js
diff --git a/remix-analyzer/src/analysis/modules/intDivisionTruncate.js b/remix-analyzer/src/solidity-analyzer/modules/intDivisionTruncate.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/intDivisionTruncate.js
rename to remix-analyzer/src/solidity-analyzer/modules/intDivisionTruncate.js
diff --git a/remix-analyzer/src/analysis/modules/list.js b/remix-analyzer/src/solidity-analyzer/modules/list.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/list.js
rename to remix-analyzer/src/solidity-analyzer/modules/list.js
diff --git a/remix-analyzer/src/analysis/modules/lowLevelCalls.js b/remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/lowLevelCalls.js
rename to remix-analyzer/src/solidity-analyzer/modules/lowLevelCalls.js
diff --git a/remix-analyzer/src/analysis/modules/noReturn.js b/remix-analyzer/src/solidity-analyzer/modules/noReturn.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/noReturn.js
rename to remix-analyzer/src/solidity-analyzer/modules/noReturn.js
diff --git a/remix-analyzer/src/analysis/modules/selfdestruct.js b/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/selfdestruct.js
rename to remix-analyzer/src/solidity-analyzer/modules/selfdestruct.js
diff --git a/remix-analyzer/src/analysis/modules/similarVariableNames.js b/remix-analyzer/src/solidity-analyzer/modules/similarVariableNames.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/similarVariableNames.js
rename to remix-analyzer/src/solidity-analyzer/modules/similarVariableNames.js
diff --git a/remix-analyzer/src/analysis/modules/staticAnalysisCommon.js b/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/staticAnalysisCommon.js
rename to remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.js
diff --git a/remix-analyzer/src/analysis/modules/thisLocal.js b/remix-analyzer/src/solidity-analyzer/modules/thisLocal.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/thisLocal.js
rename to remix-analyzer/src/solidity-analyzer/modules/thisLocal.js
diff --git a/remix-analyzer/src/analysis/modules/txOrigin.js b/remix-analyzer/src/solidity-analyzer/modules/txOrigin.js
similarity index 100%
rename from remix-analyzer/src/analysis/modules/txOrigin.js
rename to remix-analyzer/src/solidity-analyzer/modules/txOrigin.js
diff --git a/remix-analyzer/test/analysis/staticAnalysisCommon-test.js b/remix-analyzer/test/analysis/staticAnalysisCommon-test.js
index 7d4fc4a95e..c4dbd95e98 100644
--- a/remix-analyzer/test/analysis/staticAnalysisCommon-test.js
+++ b/remix-analyzer/test/analysis/staticAnalysisCommon-test.js
@@ -1,6 +1,6 @@
 var test = require('tape')
 
-var common = require('../../src/analysis/modules/staticAnalysisCommon')
+var common = require('../../src/solidity-analyzer/modules/staticAnalysisCommon')
 
 function escapeRegExp (str) {
   return str.replace(/[-[\]/{}()+?.\\^$|]/g, '\\$&')
diff --git a/remix-analyzer/test/analysis/staticAnalysisIntegration-test.js b/remix-analyzer/test/analysis/staticAnalysisIntegration-test.js
index 3b1f31308a..0cf349100c 100644
--- a/remix-analyzer/test/analysis/staticAnalysisIntegration-test.js
+++ b/remix-analyzer/test/analysis/staticAnalysisIntegration-test.js
@@ -1,7 +1,7 @@
 var test = require('tape')
 var remixLib = require('remix-lib')
 
-var StatRunner = require('../../src/analysis/staticAnalysisRunner')
+var StatRunner = require('../../src/solidity-analyzer')
 var compilerInput = remixLib.helpers.compiler.compilerInput
 
 var compiler = require('solc')
@@ -43,7 +43,7 @@ testFiles.forEach((fileName) => {
 test('Integration test thisLocal.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/thisLocal')
+  var module = require('../../src/solidity-analyzer/modules/thisLocal')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -77,7 +77,7 @@ test('Integration test thisLocal.js', function (t) {
 test('Integration test checksEffectsInteraction.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/checksEffectsInteraction')
+  var module = require('../../src/solidity-analyzer/modules/checksEffectsInteraction')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 1,
@@ -111,7 +111,7 @@ test('Integration test checksEffectsInteraction.js', function (t) {
 test('Integration test constantFunctions.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/constantFunctions')
+  var module = require('../../src/solidity-analyzer/modules/constantFunctions')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -145,7 +145,7 @@ test('Integration test constantFunctions.js', function (t) {
 test('Integration test inlineAssembly.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/inlineAssembly')
+  var module = require('../../src/solidity-analyzer/modules/inlineAssembly')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -179,7 +179,7 @@ test('Integration test inlineAssembly.js', function (t) {
 test('Integration test txOrigin.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/txOrigin')
+  var module = require('../../src/solidity-analyzer/modules/txOrigin')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -213,7 +213,7 @@ test('Integration test txOrigin.js', function (t) {
 test('Integration test gasCosts.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/gasCosts')
+  var module = require('../../src/solidity-analyzer/modules/gasCosts')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 2,
@@ -247,7 +247,7 @@ test('Integration test gasCosts.js', function (t) {
 test('Integration test similarVariableNames.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/similarVariableNames')
+  var module = require('../../src/solidity-analyzer/modules/similarVariableNames')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -281,7 +281,7 @@ test('Integration test similarVariableNames.js', function (t) {
 test('Integration test inlineAssembly.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/inlineAssembly')
+  var module = require('../../src/solidity-analyzer/modules/inlineAssembly')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -315,7 +315,7 @@ test('Integration test inlineAssembly.js', function (t) {
 test('Integration test blockTimestamp.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/blockTimestamp')
+  var module = require('../../src/solidity-analyzer/modules/blockTimestamp')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 1,
@@ -349,7 +349,7 @@ test('Integration test blockTimestamp.js', function (t) {
 test('Integration test lowLevelCalls.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/lowLevelCalls')
+  var module = require('../../src/solidity-analyzer/modules/lowLevelCalls')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 1,
@@ -383,7 +383,7 @@ test('Integration test lowLevelCalls.js', function (t) {
 test('Integration test blockBlockhash.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/blockBlockhash')
+  var module = require('../../src/solidity-analyzer/modules/blockBlockhash')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -417,7 +417,7 @@ test('Integration test blockBlockhash.js', function (t) {
 test('Integration test noReturn.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/noReturn')
+  var module = require('../../src/solidity-analyzer/modules/noReturn')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -451,7 +451,7 @@ test('Integration test noReturn.js', function (t) {
 test('Integration test selfdestruct.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/selfdestruct')
+  var module = require('../../src/solidity-analyzer/modules/selfdestruct')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -485,7 +485,7 @@ test('Integration test selfdestruct.js', function (t) {
 test('Integration test guardConditions.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/guardConditions')
+  var module = require('../../src/solidity-analyzer/modules/guardConditions')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -519,7 +519,7 @@ test('Integration test guardConditions.js', function (t) {
 test('Integration test deleteDynamicArrays.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/deleteDynamicArrays')
+  var module = require('../../src/solidity-analyzer/modules/deleteDynamicArrays')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -553,7 +553,7 @@ test('Integration test deleteDynamicArrays.js', function (t) {
 test('Integration test assignAndCompare.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/assignAndCompare')
+  var module = require('../../src/solidity-analyzer/modules/assignAndCompare')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
@@ -587,7 +587,7 @@ test('Integration test assignAndCompare.js', function (t) {
 test('Integration test intDivisionTruncate.js', function (t) {
   t.plan(testFiles.length)
 
-  var module = require('../../src/analysis/modules/intDivisionTruncate')
+  var module = require('../../src/solidity-analyzer/modules/intDivisionTruncate')
 
   var lengthCheck = {
     'KingOfTheEtherThrone.sol': 0,
diff --git a/remix-analyzer/test/analysis/staticAnalysisIssues-test.js b/remix-analyzer/test/analysis/staticAnalysisIssues-test.js
index eb7b97a2ef..e3353d1786 100644
--- a/remix-analyzer/test/analysis/staticAnalysisIssues-test.js
+++ b/remix-analyzer/test/analysis/staticAnalysisIssues-test.js
@@ -1,7 +1,7 @@
 var test = require('tape')
 var remixLib = require('remix-lib')
 
-var StatRunner = require('../../src/analysis/staticAnalysisRunner')
+var StatRunner = require('../../src/solidity-analyzer')
 var compilerInput = remixLib.helpers.compiler.compilerInput
 
 var compiler = require('solc')
@@ -19,7 +19,7 @@ test('staticAnalysisIssues.functionParameterPassingError', function (t) {
   t.plan(2)
   var res = compile('functionParameters.sol')
 
-  var module = require('../../src/analysis/modules/checksEffectsInteraction')
+  var module = require('../../src/solidity-analyzer/modules/checksEffectsInteraction')
 
   var statRunner = new StatRunner()