diff --git a/test/address.js b/test/address.js
index c276e87..0ec736f 100644
--- a/test/address.js
+++ b/test/address.js
@@ -1,7 +1,7 @@
 var assert = require('assert')
-var Address = require('..').Address
-var networks = require('..').networks
-var Script = require('..').Script
+var Address = require('../src/address')
+var networks = require('../src/networks')
+var Script = require('../src/script')
 
 var b58fixtures = require('./fixtures/base58')
 var fixtures = require('./fixtures/address')
diff --git a/test/base58.js b/test/base58.js
index 71bcc08..206425b 100644
--- a/test/base58.js
+++ b/test/base58.js
@@ -1,5 +1,5 @@
 var assert = require('assert')
-var base58 = require('..').base58
+var base58 = require('../src/base58')
 var fixtures = require('./fixtures/base58')
 
 function b2h(b) { return new Buffer(b).toString('hex') }
diff --git a/test/base58check.js b/test/base58check.js
index a5f6bf0..a4940be 100644
--- a/test/base58check.js
+++ b/test/base58check.js
@@ -1,5 +1,5 @@
 var assert = require('assert')
-var base58check = require('..').base58check
+var base58check = require('../src/base58check')
 var fixtures = require('./fixtures/base58check')
 
 function b2h(b) { return new Buffer(b).toString('hex') }
diff --git a/test/bufferutils.js b/test/bufferutils.js
index 1066116..382c8ff 100644
--- a/test/bufferutils.js
+++ b/test/bufferutils.js
@@ -1,5 +1,5 @@
 var assert = require('assert')
-var bufferutils = require('..').bufferutils
+var bufferutils = require('../src/bufferutils')
 
 var fixtures = require('./fixtures/buffer.js')
 
diff --git a/test/convert.js b/test/convert.js
index f6c8dbf..7c94b4c 100644
--- a/test/convert.js
+++ b/test/convert.js
@@ -1,5 +1,5 @@
 var assert = require('assert')
