diff --git a/bin/cli b/bin/cli
index 5dc65e35..1706f864 100755
--- a/bin/cli
+++ b/bin/cli
@@ -2,8 +2,8 @@
 
 'use strict';
 
-var config = require('../lib/bcoin/config');
-var utils = require('../lib/bcoin/utils');
+var config = require('../lib/bcoin/node/config');
+var utils = require('../lib/bcoin/utils/utils');
 var Client = require('../lib/bcoin/http/client');
 var Wallet = require('../lib/bcoin/http/wallet');
 var assert = utils.assert;
diff --git a/browser/proxysocket.js b/browser/proxysocket.js
index c16175ab..2662046d 100644
--- a/browser/proxysocket.js
+++ b/browser/proxysocket.js
@@ -1,8 +1,8 @@
 'use strict';
 
 var bcoin = require('../lib/bcoin/env');
-var utils = require('../lib/bcoin/utils');
-var BufferWriter = require('../lib/bcoin/writer');
+var utils = bcoin.utils;
+var BufferWriter = require('../lib/bcoin/utils/writer');
 var assert = utils.assert;
 var EventEmitter = require('events').EventEmitter;
 var IOClient = require('socket.io-client');
diff --git a/browser/wsproxy.js b/browser/wsproxy.js
index 95fd3bb8..0ef0df60 100644
--- a/browser/wsproxy.js
+++ b/browser/wsproxy.js
@@ -3,16 +3,16 @@
 var http = require('http');
 var net = require('net');
 var IOServer = require('socket.io');
-var utils = require('../lib/bcoin/utils');
-var IP = require('../lib/bcoin/ip');
-var network = require('../lib/bcoin/protocol/network');
-var BufferWriter = require('../lib/bcoin/writer');
+var utils = require('../lib/bcoin/utils/utils');
+var IP = require('../lib/bcoin/utils/ip');
+var networks = require('../lib/bcoin/protocol/networks');
+var BufferWriter = require('../lib/bcoin/utils/writer');
 var ports = [];
 var i, type;
 
-for (i = 0; i < network.types.length; i++) {
-  type = network.types[i];
-  ports.push(network[type].port);
+for (i = 0; i < networks.types.length; i++) {
+  type = networks.types[i];
+  ports.push(networks[type].port);
 }
 
 module.exports = function wsproxy(options) {
diff --git a/lib/bcoin/workers/jobs.js b/lib/bcoin/workers/jobs.js
index 424825c6..ff8ce30f 100644
--- a/lib/bcoin/workers/jobs.js
+++ b/lib/bcoin/workers/jobs.js
@@ -75,6 +75,6 @@ jobs.mine = function mine(attempt) {
  */
 
 jobs.scrypt = function scrypt(passwd, salt, N, r, p, len) {
-  var scrypt = require('./scrypt');
+  var scrypt = require('../crypto/scrypt');
   return scrypt(passwd, salt, N >>> 0, r >>> 0, p >>> 0, len);
 };