diff --git a/bitcoin/test.c b/bitcoin/test.c
index b59b4adca..7cf0b3c3e 100644
--- a/bitcoin/test.c
+++ b/bitcoin/test.c
@@ -23,28 +23,31 @@
 //  THE SOFTWARE.
 
 #include "support/BRCrypto.h"
-#include "BRBloomFilter.h"
-#include "BRMerkleBlock.h"
-#include "BRWallet.h"
-#include "BRKey.h"
-#include "BRBIP38Key.h"
-#include "BRKeyECIES.h"
-#include "BRAddress.h"
-#include "BRBase58.h"
-#include "BRBech32.h"
-#include "BRBIP39Mnemonic.h"
-#include "BRBIP39WordsEn.h"
-#include "BRPeer.h"
-#include "BRPeerManager.h"
-#include "BRChainParams.h"
+#include "support/BRInt.h"
+#include "support/BRArray.h"
+#include "support/BRSet.h"
+#include "support/BRKey.h"
+#include "support/BRKeyECIES.h"
+#include "support/BRAddress.h"
+#include "support/BRBase58.h"
+#include "support/BRBech32.h"
+#include "support/BRBIP39Mnemonic.h"
+#include "support/BRBIP39WordsEn.h"
+
 #include "bcash/BRBCashParams.h"
 #include "bcash/BRBCashAddr.h"
-#include "BRPaymentProtocol.h"
-#include "BRInt.h"
-#include "BRArray.h"
-#include "BRSet.h"
-#include "BRTransaction.h"
-#include "BRWalletManager.h"
+
+#include "bitcoin/BRBloomFilter.h"
+#include "bitcoin/BRMerkleBlock.h"
+#include "bitcoin/BRWallet.h"
+#include "bitcoin/BRBIP38Key.h"
+#include "bitcoin/BRPeer.h"
+#include "bitcoin/BRPeerManager.h"
+#include "bitcoin/BRChainParams.h"
+#include "bitcoin/BRPaymentProtocol.h"
+#include "bitcoin/BRTransaction.h"
+#include "bitcoin/BRWalletManager.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bitcoin/testBwm.c b/bitcoin/testBwm.c
index 2117cea6e..338f32805 100644
--- a/bitcoin/testBwm.c
+++ b/bitcoin/testBwm.c
@@ -17,12 +17,12 @@
 #include "bcash/BRBCashParams.h"
 #include "bitcoin/BRChainParams.h"
 
-#include "BRArray.h"
-#include "BRBIP39Mnemonic.h"
-#include "BRPeerManager.h"
-#include "BRTransaction.h"
-#include "BRWallet.h"
-#include "BRWalletManager.h"
+#include "support/BRArray.h"
+#include "support/BRBIP39Mnemonic.h"
+#include "bitcoin/BRPeerManager.h"
+#include "bitcoin/BRTransaction.h"
+#include "bitcoin/BRWallet.h"
+#include "bitcoin/BRWalletManager.h"
 
 #ifdef __ANDROID__
 #include <android/log.h>
