diff --git a/lib/utils/forkedblockchain.js b/lib/forking/forked_blockchain.js
similarity index 98%
rename from lib/utils/forkedblockchain.js
rename to lib/forking/forked_blockchain.js
index 2355f69a3f..713075a5b6 100644
--- a/lib/utils/forkedblockchain.js
+++ b/lib/forking/forked_blockchain.js
@@ -1,13 +1,13 @@
 var BlockchainDouble = require("../blockchain_double.js");
 var Account = require("ethereumjs-account").default;
 var Block = require("ethereumjs-block");
-var Log = require("./log.js");
-var Receipt = require("./receipt.js");
+var Log = require("../utils/log.js");
+var Receipt = require("../utils/receipt.js");
 var utils = require("ethereumjs-util");
-var ForkedStorageTrie = require("./forkedstoragetrie.js");
+var ForkedStorageTrie = require("./forked_storage_trie.js");
 var Web3 = require("web3");
-var to = require("./to.js");
-var Transaction = require("./transaction");
+var to = require("../utils/to.js");
+var Transaction = require("../utils/transaction");
 var async = require("async");
 var LRUCache = require("lru-cache");
 const BN = utils.BN;
@@ -121,9 +121,11 @@ function ForkedBlockchain(options) {
 
             pendingRequests.set(key, pendingRequest);
             // Node 8 doesn't have Promise.finally
-            promise.catch(() => {}).then(() => {
-              pendingRequests.delete(key);
-            });
+            promise
+              .catch(() => {})
+              .then(() => {
+                pendingRequests.delete(key);
+              });
             return promise;
           }
         })
diff --git a/lib/utils/forkedstoragetrie.js b/lib/forking/forked_storage_trie.js
similarity index 99%
rename from lib/utils/forkedstoragetrie.js
rename to lib/forking/forked_storage_trie.js
index 5e709b3956..c64bb48ff2 100644
--- a/lib/utils/forkedstoragetrie.js
+++ b/lib/forking/forked_storage_trie.js
@@ -5,7 +5,7 @@ const checkpointInterface = require("merkle-patricia-tree/checkpoint-interface")
 var utils = require("ethereumjs-util");
 var inherits = require("util").inherits;
 var Web3 = require("web3");
-var to = require("./to.js");
+var to = require("../utils/to.js");
 
 inherits(ForkedStorageBaseTrie, BaseTrie);
 
diff --git a/lib/statemanager.js b/lib/statemanager.js
index 470074a973..85d0b34b62 100644
--- a/lib/statemanager.js
+++ b/lib/statemanager.js
@@ -8,7 +8,7 @@ var wallet = require("ethereumjs-wallet");
 var hdkey = require("ethereumjs-wallet/hdkey");
 var async = require("async");
 var BlockchainDouble = require("./blockchain_double.js");
-var ForkedBlockchain = require("./utils/forkedblockchain.js");
+var ForkedBlockchain = require("./forking/forked_blockchain.js");
 var Web3 = require("web3");
 var fs = require("fs");
 var sigUtil = require("eth-sig-util");