diff --git a/lib/index.js b/lib/index.js
index e7a608b..f4f5552 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,15 +2,10 @@
  * @namespace P2P
  */
 
-var Messages = require('./messages');
-
 module.exports = {
-  Message: require('./message'),
-  Commands: require('./commands'),
   Inventory: require('./inventory'),
   BloomFilter: require('./bloomfilter'),
-  Messages: Messages,
-  messages: new Messages(),
+  Messages: require('./messages'),
   Peer: require('./peer'),
   Pool: require('./pool')
 };
diff --git a/lib/commands.js b/lib/messages/commands.js
similarity index 99%
rename from lib/commands.js
rename to lib/messages/commands.js
index 5086e00..1e34f35 100644
--- a/lib/commands.js
+++ b/lib/messages/commands.js
@@ -1,14 +1,14 @@
 'use strict';
 
 var Message = require('./message');
+var BloomFilter = require('../bloomfilter');
+var packageInfo = require('../../package.json');
 var inherits = require('util').inherits;
-var packageInfo = require('../package.json');
 var bitcore = require('bitcore');
 var BN = bitcore.crypto.BN;
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;
 var BufferUtil = bitcore.util.buffer;
-var BloomFilter = require('./bloomfilter');
 var Put = require('bufferput'); //todo remove
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;
diff --git a/lib/messages.js b/lib/messages/index.js
similarity index 94%
rename from lib/messages.js
rename to lib/messages/index.js
index 754a38b..a833e73 100644
--- a/lib/messages.js
+++ b/lib/messages/index.js
@@ -3,10 +3,9 @@
 var bitcore = require('bitcore');
 var BufferUtil = bitcore.util.buffer;
 var Hash = bitcore.crypto.Hash;
-var Commands = require('./commands');
 
 function Messages(options) {
-  this.commands = new Commands(options);
+  this.commands = new Messages.Commands(options);
 
   if (!options) {
     options = {};
@@ -23,6 +22,8 @@ function Messages(options) {
 
 Messages.MINIMUM_LENGTH = 20;
 Messages.PAYLOAD_START = 16;
+Messages.Message = require('./message');
+Messages.Commands = require('./commands');
 
 Messages.prototype.parseMessage = function(dataBuffer) {
   /* jshint maxstatements: 18 */
diff --git a/lib/message.js b/lib/messages/message.js
similarity index 100%
rename from lib/message.js
rename to lib/messages/message.js
diff --git a/lib/pool.js b/lib/pool.js
index 94e91d2..7e613e6 100644
--- a/lib/pool.js
+++ b/lib/pool.js
@@ -38,6 +38,8 @@ function now() {
  * @constructor
  */
 function Pool(options) {
+  /* jshint maxcomplexity: 10 */
+  /* jshint maxstatements: 20 */
 
   var self = this;
 
diff --git a/test/commands.js b/test/messages/commands.js
similarity index 92%
rename from test/commands.js
rename to test/messages/commands.js
index 5e02ff1..2bb09ee 100644
--- a/test/commands.js
+++ b/test/messages/commands.js
@@ -1,10 +1,10 @@
 'use strict';
 
 var should = require('chai').should();
-var P2P = require('../');
-var Commands = P2P.Commands;
-var commandData = require('./data/messages.json');
-var Data = require('./data/messages');//todo merge with commandData
+var P2P = require('../../');
+var Commands = P2P.Messages.Commands;
+var commandData = require('../data/messages.json');
+var Data = require('../data/messages');//todo merge with commandData
 var bitcore = require('bitcore');
 
 function getPayloadBuffer(messageBuffer) {
diff --git a/test/message.js b/test/messages/message.js
similarity index 92%
rename from test/message.js
rename to test/messages/message.js
index 972cc46..b5e7e9e 100644
--- a/test/message.js
+++ b/test/messages/message.js
@@ -1,8 +1,8 @@
 'use strict';
 
 var should = require('chai').should();
-var P2P = require('../');
-var Message = P2P.Message;
+var P2P = require('../../');
+var Message = P2P.Messages.Message;
 
 describe('P2P Message', function() {
 
diff --git a/test/messages.js b/test/messages/messages.js
similarity index 97%
rename from test/messages.js
rename to test/messages/messages.js
index 1d01d2b..c01aa2c 100644
--- a/test/messages.js
+++ b/test/messages/messages.js
@@ -4,9 +4,9 @@ var chai = require('chai');
 var should = chai.should();
 
 var Buffers = require('buffers');
-var P2P = require('../');
-var messages = P2P.messages;
+var P2P = require('../../');
 var Messages = P2P.Messages;
+var messages = new Messages();
 var bitcore = require('bitcore');
 
 describe('Messages', function() {
diff --git a/test/pool.js b/test/pool.js
index d72c905..3daba0c 100644
--- a/test/pool.js
+++ b/test/pool.js
@@ -10,7 +10,8 @@ var bitcore = require('bitcore');
 var P2P = require('../');
 var Peer = P2P.Peer;
 var MessagesData = require('./data/messages');
-var messages = P2P.messages;
+var Messages = P2P.Messages;
+var messages = new Messages();
 var Pool = P2P.Pool;
 var Networks = bitcore.Networks;