diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js
index 578356753..5ca10db77 100644
--- a/lib/contracts/blockchain.js
+++ b/lib/contracts/blockchain.js
@@ -5,6 +5,7 @@ const utils = require('../utils/utils');
 
 const WEB3_READY = 'web3Ready';
 
+// TODO: consider another name, this is the blockchain connector
 class Blockchain {
   constructor(options) {
     const self = this;
diff --git a/lib/core/engine.js b/lib/core/engine.js
index 6af649747..4aa22b2ef 100644
--- a/lib/core/engine.js
+++ b/lib/core/engine.js
@@ -142,7 +142,7 @@ class Engine {
   }
 
   codeRunnerService(_options) {
-    const CodeRunner = require('../coderunner/codeRunner.js');
+    const CodeRunner = require('./modules/coderunner/codeRunner.js');
     this.codeRunner = new CodeRunner({
       plugins: this.plugins,
       events: this.events,
diff --git a/lib/coderunner/codeRunner.js b/lib/core/modules/coderunner/codeRunner.js
similarity index 100%
rename from lib/coderunner/codeRunner.js
rename to lib/core/modules/coderunner/codeRunner.js
diff --git a/lib/coderunner/runCode.js b/lib/core/modules/coderunner/runCode.js
similarity index 100%
rename from lib/coderunner/runCode.js
rename to lib/core/modules/coderunner/runCode.js