diff --git a/ethereum/base/testBase.c b/ethereum/base/testBase.c
index 35d1a0d62..f6f4f721b 100644
--- a/ethereum/base/testBase.c
+++ b/ethereum/base/testBase.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include "support/BRCrypto.h"
-#include "BREthereumBase.h"
+#include "ethereum/base/BREthereumBase.h"
 
 static void
 runEtherParseTests () {
diff --git a/ethereum/blockchain/testBc.c b/ethereum/blockchain/testBc.c
index ef4933631..60e9985f6 100644
--- a/ethereum/blockchain/testBc.c
+++ b/ethereum/blockchain/testBc.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include "BREthereumBlockChain.h"
+#include "ethereum/blockchain/BREthereumBlockChain.h"
 
 //
 // Bloom Test
diff --git a/ethereum/contract/testContract.c b/ethereum/contract/testContract.c
index d081661b8..99ec34c3d 100644
--- a/ethereum/contract/testContract.c
+++ b/ethereum/contract/testContract.c
@@ -11,8 +11,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "BREthereumContract.h"
-#include "BREthereumToken.h"
+#include "ethereum/contract/BREthereumContract.h"
+#include "ethereum/contract/BREthereumToken.h"
 
 #if defined (BITCOIN_TESTNET)
 const char *tokenBRDAddress = "0x7108ca7c4718efa810457f228305c9c71390931a"; // testnet
diff --git a/ethereum/event/testEvent.c b/ethereum/event/testEvent.c
index d2d06c8c5..fce7523be 100644
--- a/ethereum/event/testEvent.c
+++ b/ethereum/event/testEvent.c
@@ -11,8 +11,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include <pthread.h>
-#include "BREvent.h"
-#include "BREventAlarm.h"
+#include "ethereum/event/BREvent.h"
+#include "ethereum/event/BREventAlarm.h"
 
 static pthread_cond_t testEventAlarmConditional = PTHREAD_COND_INITIALIZER;
 static pthread_mutex_t testEventAlarmMutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/ethereum/ewm/testEwm.c b/ethereum/ewm/testEwm.c
index 74c00b2db..453479188 100644
--- a/ethereum/ewm/testEwm.c
+++ b/ethereum/ewm/testEwm.c
@@ -13,7 +13,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include "ethereum/event/BREventAlarm.h"
-#include "BREthereumEWMPrivate.h"
+#include "ethereum/ewm/BREthereumEWMPrivate.h"
 
 //
 // EWM Tests
diff --git a/ethereum/les/testLES.c b/ethereum/les/testLES.c
index 008154565..0db857088 100644
--- a/ethereum/les/testLES.c
+++ b/ethereum/les/testLES.c
@@ -28,9 +28,9 @@
 #include "support/BRCrypto.h"
 #include "ethereum/base/BREthereumHash.h"
 #include "ethereum/blockchain/BREthereumNetwork.h"
-#include "BREthereumLESRandom.h"
-#include "BREthereumLES.h"
-#include "BREthereumNode.h"
+#include "ethereum/les/BREthereumLESRandom.h"
+#include "ethereum/les/BREthereumLES.h"
+#include "ethereum/les/BREthereumNode.h"
 
 #include "ethereum/BREthereum.h"
 
diff --git a/ethereum/rlp/testRlp.c b/ethereum/rlp/testRlp.c
index 4af60d65b..475d811e3 100644
--- a/ethereum/rlp/testRlp.c
+++ b/ethereum/rlp/testRlp.c
@@ -13,7 +13,7 @@
 #include <assert.h>
 #include <string.h>
 #include "ethereum/util/BRUtil.h"
-#include "BRRlp.h"
+#include "ethereum/rlp/BRRlp.h"
 
 static void
 showHex (uint8_t *source, size_t sourceLen) {
diff --git a/ethereum/test.c b/ethereum/test.c
index 9002ca86b..f29402201 100644
--- a/ethereum/test.c
+++ b/ethereum/test.c
@@ -29,9 +29,9 @@
 #include "ethereum/ewm/BREthereumAccount.h"
 #include "ethereum/ewm/BREthereumWallet.h"
 #include "ethereum/ewm/BREthereumTransfer.h"
-#include "BREthereum.h"
+#include "ethereum/BREthereum.h"
 
-#include "test.h"
+#include "ethereum/test.h"
 
 extern const char *tokenBRDAddress;
 
diff --git a/ethereum/util/testUtil.c b/ethereum/util/testUtil.c
index 5b6b5dcdf..342345c08 100644
--- a/ethereum/util/testUtil.c
+++ b/ethereum/util/testUtil.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <assert.h>
 #include <math.h>
-#include "BRUtil.h"
+#include "ethereum/util/BRUtil.h"
 
 //
 // Math Tests
diff --git a/ripple/testRipple.c b/ripple/testRipple.c
index 04afe4aae..21076cfe1 100644
--- a/ripple/testRipple.c
+++ b/ripple/testRipple.c
@@ -12,14 +12,13 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "BRRipple.h"
-#include "BRRippleBase58.h"
-#include "BRCrypto.h"
 #include "support/BRBIP32Sequence.h"
 #include "support/BRBIP39WordsEn.h"
-#include "BRKey.h"
-#include "testRippleTxList1.h"
-#include "testRippleTxList2.h"
+#include "support/BRKey.h"
+#include "ripple/BRRipple.h"
+#include "ripple/BRRippleBase58.h"
+#include "ripple/testRippleTxList1.h"
+#include "ripple/testRippleTxList2.h"
 
 int debug_log = 0;
 
diff --git a/support/testSup.c b/support/testSup.c
index de227c768..44d5c219c 100644
--- a/support/testSup.c
+++ b/support/testSup.c
@@ -15,8 +15,8 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include "BRFileService.h"
-#include "BRAssert.h"
+#include "support/BRFileService.h"
+#include "support/BRAssert.h"
 
 /// MARK: - Helpers