diff --git a/expanse-buildbot b/expanse-buildbot
deleted file mode 160000
index bce4905f5b..0000000000
--- a/expanse-buildbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bce4905f5b10f3940303033747bce866f3d46057
diff --git a/jsre/ethereum_js.go b/jsre/ethereum_js.go
index ddda640a58..9a6cc8716b 100644
--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go
@@ -2424,11 +2424,11 @@ module.exports={
  */
 
 var version = require('./version.json');
-var net = require('./web3/net');
-var exp = require('./web3/exp');
-var db = require('./web3/db');
-var shh = require('./web3/shh');
-var watches = require('./web3/watches');
+var net = require('./web3/methods/net');
+var eth = require('./web3/methods/eth');
+var db = require('./web3/methods/db');
+var shh = require('./web3/methods/shh');
+var watches = require('./web3/methods/watches');
 var Filter = require('./web3/filter');
 var utils = require('./utils/utils');
 var formatters = require('./web3/formatters');