diff --git a/bench/chacha.js b/bench/chacha.js
index e450f687..7f641e6e 100644
--- a/bench/chacha.js
+++ b/bench/chacha.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var chachapoly = require('../lib/bcoin/crypto/chachapoly');
+var chachapoly = require('../lib/crypto/chachapoly');
 var bench = require('./bench');
 
 console.log('note: rate measured in kb/s');
diff --git a/bin/cli b/bin/cli
index 1706f864..5fb318c1 100755
--- a/bin/cli
+++ b/bin/cli
@@ -2,10 +2,10 @@
 
 'use strict';
 
-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 config = require('../lib/node/config');
+var utils = require('../lib/utils/utils');
+var Client = require('../lib/http/client');
+var Wallet = require('../lib/http/wallet');
 var assert = utils.assert;
 
 function CLI() {
diff --git a/browser/server.js b/browser/server.js
index dff19ea3..40354747 100644
--- a/browser/server.js
+++ b/browser/server.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var HTTPBase = require('../lib/bcoin/http/base');
+var HTTPBase = require('../lib/http/base');
 var fs = require('fs');
 
 var server = new HTTPBase();
diff --git a/browser/wsproxy.js b/browser/wsproxy.js
index 0ef0df60..45b42444 100644
--- a/browser/wsproxy.js
+++ b/browser/wsproxy.js
@@ -3,10 +3,10 @@
 var http = require('http');
 var net = require('net');
 var IOServer = require('socket.io');
-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 utils = require('../lib/utils/utils');
+var IP = require('../lib/utils/ip');
+var networks = require('../lib/protocol/networks');
+var BufferWriter = require('../lib/utils/writer');
 var ports = [];
 var i, type;
 
diff --git a/lib/bcoin.js b/lib/bcoin.js
index 8886b5b0..8eee380a 100644
--- a/lib/bcoin.js
+++ b/lib/bcoin.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-var env = require('./bcoin/env');
-var utils = require('./bcoin/utils/utils');
+var env = require('./env');
+var utils = require('./utils/utils');
 var global = utils.global;
 
 /*
diff --git a/lib/bcoin/bip70/asn1.js b/lib/bip70/asn1.js
similarity index 100%
rename from lib/bcoin/bip70/asn1.js
rename to lib/bip70/asn1.js
diff --git a/lib/bcoin/bip70/bip70.js b/lib/bip70/bip70.js
similarity index 100%
rename from lib/bcoin/bip70/bip70.js
rename to lib/bip70/bip70.js
diff --git a/lib/bcoin/bip70/pk.js b/lib/bip70/pk.js
similarity index 100%
rename from lib/bcoin/bip70/pk.js
rename to lib/bip70/pk.js
diff --git a/lib/bcoin/bip70/protobuf.js b/lib/bip70/protobuf.js
similarity index 100%
rename from lib/bcoin/bip70/protobuf.js
rename to lib/bip70/protobuf.js
diff --git a/lib/bcoin/bip70/x509.js b/lib/bip70/x509.js
similarity index 99%
rename from lib/bcoin/bip70/x509.js
rename to lib/bip70/x509.js
index 6fb2cb39..de089e0c 100644
--- a/lib/bcoin/bip70/x509.js
+++ b/lib/bip70/x509.js
@@ -302,4 +302,4 @@ function isHash(data) {
   return false;
 }
 
-x509.setTrust(require('../../../etc/certs.json'));
+x509.setTrust(require('../../etc/certs.json'));
diff --git a/lib/bcoin/chain/chain.js b/lib/chain/chain.js
similarity index 100%
rename from lib/bcoin/chain/chain.js
rename to lib/chain/chain.js
diff --git a/lib/bcoin/chain/chaindb.js b/lib/chain/chaindb.js
similarity index 100%
rename from lib/bcoin/chain/chaindb.js
rename to lib/chain/chaindb.js
diff --git a/lib/bcoin/chain/chainentry.js b/lib/chain/chainentry.js
similarity index 100%
rename from lib/bcoin/chain/chainentry.js
rename to lib/chain/chainentry.js
diff --git a/lib/bcoin/chain/coins.js b/lib/chain/coins.js
similarity index 100%
rename from lib/bcoin/chain/coins.js
rename to lib/chain/coins.js
diff --git a/lib/bcoin/chain/coinview.js b/lib/chain/coinview.js
similarity index 100%
rename from lib/bcoin/chain/coinview.js
rename to lib/chain/coinview.js
diff --git a/lib/bcoin/crypto/aes.js b/lib/crypto/aes.js
similarity index 100%
rename from lib/bcoin/crypto/aes.js
rename to lib/crypto/aes.js
diff --git a/lib/bcoin/crypto/chachapoly.js b/lib/crypto/chachapoly.js
similarity index 100%
rename from lib/bcoin/crypto/chachapoly.js
rename to lib/crypto/chachapoly.js
diff --git a/lib/bcoin/crypto/crypto.js b/lib/crypto/crypto.js
similarity index 100%
rename from lib/bcoin/crypto/crypto.js
rename to lib/crypto/crypto.js
diff --git a/lib/bcoin/crypto/ec.js b/lib/crypto/ec.js
similarity index 100%
rename from lib/bcoin/crypto/ec.js
rename to lib/crypto/ec.js
diff --git a/lib/bcoin/crypto/scrypt-async.js b/lib/crypto/scrypt-async.js
similarity index 100%
rename from lib/bcoin/crypto/scrypt-async.js
rename to lib/crypto/scrypt-async.js
diff --git a/lib/bcoin/crypto/scrypt.js b/lib/crypto/scrypt.js
similarity index 100%
rename from lib/bcoin/crypto/scrypt.js
rename to lib/crypto/scrypt.js
diff --git a/lib/bcoin/crypto/siphash.js b/lib/crypto/siphash.js
similarity index 100%
rename from lib/bcoin/crypto/siphash.js
rename to lib/crypto/siphash.js
diff --git a/lib/bcoin/db/ldb.js b/lib/db/ldb.js
similarity index 100%
rename from lib/bcoin/db/ldb.js
rename to lib/db/ldb.js
diff --git a/lib/bcoin/db/level.js b/lib/db/level.js
similarity index 100%
rename from lib/bcoin/db/level.js
rename to lib/db/level.js
diff --git a/lib/bcoin/db/lowlevelup.js b/lib/db/lowlevelup.js
similarity index 100%
rename from lib/bcoin/db/lowlevelup.js
rename to lib/db/lowlevelup.js
diff --git a/lib/bcoin/db/rbt.js b/lib/db/rbt.js
similarity index 100%
rename from lib/bcoin/db/rbt.js
rename to lib/db/rbt.js
diff --git a/lib/bcoin/env.js b/lib/env.js
similarity index 100%
rename from lib/bcoin/env.js
rename to lib/env.js
diff --git a/lib/bcoin/hd/README.md b/lib/hd/README.md
similarity index 100%
rename from lib/bcoin/hd/README.md
rename to lib/hd/README.md
diff --git a/lib/bcoin/hd/hd.js b/lib/hd/hd.js
similarity index 100%
rename from lib/bcoin/hd/hd.js
rename to lib/hd/hd.js
diff --git a/lib/bcoin/hd/mnemonic.js b/lib/hd/mnemonic.js
similarity index 99%
rename from lib/bcoin/hd/mnemonic.js
rename to lib/hd/mnemonic.js
index eb9fc929..4cfa449f 100644
--- a/lib/bcoin/hd/mnemonic.js
+++ b/lib/hd/mnemonic.js
@@ -530,7 +530,7 @@ function nfkd(str) {
     return str.normalize('NFKD');
 
   if (!unorm)
-    unorm = require('../../../vendor/unorm');
+    unorm = require('../../vendor/unorm');
 
   return unorm.nfkd(str);
 }
diff --git a/lib/bcoin/hd/private.js b/lib/hd/private.js
similarity index 100%
rename from lib/bcoin/hd/private.js
rename to lib/hd/private.js
diff --git a/lib/bcoin/hd/public.js b/lib/hd/public.js
similarity index 100%
rename from lib/bcoin/hd/public.js
rename to lib/hd/public.js
diff --git a/lib/bcoin/hd/words/chinese-simplified.js b/lib/hd/words/chinese-simplified.js
similarity index 100%
rename from lib/bcoin/hd/words/chinese-simplified.js
rename to lib/hd/words/chinese-simplified.js
diff --git a/lib/bcoin/hd/words/chinese-traditional.js b/lib/hd/words/chinese-traditional.js
similarity index 100%
rename from lib/bcoin/hd/words/chinese-traditional.js
rename to lib/hd/words/chinese-traditional.js
diff --git a/lib/bcoin/hd/words/english.js b/lib/hd/words/english.js
similarity index 100%
rename from lib/bcoin/hd/words/english.js
rename to lib/hd/words/english.js
diff --git a/lib/bcoin/hd/words/french.js b/lib/hd/words/french.js
similarity index 100%
rename from lib/bcoin/hd/words/french.js
rename to lib/hd/words/french.js
diff --git a/lib/bcoin/hd/words/italian.js b/lib/hd/words/italian.js
similarity index 100%
rename from lib/bcoin/hd/words/italian.js
rename to lib/hd/words/italian.js
diff --git a/lib/bcoin/hd/words/japanese.js b/lib/hd/words/japanese.js
similarity index 100%
rename from lib/bcoin/hd/words/japanese.js
rename to lib/hd/words/japanese.js
diff --git a/lib/bcoin/http/base.js b/lib/http/base.js
similarity index 100%
rename from lib/bcoin/http/base.js
rename to lib/http/base.js
diff --git a/lib/bcoin/http/client.js b/lib/http/client.js
similarity index 100%
rename from lib/bcoin/http/client.js
rename to lib/http/client.js
diff --git a/lib/bcoin/http/index.js b/lib/http/index.js
similarity index 100%
rename from lib/bcoin/http/index.js
rename to lib/http/index.js
diff --git a/lib/bcoin/http/request.js b/lib/http/request.js
similarity index 100%
rename from lib/bcoin/http/request.js
rename to lib/http/request.js
diff --git a/lib/bcoin/http/rpc.js b/lib/http/rpc.js
similarity index 100%
rename from lib/bcoin/http/rpc.js
rename to lib/http/rpc.js
diff --git a/lib/bcoin/http/rpcclient.js b/lib/http/rpcclient.js
similarity index 100%
rename from lib/bcoin/http/rpcclient.js
rename to lib/http/rpcclient.js
diff --git a/lib/bcoin/http/server.js b/lib/http/server.js
similarity index 100%
rename from lib/bcoin/http/server.js
rename to lib/http/server.js
diff --git a/lib/bcoin/http/wallet.js b/lib/http/wallet.js
similarity index 100%
rename from lib/bcoin/http/wallet.js
rename to lib/http/wallet.js
diff --git a/lib/bcoin/mempool/fees.js b/lib/mempool/fees.js
similarity index 100%
rename from lib/bcoin/mempool/fees.js
rename to lib/mempool/fees.js
diff --git a/lib/bcoin/mempool/mempool.js b/lib/mempool/mempool.js
similarity index 100%
rename from lib/bcoin/mempool/mempool.js
rename to lib/mempool/mempool.js
diff --git a/lib/bcoin/miner/miner.js b/lib/miner/miner.js
similarity index 100%
rename from lib/bcoin/miner/miner.js
rename to lib/miner/miner.js
diff --git a/lib/bcoin/miner/minerblock.js b/lib/miner/minerblock.js
similarity index 100%
rename from lib/bcoin/miner/minerblock.js
rename to lib/miner/minerblock.js
diff --git a/lib/bcoin/net/bip150.js b/lib/net/bip150.js
similarity index 100%
rename from lib/bcoin/net/bip150.js
rename to lib/net/bip150.js
diff --git a/lib/bcoin/net/bip151.js b/lib/net/bip151.js
similarity index 100%
rename from lib/bcoin/net/bip151.js
rename to lib/net/bip151.js
diff --git a/lib/bcoin/net/bip152.js b/lib/net/bip152.js
similarity index 100%
rename from lib/bcoin/net/bip152.js
rename to lib/net/bip152.js
diff --git a/lib/bcoin/net/framer.js b/lib/net/framer.js
similarity index 100%
rename from lib/bcoin/net/framer.js
rename to lib/net/framer.js
diff --git a/lib/bcoin/net/packets.js b/lib/net/packets.js
similarity index 100%
rename from lib/bcoin/net/packets.js
rename to lib/net/packets.js
diff --git a/lib/bcoin/net/parser.js b/lib/net/parser.js
similarity index 100%
rename from lib/bcoin/net/parser.js
rename to lib/net/parser.js
diff --git a/lib/bcoin/net/peer.js b/lib/net/peer.js
similarity index 100%
rename from lib/bcoin/net/peer.js
rename to lib/net/peer.js
diff --git a/lib/bcoin/net/pool.js b/lib/net/pool.js
similarity index 100%
rename from lib/bcoin/net/pool.js
rename to lib/net/pool.js
diff --git a/lib/bcoin/net/proxysocket.js b/lib/net/proxysocket.js
similarity index 96%
rename from lib/bcoin/net/proxysocket.js
rename to lib/net/proxysocket.js
index 2662046d..cf16e05c 100644
--- a/lib/bcoin/net/proxysocket.js
+++ b/lib/net/proxysocket.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var bcoin = require('../lib/bcoin/env');
+var bcoin = require('../env');
 var utils = bcoin.utils;
-var BufferWriter = require('../lib/bcoin/utils/writer');
+var BufferWriter = require('../utils/writer');
 var assert = utils.assert;
 var EventEmitter = require('events').EventEmitter;
 var IOClient = require('socket.io-client');
diff --git a/lib/bcoin/net/timedata.js b/lib/net/timedata.js
similarity index 100%
rename from lib/bcoin/net/timedata.js
rename to lib/net/timedata.js
diff --git a/lib/bcoin/node/config.js b/lib/node/config.js
similarity index 100%
rename from lib/bcoin/node/config.js
rename to lib/node/config.js
diff --git a/lib/bcoin/node/fullnode.js b/lib/node/fullnode.js
similarity index 100%
rename from lib/bcoin/node/fullnode.js
rename to lib/node/fullnode.js
diff --git a/lib/bcoin/node/logger.js b/lib/node/logger.js
similarity index 100%
rename from lib/bcoin/node/logger.js
rename to lib/node/logger.js
diff --git a/lib/bcoin/node/node.js b/lib/node/node.js
similarity index 100%
rename from lib/bcoin/node/node.js
rename to lib/node/node.js
diff --git a/lib/bcoin/node/spvnode.js b/lib/node/spvnode.js
similarity index 100%
rename from lib/bcoin/node/spvnode.js
rename to lib/node/spvnode.js
diff --git a/lib/bcoin/primitives/abstractblock.js b/lib/primitives/abstractblock.js
similarity index 100%
rename from lib/bcoin/primitives/abstractblock.js
rename to lib/primitives/abstractblock.js
diff --git a/lib/bcoin/primitives/address.js b/lib/primitives/address.js
similarity index 100%
rename from lib/bcoin/primitives/address.js
rename to lib/primitives/address.js
diff --git a/lib/bcoin/primitives/block.js b/lib/primitives/block.js
similarity index 100%
rename from lib/bcoin/primitives/block.js
rename to lib/primitives/block.js
diff --git a/lib/bcoin/primitives/bloom.js b/lib/primitives/bloom.js
similarity index 100%
rename from lib/bcoin/primitives/bloom.js
rename to lib/primitives/bloom.js
diff --git a/lib/bcoin/primitives/coin.js b/lib/primitives/coin.js
similarity index 100%
rename from lib/bcoin/primitives/coin.js
rename to lib/primitives/coin.js
diff --git a/lib/bcoin/primitives/headers.js b/lib/primitives/headers.js
similarity index 100%
rename from lib/bcoin/primitives/headers.js
rename to lib/primitives/headers.js
diff --git a/lib/bcoin/primitives/input.js b/lib/primitives/input.js
similarity index 100%
rename from lib/bcoin/primitives/input.js
rename to lib/primitives/input.js
diff --git a/lib/bcoin/primitives/invitem.js b/lib/primitives/invitem.js
similarity index 100%
rename from lib/bcoin/primitives/invitem.js
rename to lib/primitives/invitem.js
diff --git a/lib/bcoin/primitives/keyring.js b/lib/primitives/keyring.js
similarity index 100%
rename from lib/bcoin/primitives/keyring.js
rename to lib/primitives/keyring.js
diff --git a/lib/bcoin/primitives/memblock.js b/lib/primitives/memblock.js
similarity index 100%
rename from lib/bcoin/primitives/memblock.js
rename to lib/primitives/memblock.js
diff --git a/lib/bcoin/primitives/merkleblock.js b/lib/primitives/merkleblock.js
similarity index 100%
rename from lib/bcoin/primitives/merkleblock.js
rename to lib/primitives/merkleblock.js
diff --git a/lib/bcoin/primitives/mtx.js b/lib/primitives/mtx.js
similarity index 100%
rename from lib/bcoin/primitives/mtx.js
rename to lib/primitives/mtx.js
diff --git a/lib/bcoin/primitives/outpoint.js b/lib/primitives/outpoint.js
similarity index 100%
rename from lib/bcoin/primitives/outpoint.js
rename to lib/primitives/outpoint.js
diff --git a/lib/bcoin/primitives/output.js b/lib/primitives/output.js
similarity index 100%
rename from lib/bcoin/primitives/output.js
rename to lib/primitives/output.js
diff --git a/lib/bcoin/primitives/tx.js b/lib/primitives/tx.js
similarity index 100%
rename from lib/bcoin/primitives/tx.js
rename to lib/primitives/tx.js
diff --git a/lib/bcoin/protocol/constants.js b/lib/protocol/constants.js
similarity index 99%
rename from lib/bcoin/protocol/constants.js
rename to lib/protocol/constants.js
index 5dceec80..f5008edd 100644
--- a/lib/bcoin/protocol/constants.js
+++ b/lib/protocol/constants.js
@@ -656,7 +656,7 @@ exports.ZERO_KEY = new Buffer(
  * @default
  */
 
-exports.USER_VERSION = require('../../../package.json').version;
+exports.USER_VERSION = require('../../package.json').version;
 
 /**
  * BCoin user agent: `/bcoin:{version}/`.
diff --git a/lib/bcoin/protocol/network.js b/lib/protocol/network.js
similarity index 100%
rename from lib/bcoin/protocol/network.js
rename to lib/protocol/network.js
diff --git a/lib/bcoin/protocol/networks.js b/lib/protocol/networks.js
similarity index 100%
rename from lib/bcoin/protocol/networks.js
rename to lib/protocol/networks.js
diff --git a/lib/bcoin/script/opcode.js b/lib/script/opcode.js
similarity index 100%
rename from lib/bcoin/script/opcode.js
rename to lib/script/opcode.js
diff --git a/lib/bcoin/script/program.js b/lib/script/program.js
similarity index 100%
rename from lib/bcoin/script/program.js
rename to lib/script/program.js
diff --git a/lib/bcoin/script/script.js b/lib/script/script.js
similarity index 100%
rename from lib/bcoin/script/script.js
rename to lib/script/script.js
diff --git a/lib/bcoin/script/sigcache.js b/lib/script/sigcache.js
similarity index 100%
rename from lib/bcoin/script/sigcache.js
rename to lib/script/sigcache.js
diff --git a/lib/bcoin/script/stack.js b/lib/script/stack.js
similarity index 100%
rename from lib/bcoin/script/stack.js
rename to lib/script/stack.js
diff --git a/lib/bcoin/script/witness.js b/lib/script/witness.js
similarity index 100%
rename from lib/bcoin/script/witness.js
rename to lib/script/witness.js
diff --git a/lib/bcoin/types.js b/lib/types.js
similarity index 100%
rename from lib/bcoin/types.js
rename to lib/types.js
diff --git a/lib/bcoin/utils/async.js b/lib/utils/async.js
similarity index 100%
rename from lib/bcoin/utils/async.js
rename to lib/utils/async.js
diff --git a/lib/bcoin/utils/errors.js b/lib/utils/errors.js
similarity index 100%
rename from lib/bcoin/utils/errors.js
rename to lib/utils/errors.js
diff --git a/lib/bcoin/utils/ip.js b/lib/utils/ip.js
similarity index 98%
rename from lib/bcoin/utils/ip.js
rename to lib/utils/ip.js
index 22606a4e..1b9639a0 100644
--- a/lib/bcoin/utils/ip.js
+++ b/lib/utils/ip.js
@@ -7,7 +7,7 @@
 
 'use strict';
 
-var IP = require('../../../vendor/ip');
+var IP = require('../../vendor/ip');
 var assert = require('assert');
 
 /**
diff --git a/lib/bcoin/utils/locker.js b/lib/utils/locker.js
similarity index 100%
rename from lib/bcoin/utils/locker.js
rename to lib/utils/locker.js
diff --git a/lib/bcoin/utils/lru.js b/lib/utils/lru.js
similarity index 100%
rename from lib/bcoin/utils/lru.js
rename to lib/utils/lru.js
diff --git a/lib/bcoin/utils/reader.js b/lib/utils/reader.js
similarity index 100%
rename from lib/bcoin/utils/reader.js
rename to lib/utils/reader.js
diff --git a/lib/bcoin/utils/uri.js b/lib/utils/uri.js
similarity index 100%
rename from lib/bcoin/utils/uri.js
rename to lib/utils/uri.js
diff --git a/lib/bcoin/utils/utils.js b/lib/utils/utils.js
similarity index 99%
rename from lib/bcoin/utils/utils.js
rename to lib/utils/utils.js
index bfb0e1ec..fb1de747 100644
--- a/lib/bcoin/utils/utils.js
+++ b/lib/utils/utils.js
@@ -462,7 +462,7 @@ utils.equal = function equal(a, b) {
  */
 
 if (utils.isBrowser)
-  require('../../../vendor/setimmediate');
+  require('../../vendor/setimmediate');
 
 if (typeof setImmediate === 'function') {
   utils.nextTick = setImmediate;
diff --git a/lib/bcoin/utils/writer.js b/lib/utils/writer.js
similarity index 100%
rename from lib/bcoin/utils/writer.js
rename to lib/utils/writer.js
diff --git a/lib/bcoin/wallet/account.js b/lib/wallet/account.js
similarity index 100%
rename from lib/bcoin/wallet/account.js
rename to lib/wallet/account.js
diff --git a/lib/bcoin/wallet/path.js b/lib/wallet/path.js
similarity index 100%
rename from lib/bcoin/wallet/path.js
rename to lib/wallet/path.js
diff --git a/lib/bcoin/wallet/txdb.js b/lib/wallet/txdb.js
similarity index 100%
rename from lib/bcoin/wallet/txdb.js
rename to lib/wallet/txdb.js
diff --git a/lib/bcoin/wallet/wallet.js b/lib/wallet/wallet.js
similarity index 100%
rename from lib/bcoin/wallet/wallet.js
rename to lib/wallet/wallet.js
diff --git a/lib/bcoin/wallet/walletdb.js b/lib/wallet/walletdb.js
similarity index 100%
rename from lib/bcoin/wallet/walletdb.js
rename to lib/wallet/walletdb.js
diff --git a/lib/worker.js b/lib/worker.js
index ab873b16..ada8fb10 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -24,7 +24,7 @@ if (typeof importScripts !== 'undefined') {
   };
 } else {
   env = process.env;
-  bcoin = require('./bcoin/env');
+  bcoin = require('./env');
   bcoin.set(env.BCOIN_WORKER_NETWORK);
   bcoin.workers.listen();
 }
diff --git a/lib/bcoin/workers/jobs.js b/lib/workers/jobs.js
similarity index 100%
rename from lib/bcoin/workers/jobs.js
rename to lib/workers/jobs.js
diff --git a/lib/bcoin/workers/workers.js b/lib/workers/workers.js
similarity index 100%
rename from lib/bcoin/workers/workers.js
rename to lib/workers/workers.js
diff --git a/scripts/gen.js b/scripts/gen.js
index 8c72f323..a600299d 100644
--- a/scripts/gen.js
+++ b/scripts/gen.js
@@ -1,9 +1,8 @@
 'use strict';
 
 var bcoin = require('bcoin');
-var constants = bcoin.protocol.constants;
+var constants = bcoin.constants;
 var opcodes = constants.opcodes;
-var network = bcoin.protocol.network;
 var utils = bcoin.utils;
 var bn = require('bn.js');
 
diff --git a/test/aes-test.js b/test/aes-test.js
index 8c19f281..831a5e17 100644
--- a/test/aes-test.js
+++ b/test/aes-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
 var bn = require('bn.js');
-var utils = require('../lib/bcoin/utils/utils');
+var utils = require('../lib/utils/utils');
 var assert = require('assert');
-var aes = require('../lib/bcoin/crypto/aes');
+var aes = require('../lib/crypto/aes');
 var crypto = require('crypto');
 
 describe('AES', function() {
diff --git a/test/bip70-test.js b/test/bip70-test.js
index 5a3ba71f..cbc2ee16 100644
--- a/test/bip70-test.js
+++ b/test/bip70-test.js
@@ -7,8 +7,8 @@ var constants = bcoin.constants;
 var network = bcoin.networks;
 var assert = require('assert');
 var tests = require('./data/bip70.json');
-var bip70 = require('../lib/bcoin/bip70/bip70');
-var x509 = require('../lib/bcoin/bip70/x509');
+var bip70 = require('../lib/bip70/bip70');
+var x509 = require('../lib/bip70/x509');
 
 tests.valid = new Buffer(tests.valid, 'hex');
 tests.invalid = new Buffer(tests.invalid, 'hex');
diff --git a/test/block-test.js b/test/block-test.js
index ac8ebd71..69e93813 100644
--- a/test/block-test.js
+++ b/test/block-test.js
@@ -9,7 +9,7 @@ var assert = require('assert');
 var block300025 = require('./data/block300025.json');
 var fs = require('fs');
 var cmpct = fs.readFileSync(__dirname + '/data/compactblock.hex', 'utf8').trim().split('\n');
-var bip152 = require('../lib/bcoin/net/bip152');
+var bip152 = require('../lib/net/bip152');
 
 describe('Block', function() {
   var mblock = bcoin.merkleblock({
diff --git a/test/chachapoly-test.js b/test/chachapoly-test.js
index 3d3a3b52..e4f7b934 100644
--- a/test/chachapoly-test.js
+++ b/test/chachapoly-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var chachapoly = require('../lib/bcoin/crypto/chachapoly');
+var chachapoly = require('../lib/crypto/chachapoly');
 var ChaCha20 = chachapoly.ChaCha20;
 var Poly1305 = chachapoly.Poly1305;
 var AEAD = chachapoly.AEAD;
diff --git a/test/protocol-test.js b/test/protocol-test.js
index 5bfcacc0..e8bd215f 100644
--- a/test/protocol-test.js
+++ b/test/protocol-test.js
@@ -8,8 +8,8 @@ var utils = bcoin.utils;
 var fs = require('fs');
 var alertData = fs.readFileSync(__dirname + '/data/alertTests.raw');
 var NetworkAddress = bcoin.packets.NetworkAddress;
-var Framer = require('../lib/bcoin/net/framer');
-var Parser = require('../lib/bcoin/net/parser');
+var Framer = require('../lib/net/framer');
+var Parser = require('../lib/net/parser');
 
 describe('Protocol', function() {
   var version = require('../package.json').version;
diff --git a/test/scrypt-test.js b/test/scrypt-test.js
index 1d434cac..fd409e1b 100644
--- a/test/scrypt-test.js
+++ b/test/scrypt-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var scrypt = require('../lib/bcoin/crypto/scrypt');
+var scrypt = require('../lib/crypto/scrypt');
 
 describe('Scrypt', function() {
   it('should perform scrypt with N=16', function() {
diff --git a/test/siphash-test.js b/test/siphash-test.js
index b99a0580..a2f33d98 100644
--- a/test/siphash-test.js
+++ b/test/siphash-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var siphash = require('../lib/bcoin/crypto/siphash');
+var siphash = require('../lib/crypto/siphash');
 
 describe('SipHash', function() {
   it('should perform siphash with no data', function() {