diff --git a/lib/bcoin/crypto/index.js b/lib/bcoin/crypto/index.js
new file mode 100644
index 00000000..e77588d0
--- /dev/null
+++ b/lib/bcoin/crypto/index.js
@@ -0,0 +1 @@
+module.exports = require('./crypto');
diff --git a/lib/bcoin/env.js b/lib/bcoin/env.js
index dfbf2963..ebc0c6d4 100644
--- a/lib/bcoin/env.js
+++ b/lib/bcoin/env.js
@@ -128,7 +128,7 @@ function Environment() {
   this.config = require('./config');
 
   this.protocol = require('./protocol');
-  this.packets = this.protocol.packets;
+  this.packets = require('./net/packets');
   this.network = require('./network');
   this.errors = require('./errors');
   this.ldb = require('./db/ldb');
diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/net/framer.js
similarity index 100%
rename from lib/bcoin/protocol/framer.js
rename to lib/bcoin/net/framer.js
diff --git a/lib/bcoin/protocol/packets.js b/lib/bcoin/net/packets.js
similarity index 99%
rename from lib/bcoin/protocol/packets.js
rename to lib/bcoin/net/packets.js
index 5f767d26..a391c82b 100644
--- a/lib/bcoin/protocol/packets.js
+++ b/lib/bcoin/net/packets.js
@@ -8,7 +8,7 @@
 'use strict';
 
 var bcoin = require('../env');
-var constants = require('./constants');
+var constants = require('../protocol/constants');
 var utils = require('../utils/utils');
 var bn = require('bn.js');
 var IP = require('../utils/ip');
diff --git a/lib/bcoin/protocol/parser.js b/lib/bcoin/net/parser.js
similarity index 99%
rename from lib/bcoin/protocol/parser.js
rename to lib/bcoin/net/parser.js
index a0c223fa..62dcbc29 100644
--- a/lib/bcoin/protocol/parser.js
+++ b/lib/bcoin/net/parser.js
@@ -11,7 +11,7 @@ var bcoin = require('../env');
 var EventEmitter = require('events').EventEmitter;
 var utils = require('../utils/utils');
 var assert = utils.assert;
-var constants = require('./constants');
+var constants = require('../protocol/constants');
 var BufferReader = require('../utils/reader');
 
 /**
diff --git a/lib/bcoin/net/peer.js b/lib/bcoin/net/peer.js
index 8365b135..d669fcf7 100644
--- a/lib/bcoin/net/peer.js
+++ b/lib/bcoin/net/peer.js
@@ -11,6 +11,8 @@ var bcoin = require('../env');
 var EventEmitter = require('events').EventEmitter;
 var utils = require('../utils/utils');
 var IP = require('../utils/ip');
+var Parser = require('./parser');
+var Framer = require('./framer');
 var assert = utils.assert;
 var constants = bcoin.protocol.constants;
 var InvItem = bcoin.packets.InvItem;
@@ -167,8 +169,8 @@ function Peer(pool, options) {
     }
   }
 
-  this.parser = new bcoin.protocol.parser(this);
-  this.framer = new bcoin.protocol.framer(this);
+  this.parser = new Parser(this);
+  this.framer = new Framer(this);
 
   this._init();
 }
diff --git a/lib/bcoin/protocol/index.js b/lib/bcoin/protocol/index.js
index a8014554..9bcf3957 100644
--- a/lib/bcoin/protocol/index.js
+++ b/lib/bcoin/protocol/index.js
@@ -9,6 +9,3 @@
 
 exports.constants = require('./constants');
 exports.network = require('./network');
-exports.framer = require('./framer');
-exports.parser = require('./parser');
-exports.packets = require('./packets');
diff --git a/lib/bcoin/utils/index.js b/lib/bcoin/utils/index.js
new file mode 100644
index 00000000..c1abf981
--- /dev/null
+++ b/lib/bcoin/utils/index.js
@@ -0,0 +1 @@
+module.exports = require('./utils');
diff --git a/test/protocol-test.js b/test/protocol-test.js
index a3780479..b6819d36 100644
--- a/test/protocol-test.js
+++ b/test/protocol-test.js
@@ -8,6 +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');
 
 describe('Protocol', function() {
   var version = require('../package.json').version;
@@ -16,8 +18,8 @@ describe('Protocol', function() {
   var parser;
   var framer;
   beforeEach(function() {
-    parser = bcoin.protocol.parser();
-    framer = bcoin.protocol.framer();
+    parser = new Parser();
+    framer = new Framer();
   });
 
   function packetTest(command, payload, test) {
@@ -197,21 +199,21 @@ describe('Protocol', function() {
       'c9954c44b0ce168bc78efd5f1e1c7db9d6c21b3016599ffffffff01a029' +
       'de5c0500000017a9141d9ca71efa36d814424ea6ca1437e67287aebe348' +
       '700000000', 'hex');
-    var tx = bcoin.protocol.parser.parseTX(rawTwoTxs);
+    var tx = Parser.parseTX(rawTwoTxs);
     delete tx._raw;
-    assert.deepEqual(bcoin.protocol.framer.tx(tx), rawFirstTx);
+    assert.deepEqual(Framer.tx(tx), rawFirstTx);
   });
 
   it('should parse, reserialize, and verify alert packets', function() {
     var p = new bcoin.reader(alertData);
     p.start();
     while (p.left()) {
-      var alert = bcoin.protocol.parser.parseAlert(p);
+      var alert = Parser.parseAlert(p);
       assert(alert.verify(network.alertKey));
       alert._payload = null;
       alert._hash = null;
-      var data = bcoin.protocol.framer.alert(alert);
-      alert = bcoin.protocol.parser.parseAlert(data);
+      var data = Framer.alert(alert);
+      alert = Parser.parseAlert(data);
       assert(alert.verify(network.alertKey));
     }
     p.end();