-var convert = require('..').convert
+var convert = require('../src/convert')
 
 describe('convert', function() {
   describe('byte array and word array conversions', function(){
diff --git a/test/crypto.js b/test/crypto.js
index c62936d..36ab9cc 100644
--- a/test/crypto.js
+++ b/test/crypto.js
@@ -1,5 +1,5 @@
 var assert = require('assert')
-var crypto = require('..').crypto
+var crypto = require('../src/crypto')
 
 var fixtures = require('./fixtures/crypto')
 
diff --git a/test/ec.js b/test/ec.js
index 6821809..af3e65d 100644
--- a/test/ec.js
+++ b/test/ec.js
@@ -1,10 +1,10 @@
 var assert = require('assert')
 
-var sec = require('..').sec
+var sec = require('../src/sec')
 var ecparams = sec('secp256k1')
 
 var BigInteger = require('bigi')
-var ECPointFp = require('..').ECPointFp
+var ECPointFp = require('../src/ec').ECPointFp
 
 describe('ec', function() {
   describe('ECPointFp', function() {
diff --git a/test/ecdsa.js b/test/ecdsa.js
index bdc2ebd..2e9a028 100644
--- a/test/ecdsa.js
+++ b/test/ecdsa.js
@@ -1,14 +1,14 @@
 var assert = require('assert')
-var crypto = require('..').crypto
-var ecdsa = require('..').ecdsa
+var crypto = require('../src/crypto')
+var ecdsa = require('../src/ecdsa')
 
-var sec = require('..').sec
+var sec = require('../src/sec')
 var ecparams = sec("secp256k1")
 
 var BigInteger = require('bigi')
-var ECKey = require('..').ECKey
-var ECPubKey = require('..').ECPubKey
-var Message = require('..').Message
+var ECKey = require('../src/eckey')
+var ECPubKey = require('../src/ecpubkey')
+var Message = require('../src/message')
 
 var fixtures = require('./fixtures/ecdsa.js')
 
diff --git a/test/eckey.js b/test/eckey.js
index 58847b5..2ef218b 100644
--- a/test/eckey.js
+++ b/test/eckey.js
@@ -1,8 +1,8 @@
 var assert = require('assert')
-var crypto = require('..').crypto
+var crypto = require('../src/crypto')
 
-var ECKey = require('..').ECKey
-var ECPubKey = require('..').ECPubKey
+var ECKey = require('../src/eckey')
+var ECPubKey = require('../src/ecpubkey')
 
 describe('ECKey', function() {
   describe('constructor', function() {
diff --git a/test/ecpubkey.js b/test/ecpubkey.js
index dfa2955..faf338d 100644
--- a/test/ecpubkey.js
+++ b/test/ecpubkey.js
@@ -1,6 +1,6 @@
 var assert = require('assert')
 
-var ECPubKey = require('..').ECPubKey
+var ECPubKey = require('../src/ecpubkey')
 
 describe('ECPubKey', function() {
   describe('toBuffer/toHex', function() {
diff --git a/test/hdwallet.js b/test/hdwallet.js
index 46f4bdc..1207f76 100644
--- a/test/hdwallet.js
+++ b/test/hdwallet.js
@@ -1,6 +1,6 @@
 var assert = require('assert')
 
-var HDWallet = require('../').HDWallet
+var HDWallet = require('../src/hdwallet')
 
 function b2h(buf) {
   assert(Buffer.isBuffer(buf))
diff --git a/test/integration/p2sh.js b/test/integration/p2sh.js
index 55978bb..bb433a7 100644
--- a/test/integration/p2sh.js
+++ b/test/integration/p2sh.js
@@ -1,12 +1,13 @@
-var assert = require('assert');
+var assert = require('assert')
 
-var Address = require('../../src/address');
-var ECKey = require('../../src/eckey').ECKey;
-var T = require('../../src/transaction');
-var Transaction = T.Transaction;
-var Script = require('../../src/script');
-var networks = require('../../src/networks');
-var crypto = require('../../src/crypto');
+var bitcoin = require('../../')
+var crypto = bitcoin.crypto
+var networks = bitcoin.networks
+
+var Address = bitcoin.Address
+var ECKey = bitcoin.ECKey
+var Transaction = bitcoin.Transaction
+var Script = bitcoin.Script
 
 var helloblock = require('helloblock-js')({
   network: 'testnet'
diff --git a/test/message.js b/test/message.js
index e17a395..f2edc87 100644
--- a/test/message.js
+++ b/test/message.js
@@ -1,8 +1,8 @@
 var assert = require('assert')
-var networks = require('..').networks
+var networks = require('../src/networks')
 
-var ECKey = require('..').ECKey
-var Message = require('..').Message
+var ECKey = require('../src/eckey')
+var Message = require('../src/message')
 
 var fixtures = require('./fixtures/message')
 
diff --git a/test/script.js b/test/script.js
index 719fcdd..36f0e6c 100644
--- a/test/script.js
+++ b/test/script.js
@@ -1,9 +1,9 @@
 var assert = require('assert')
-var crypto = require('..').crypto
-var networks = require('..').networks
+var crypto = require('../src/crypto')
+var networks = require('../src/networks')
 
-var Address = require('..').Address
-var Script = require('..').Script
+var Address = require('../src/address')
+var Script = require('../src/script')
 
 var fixtures = require('./fixtures/script')
 
diff --git a/test/transaction.js b/test/transaction.js
index d949fae..5c2fcbd 100644
--- a/test/transaction.js
+++ b/test/transaction.js
@@ -1,10 +1,10 @@
 var assert = require('assert')
-var networks = require('..').networks
+var networks = require('../src/networks')
 
-var Address = require('..').Address
-var ECKey = require('..').ECKey
-var Transaction = require('..').Transaction
-var Script = require('..').Script
+var Address = require('../src/address')
+var ECKey = require('../src/eckey')
+var Transaction = require('../src/transaction').Transaction
+var Script = require('../src/script')
 
 var fixtureTxes = require('./fixtures/mainnet_tx')
 var fixtureTx1Hex = fixtureTxes.prevTx
diff --git a/test/wallet.js b/test/wallet.js
index 33f17c7..276ef0f 100644
--- a/test/wallet.js
+++ b/test/wallet.js
@@ -1,12 +1,12 @@
 var assert = require('assert')
-var crypto = require('../').crypto
+var crypto = require('../src/crypto')
 var sinon = require('sinon')
 
-var Address = require('..').Address
-var HDWallet = require('..').HDWallet
-var Script = require('..').Script
-var Transaction = require('..').Transaction
-var Wallet = require('..').Wallet
+var Address = require('../src/address')
+var HDWallet = require('../src/hdwallet')
+var Script = require('../src/script')
+var Transaction = require('../src/transaction').Transaction
+var Wallet = require('../src/wallet')
 
 var fixtureTxes = require('./fixtures/mainnet_tx')
 var fixtureTx1Hex = fixtureTxes.prevTx