diff --git a/index.js b/index.js
index 3a82d95..2f4ff7e 100644
--- a/index.js
+++ b/index.js
@@ -29,9 +29,9 @@ bitcore.errors = require('./lib/errors');
 
 // main bitcoin library
 bitcore.Address = require('./lib/address');
-bitcore.Block = require('./lib/block');
+bitcore.Block = require('./lib/block/block');
 bitcore.MerkleBlock = require('./lib/block/merkleblock');
-bitcore.BlockHeader = require('./lib/blockheader');
+bitcore.BlockHeader = require('./lib/block/blockheader');
 bitcore.HDPrivateKey = require('./lib/hdprivatekey.js');
 bitcore.HDPublicKey = require('./lib/hdpublickey.js');
 bitcore.Networks = require('./lib/networks');
diff --git a/lib/block.js b/lib/block/block.js
similarity index 95%
rename from lib/block.js
rename to lib/block/block.js
index 52d4e73..cff63dd 100644
--- a/lib/block.js
+++ b/lib/block/block.js
@@ -2,14 +2,14 @@
 
 var _ = require('lodash');
 var BlockHeader = require('./blockheader');
-var BN = require('./crypto/bn');
-var BufferUtil = require('./util/buffer');
-var BufferReader = require('./encoding/bufferreader');
-var BufferWriter = require('./encoding/bufferwriter');
-var Hash = require('./crypto/hash');
-var JSUtil = require('./util/js');
-var Transaction = require('./transaction');
-var $ = require('./util/preconditions');
+var BN = require('../crypto/bn');
+var BufferUtil = require('../util/buffer');
+var BufferReader = require('../encoding/bufferreader');
+var BufferWriter = require('../encoding/bufferwriter');
+var Hash = require('../crypto/hash');
+var JSUtil = require('../util/js');
+var Transaction = require('../transaction');
+var $ = require('../util/preconditions');
 
 /**
  * Instantiate a Block from a Buffer, JSON object, or Object with
diff --git a/lib/blockheader.js b/lib/block/blockheader.js
similarity index 96%
rename from lib/blockheader.js
rename to lib/block/blockheader.js
index c184821..44615d5 100644
--- a/lib/blockheader.js
+++ b/lib/block/blockheader.js
@@ -1,12 +1,12 @@
 'use strict';
 
 var _ = require('lodash');
-var BN = require('./crypto/bn');
-var BufferUtil = require('./util/buffer');
-var BufferReader = require('./encoding/bufferreader');
-var BufferWriter = require('./encoding/bufferwriter');
-var Hash = require('./crypto/hash');
-var JSUtil = require('./util/js');
+var BN = require('../crypto/bn');
+var BufferUtil = require('../util/buffer');
+var BufferReader = require('../encoding/bufferreader');
+var BufferWriter = require('../encoding/bufferwriter');
+var Hash = require('../crypto/hash');
+var JSUtil = require('../util/js');
 
 /**
  * Instantiate a BlockHeader from a Buffer, JSON object, or Object with
diff --git a/lib/block/merkleblock.js b/lib/block/merkleblock.js
index cf50423..00e184b 100644
--- a/lib/block/merkleblock.js
+++ b/lib/block/merkleblock.js
@@ -1,6 +1,6 @@
 'use strict';
 var _ = require('lodash');
-var BlockHeader = require('../blockheader');
+var BlockHeader = require('./blockheader');
 var BufferUtil = require('../util/buffer');
 var BufferReader = require('../encoding/bufferreader');
 var BufferWriter = require('../encoding/bufferwriter');
diff --git a/lib/transaction/transaction.js b/lib/transaction/transaction.js
index 1399431..5d70891 100644
--- a/lib/transaction/transaction.js
+++ b/lib/transaction/transaction.js
@@ -21,7 +21,7 @@ var MultiSigScriptHashInput = Input.MultiSigScriptHash;
 var Output = require('./output');
 var Script = require('../script');
 var PrivateKey = require('../privatekey');
-var Block = require('../block');
+var Block = require('../block/block');
 var BN = require('../crypto/bn');
 
 var CURRENT_VERSION = 1;