Clean up and restructure sources

2025-12-06 17:27:55 +00:00 · 2014-09-16 14:03:58 -07:00
parent 1dcd06a1c1
commit 4239880acb
522 changed files with 3264 additions and 3400 deletions
--- a/src/ripple/unity/app.cpp
+++ b/src/ripple/unity/app.cpp
@@ -28,20 +28,20 @@

 #include <ripple/http/Server.h>

-#include <ripple/module/app/main/CollectorManager.cpp>
-#include <ripple/module/app/main/NodeStoreScheduler.cpp>
-#include <ripple/module/app/main/IoServicePool.cpp>
-#include <ripple/module/app/main/FatalErrorReporter.cpp>
-#include <ripple/module/app/main/RPCHTTPServer.cpp>
-#include <ripple/module/app/tx/TxQueueEntry.h>
-#include <ripple/module/app/tx/TxQueueEntry.cpp>
-#include <ripple/module/app/tx/TxQueue.cpp>
-#include <ripple/module/app/websocket/WSServerHandler.cpp>
-#include <ripple/module/app/websocket/WSConnection.cpp>
-#include <ripple/module/app/websocket/WSDoor.cpp>
-#include <ripple/module/app/node/SqliteFactory.cpp>
-#include <ripple/module/app/main/Application.cpp>
-#include <ripple/module/app/main/Main.cpp>
+#include <ripple/app/main/CollectorManager.cpp>
+#include <ripple/app/main/NodeStoreScheduler.cpp>
+#include <ripple/app/main/IoServicePool.cpp>
+#include <ripple/app/main/FatalErrorReporter.cpp>
+#include <ripple/app/main/RPCHTTPServer.cpp>
+#include <ripple/app/tx/TxQueueEntry.h>
+#include <ripple/app/tx/TxQueueEntry.cpp>
+#include <ripple/app/tx/TxQueue.cpp>
+#include <ripple/app/websocket/WSServerHandler.cpp>
+#include <ripple/app/websocket/WSConnection.cpp>
+#include <ripple/app/websocket/WSDoor.cpp>
+#include <ripple/app/node/SqliteFactory.cpp>
+#include <ripple/app/main/Application.cpp>
+#include <ripple/app/main/Main.cpp>

 //------------------------------------------------------------------------------

--- a/src/ripple/unity/app.h
+++ b/src/ripple/unity/app.h
@@ -43,7 +43,7 @@

 //------------------------------------------------------------------------------

-#include <ripple/unity/basics.h>
+#include <ripple/unity/types.h>
 #include <ripple/unity/data.h>
 #include <ripple/unity/net.h>

@@ -58,66 +58,66 @@
 #include <ripple/common/KeyCache.h>
 #include <ripple/common/TaggedCache.h>

-#include <ripple/module/app/data/Database.h>
-#include <ripple/module/app/data/DatabaseCon.h>
-#include <ripple/module/app/data/SqliteDatabase.h>
-#include <ripple/module/app/data/DBInit.h>
-#include <ripple/module/app/shamap/SHAMapItem.h>
-#include <ripple/module/app/shamap/SHAMapNodeID.h>
-#include <ripple/module/app/shamap/SHAMapTreeNode.h>
-#include <ripple/module/app/shamap/SHAMapMissingNode.h>
-#include <ripple/module/app/shamap/SHAMapSyncFilter.h>
-#include <ripple/module/app/shamap/SHAMapAddNode.h>
-#include <ripple/module/app/shamap/SHAMap.h>
-#include <ripple/module/app/misc/SerializedTransaction.h>
-#include <ripple/module/app/misc/SerializedLedger.h>
-#include <ripple/module/app/tx/TransactionMeta.h>
-#include <ripple/module/app/tx/Transaction.h>
-#include <ripple/module/app/misc/AccountState.h>
-#include <ripple/module/app/ledger/Ledger.h>
-#include <ripple/module/app/ledger/SerializedValidation.h>
-#include <ripple/module/app/main/LoadManager.h>
-#include <ripple/module/app/misc/OrderBook.h>
-#include <ripple/module/app/shamap/SHAMapSyncFilters.h>
-#include <ripple/module/app/misc/AmendmentTable.h>
-#include <ripple/module/app/misc/FeeVote.h>
-#include <ripple/module/app/misc/IHashRouter.h>
-#include <ripple/module/app/peers/ClusterNodeStatus.h>
-#include <ripple/module/app/peers/UniqueNodeList.h>
-#include <ripple/module/app/misc/Validations.h>
-#include <ripple/module/app/peers/PeerSet.h>
-#include <ripple/module/app/ledger/InboundLedger.h>
-#include <ripple/module/app/ledger/InboundLedgers.h>
-#include <ripple/module/app/ledger/AcceptedLedgerTx.h>
-#include <ripple/module/app/ledger/AcceptedLedger.h>
-#include <ripple/module/app/ledger/LedgerEntrySet.h>
-#include <ripple/module/app/ledger/DirectoryEntryIterator.h>
-#include <ripple/module/app/ledger/OrderBookIterator.h>
-#include <ripple/module/app/tx/TransactionEngine.h>
-#include <ripple/module/app/misc/CanonicalTXSet.h>
-#include <ripple/module/app/ledger/LedgerHolder.h>
-#include <ripple/module/app/ledger/LedgerHistory.h>
-#include <ripple/module/app/ledger/LedgerCleaner.h>
-#include <ripple/module/app/ledger/LedgerMaster.h>
-#include <ripple/module/app/ledger/LedgerProposal.h>
-#include <ripple/module/app/misc/NetworkOPs.h>
-#include <ripple/module/app/tx/TransactionMaster.h>
-#include <ripple/module/app/main/LocalCredentials.h>
-#include <ripple/module/app/main/Application.h>
-#include <ripple/module/app/ledger/OrderBookDB.h>
-#include <ripple/module/app/tx/TransactionAcquire.h>
-#include <ripple/module/app/tx/LocalTxs.h>
-#include <ripple/module/app/consensus/DisputedTx.h>
-#include <ripple/module/app/consensus/LedgerConsensus.h>
-#include <ripple/module/app/ledger/LedgerTiming.h>
-#include <ripple/module/app/paths/RippleState.h>
-#include <ripple/module/app/paths/RippleLineCache.h>
-#include <ripple/module/app/paths/PathRequest.h>
-#include <ripple/module/app/paths/PathRequests.h>
-#include <ripple/module/app/main/ParameterTable.h>
- #include <ripple/module/app/paths/PathState.h>
- #include <ripple/module/app/paths/RippleCalc.h>
-#include  <ripple/module/app/paths/Pathfinder.h>
+#include <ripple/app/data/Database.h>
+#include <ripple/app/data/DatabaseCon.h>
+#include <ripple/app/data/SqliteDatabase.h>
+#include <ripple/app/data/DBInit.h>
+#include <ripple/app/shamap/SHAMapItem.h>
+#include <ripple/app/shamap/SHAMapNodeID.h>
+#include <ripple/app/shamap/SHAMapTreeNode.h>
+#include <ripple/app/shamap/SHAMapMissingNode.h>
+#include <ripple/app/shamap/SHAMapSyncFilter.h>
+#include <ripple/app/shamap/SHAMapAddNode.h>
+#include <ripple/app/shamap/SHAMap.h>
+#include <ripple/app/misc/SerializedTransaction.h>
+#include <ripple/app/misc/SerializedLedger.h>
+#include <ripple/app/tx/TransactionMeta.h>
+#include <ripple/app/tx/Transaction.h>
+#include <ripple/app/misc/AccountState.h>
+#include <ripple/app/ledger/Ledger.h>
+#include <ripple/app/ledger/SerializedValidation.h>
+#include <ripple/app/main/LoadManager.h>
+#include <ripple/app/misc/OrderBook.h>
+#include <ripple/app/shamap/SHAMapSyncFilters.h>
+#include <ripple/app/misc/AmendmentTable.h>
+#include <ripple/app/misc/FeeVote.h>
+#include <ripple/app/misc/IHashRouter.h>
+#include <ripple/app/peers/ClusterNodeStatus.h>
+#include <ripple/app/peers/UniqueNodeList.h>
+#include <ripple/app/misc/Validations.h>
+#include <ripple/app/peers/PeerSet.h>
+#include <ripple/app/ledger/InboundLedger.h>
+#include <ripple/app/ledger/InboundLedgers.h>
+#include <ripple/app/ledger/AcceptedLedgerTx.h>
+#include <ripple/app/ledger/AcceptedLedger.h>
+#include <ripple/app/ledger/LedgerEntrySet.h>
+#include <ripple/app/ledger/DirectoryEntryIterator.h>
+#include <ripple/app/ledger/OrderBookIterator.h>
+#include <ripple/app/tx/TransactionEngine.h>
+#include <ripple/app/misc/CanonicalTXSet.h>
+#include <ripple/app/ledger/LedgerHolder.h>
+#include <ripple/app/ledger/LedgerHistory.h>
+#include <ripple/app/ledger/LedgerCleaner.h>
+#include <ripple/app/ledger/LedgerMaster.h>
+#include <ripple/app/ledger/LedgerProposal.h>
+#include <ripple/app/misc/NetworkOPs.h>
+#include <ripple/app/tx/TransactionMaster.h>
+#include <ripple/app/main/LocalCredentials.h>
+#include <ripple/app/main/Application.h>
+#include <ripple/app/ledger/OrderBookDB.h>
+#include <ripple/app/tx/TransactionAcquire.h>
+#include <ripple/app/tx/LocalTxs.h>
+#include <ripple/app/consensus/DisputedTx.h>
+#include <ripple/app/consensus/LedgerConsensus.h>
+#include <ripple/app/ledger/LedgerTiming.h>
+#include <ripple/app/paths/RippleState.h>
+#include <ripple/app/paths/RippleLineCache.h>
+#include <ripple/app/paths/PathRequest.h>
+#include <ripple/app/paths/PathRequests.h>
+#include <ripple/app/main/ParameterTable.h>
+ #include <ripple/app/paths/PathState.h>
+ #include <ripple/app/paths/RippleCalc.h>
+#include  <ripple/app/paths/Pathfinder.h>


 #endif
--- a/src/ripple/unity/app1.cpp
+++ b/src/ripple/unity/app1.cpp
@@ -25,20 +25,20 @@

 #include <ripple/unity/app.h>

-#include <ripple/module/app/misc/PowResult.h>
+#include <ripple/app/misc/PowResult.h>

-#include <ripple/module/app/misc/ProofOfWorkFactory.h>
+#include <ripple/app/misc/ProofOfWorkFactory.h>

-#include <ripple/module/app/peers/PeerSet.cpp>
-#include <ripple/module/app/misc/ProofOfWorkFactory.cpp>
-#include <ripple/module/app/misc/ProofOfWork.cpp>
-#include <ripple/module/app/misc/SerializedTransaction.cpp>
+#include <ripple/app/peers/PeerSet.cpp>
+#include <ripple/app/misc/ProofOfWorkFactory.cpp>
+#include <ripple/app/misc/ProofOfWork.cpp>
+#include <ripple/app/misc/SerializedTransaction.cpp>

 // requires Application
-#include <ripple/module/app/shamap/SHAMapSyncFilters.cpp>
+#include <ripple/app/shamap/SHAMapSyncFilters.cpp>

-#include <ripple/module/app/consensus/LedgerConsensus.cpp>
+#include <ripple/app/consensus/LedgerConsensus.cpp>

-#include <ripple/module/app/ledger/LedgerCleaner.h>
-#include <ripple/module/app/ledger/LedgerCleaner.cpp>
-#include <ripple/module/app/ledger/LedgerMaster.cpp>
+#include <ripple/app/ledger/LedgerCleaner.h>
+#include <ripple/app/ledger/LedgerCleaner.cpp>
+#include <ripple/app/ledger/LedgerMaster.cpp>
--- a/src/ripple/unity/app2.cpp
+++ b/src/ripple/unity/app2.cpp
@@ -23,22 +23,22 @@

 #include <ripple/common/seconds_clock.h>

-#include <ripple/module/app/shamap/SHAMap.cpp> // Uses theApp
-#include <ripple/module/app/shamap/SHAMapItem.cpp>
-#include <ripple/module/app/shamap/SHAMapSync.cpp>
-#include <ripple/module/app/shamap/SHAMapMissingNode.cpp>
+#include <ripple/app/shamap/SHAMap.cpp> // Uses theApp
+#include <ripple/app/shamap/SHAMapItem.cpp>
+#include <ripple/app/shamap/SHAMapSync.cpp>
+#include <ripple/app/shamap/SHAMapMissingNode.cpp>

-#include <ripple/module/app/misc/CanonicalTXSet.cpp>
-#include <ripple/module/app/ledger/LedgerProposal.cpp>
-#include <ripple/module/app/main/LoadManager.cpp>
-#include <ripple/module/app/ledger/BookListeners.cpp>
-#include <ripple/module/app/ledger/OrderBookDB.cpp>
+#include <ripple/app/misc/CanonicalTXSet.cpp>
+#include <ripple/app/ledger/LedgerProposal.cpp>
+#include <ripple/app/main/LoadManager.cpp>
+#include <ripple/app/ledger/BookListeners.cpp>
+#include <ripple/app/ledger/OrderBookDB.cpp>

-#include <ripple/module/app/data/Database.cpp>
-#include <ripple/module/app/data/DatabaseCon.cpp>
-#include <ripple/module/app/data/SqliteDatabase.cpp>
-#include <ripple/module/app/data/DBInit.cpp>
+#include <ripple/app/data/Database.cpp>
+#include <ripple/app/data/DatabaseCon.cpp>
+#include <ripple/app/data/SqliteDatabase.cpp>
+#include <ripple/app/data/DBInit.cpp>

-#include <ripple/module/app/shamap/RadixMapTest.h>
-#include <ripple/module/app/shamap/RadixMapTest.cpp>
-#include <ripple/module/app/shamap/FetchPackTests.cpp>
+#include <ripple/app/shamap/RadixMapTest.h>
+#include <ripple/app/shamap/RadixMapTest.cpp>
+#include <ripple/app/shamap/FetchPackTests.cpp>
--- a/src/ripple/unity/app3.cpp
+++ b/src/ripple/unity/app3.cpp
@@ -21,8 +21,8 @@

 #include <ripple/unity/app.h>

-#include <ripple/module/app/ledger/Ledger.cpp>
-#include <ripple/module/app/shamap/SHAMapDelta.cpp>
-#include <ripple/module/app/shamap/SHAMapNodeID.cpp>
-#include <ripple/module/app/shamap/SHAMapTreeNode.cpp>
-#include <ripple/module/app/misc/AccountState.cpp>
+#include <ripple/app/ledger/Ledger.cpp>
+#include <ripple/app/shamap/SHAMapDelta.cpp>
+#include <ripple/app/shamap/SHAMapNodeID.cpp>
+#include <ripple/app/shamap/SHAMapTreeNode.cpp>
+#include <ripple/app/misc/AccountState.cpp>
--- a/src/ripple/unity/app4.cpp
+++ b/src/ripple/unity/app4.cpp
@@ -27,16 +27,16 @@

 #include <fstream> // for UniqueNodeList.cpp

-#include <ripple/module/app/transactors/Transactor.h>
+#include <ripple/app/transactors/Transactor.h>

-#include <ripple/module/app/paths/RippleState.cpp>
-#include <ripple/module/app/peers/UniqueNodeList.cpp>
-#include <ripple/module/app/ledger/InboundLedger.cpp>
-#include <ripple/module/app/tx/TransactionCheck.cpp>
-#include <ripple/module/app/tx/TransactionMaster.cpp>
-#include <ripple/module/app/tx/Transaction.cpp>
-#include <ripple/module/app/tx/TransactionEngine.cpp>
-#include <ripple/module/app/tx/TransactionMeta.cpp>
+#include <ripple/app/paths/RippleState.cpp>
+#include <ripple/app/peers/UniqueNodeList.cpp>
+#include <ripple/app/ledger/InboundLedger.cpp>
+#include <ripple/app/tx/TransactionCheck.cpp>
+#include <ripple/app/tx/TransactionMaster.cpp>
+#include <ripple/app/tx/Transaction.cpp>
+#include <ripple/app/tx/TransactionEngine.cpp>
+#include <ripple/app/tx/TransactionMeta.cpp>

-#include <ripple/module/app/book/tests/OfferStream.test.cpp>
-#include <ripple/module/app/book/tests/Quality.test.cpp>
+#include <ripple/app/book/tests/OfferStream.test.cpp>
+#include <ripple/app/book/tests/Quality.test.cpp>
--- a/src/ripple/unity/app5.cpp
+++ b/src/ripple/unity/app5.cpp
@@ -24,16 +24,15 @@
 #include <ripple/common/jsonrpc_fields.h>

 #include <ripple/common/seconds_clock.h>
-#include <ripple/unity/peerfinder.h>
 #include <ripple/unity/resource.h>
 #include <ripple/common/RippleSSLContext.h>

 #include <deque>

-#include <ripple/module/app/misc/ProofOfWork.h>
+#include <ripple/app/misc/ProofOfWork.h>

-#include <ripple/module/app/ledger/LedgerTiming.cpp>
-#include <ripple/module/app/ledger/AcceptedLedgerTx.cpp>
-#include <ripple/module/app/main/LocalCredentials.cpp>
-#include <ripple/module/app/misc/Validations.cpp>
-#include <ripple/module/app/misc/FeeVoteImpl.cpp>
+#include <ripple/app/ledger/LedgerTiming.cpp>
+#include <ripple/app/ledger/AcceptedLedgerTx.cpp>
+#include <ripple/app/main/LocalCredentials.cpp>
+#include <ripple/app/misc/Validations.cpp>
+#include <ripple/app/misc/FeeVoteImpl.cpp>
--- a/src/ripple/unity/app6.cpp
+++ b/src/ripple/unity/app6.cpp
@@ -23,11 +23,11 @@

 #include <ripple/common/seconds_clock.h>

-#include <ripple/module/app/ledger/LedgerEntrySet.cpp>
-#include <ripple/module/app/ledger/AcceptedLedger.cpp>
-#include <ripple/module/app/ledger/DirectoryEntryIterator.cpp>
-#include <ripple/module/app/ledger/OrderBookIterator.cpp>
-#include <ripple/module/app/consensus/DisputedTx.cpp>
-#include <ripple/module/app/misc/HashRouter.cpp>
-#include <ripple/module/app/paths/Pathfinder.cpp>
-#include <ripple/module/app/misc/AmendmentTableImpl.cpp>
+#include <ripple/app/ledger/LedgerEntrySet.cpp>
+#include <ripple/app/ledger/AcceptedLedger.cpp>
+#include <ripple/app/ledger/DirectoryEntryIterator.cpp>
+#include <ripple/app/ledger/OrderBookIterator.cpp>
+#include <ripple/app/consensus/DisputedTx.cpp>
+#include <ripple/app/misc/HashRouter.cpp>
+#include <ripple/app/paths/Pathfinder.cpp>
+#include <ripple/app/misc/AmendmentTableImpl.cpp>
--- a/src/ripple/unity/app7.cpp
+++ b/src/ripple/unity/app7.cpp
@@ -25,12 +25,12 @@

 #include <ripple/common/seconds_clock.h>

-#include <ripple/module/app/ledger/InboundLedgers.cpp>
-#include <ripple/module/app/ledger/LedgerHistory.cpp>
-#include <ripple/module/app/misc/SerializedLedger.cpp>
-#include <ripple/module/app/tx/TransactionAcquire.cpp>
+#include <ripple/app/ledger/InboundLedgers.cpp>
+#include <ripple/app/ledger/LedgerHistory.cpp>
+#include <ripple/app/misc/SerializedLedger.cpp>
+#include <ripple/app/tx/TransactionAcquire.cpp>

-#include <ripple/module/app/tx/TxQueueEntry.h>
-#include <ripple/module/app/tx/TxQueue.h>
-#include <ripple/module/app/tx/LocalTxs.cpp>
-#include <ripple/module/app/misc/NetworkOPs.cpp>
+#include <ripple/app/tx/TxQueueEntry.h>
+#include <ripple/app/tx/TxQueue.h>
+#include <ripple/app/tx/LocalTxs.cpp>
+#include <ripple/app/misc/NetworkOPs.cpp>
--- a/src/ripple/unity/app8.cpp
+++ b/src/ripple/unity/app8.cpp
@@ -26,27 +26,27 @@
 #pragma warning (disable: 4309) // truncation of constant value
 #endif

-#include <ripple/module/rpc/ErrorCodes.h>
+#include <ripple/rpc/ErrorCodes.h>

-#include <ripple/module/app/paths/Node.cpp>
-#include <ripple/module/app/paths/PathRequest.cpp>
-#include <ripple/module/app/paths/PathRequests.cpp>
-#include <ripple/module/app/paths/PathState.cpp>
-#include <ripple/module/app/paths/RippleCalc.cpp>
-#include <ripple/module/app/paths/cursor/AdvanceNode.cpp>
-#include <ripple/module/app/paths/cursor/DeliverNodeForward.cpp>
-#include <ripple/module/app/paths/cursor/DeliverNodeReverse.cpp>
-#include <ripple/module/app/paths/cursor/ForwardLiquidity.cpp>
-#include <ripple/module/app/paths/cursor/ForwardLiquidityForAccount.cpp>
-#include <ripple/module/app/paths/cursor/Liquidity.cpp>
-#include <ripple/module/app/paths/cursor/NextIncrement.cpp>
-#include <ripple/module/app/paths/cursor/ReverseLiquidity.cpp>
-#include <ripple/module/app/paths/cursor/ReverseLiquidityForAccount.cpp>
-#include <ripple/module/app/paths/cursor/RippleLiquidity.cpp>
+#include <ripple/app/paths/Node.cpp>
+#include <ripple/app/paths/PathRequest.cpp>
+#include <ripple/app/paths/PathRequests.cpp>
+#include <ripple/app/paths/PathState.cpp>
+#include <ripple/app/paths/RippleCalc.cpp>
+#include <ripple/app/paths/cursor/AdvanceNode.cpp>
+#include <ripple/app/paths/cursor/DeliverNodeForward.cpp>
+#include <ripple/app/paths/cursor/DeliverNodeReverse.cpp>
+#include <ripple/app/paths/cursor/ForwardLiquidity.cpp>
+#include <ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp>
+#include <ripple/app/paths/cursor/Liquidity.cpp>
+#include <ripple/app/paths/cursor/NextIncrement.cpp>
+#include <ripple/app/paths/cursor/ReverseLiquidity.cpp>
+#include <ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp>
+#include <ripple/app/paths/cursor/RippleLiquidity.cpp>

-#include <ripple/module/app/main/ParameterTable.cpp>
-#include <ripple/module/app/paths/RippleLineCache.cpp>
-#include <ripple/module/app/ledger/SerializedValidation.cpp>
+#include <ripple/app/main/ParameterTable.cpp>
+#include <ripple/app/paths/RippleLineCache.cpp>
+#include <ripple/app/ledger/SerializedValidation.cpp>

 #ifdef _MSC_VER
 #pragma warning (pop)
--- a/src/ripple/unity/app9.cpp
+++ b/src/ripple/unity/app9.cpp
@@ -21,22 +21,22 @@

 #include <ripple/unity/app.h>

-#include <ripple/module/app/book/impl/BookTip.cpp>
-#include <ripple/module/app/book/impl/OfferStream.cpp>
-#include <ripple/module/app/book/impl/Quality.cpp>
-#include <ripple/module/app/book/impl/Taker.cpp>
+#include <ripple/app/book/impl/BookTip.cpp>
+#include <ripple/app/book/impl/OfferStream.cpp>
+#include <ripple/app/book/impl/Quality.cpp>
+#include <ripple/app/book/impl/Taker.cpp>

-#include <ripple/module/app/transactors/Transactor.cpp>
+#include <ripple/app/transactors/Transactor.cpp>

-#include <ripple/module/app/transactors/Change.cpp>
-#include <ripple/module/app/transactors/CancelOffer.cpp>
-#include <ripple/module/app/transactors/Payment.cpp>
-#include <ripple/module/app/transactors/SetRegularKey.cpp>
-#include <ripple/module/app/transactors/SetAccount.cpp>
-#include <ripple/module/app/transactors/AddWallet.cpp>
-#include <ripple/module/app/transactors/SetTrust.cpp>
-#include <ripple/module/app/transactors/CreateOffer.cpp>
-#include <ripple/module/app/transactors/CreateOfferDirect.cpp>
-#include <ripple/module/app/transactors/CreateOfferBridged.cpp>
-#include <ripple/module/app/transactors/CreateTicket.cpp>
-#include <ripple/module/app/transactors/CancelTicket.cpp>
+#include <ripple/app/transactors/Change.cpp>
+#include <ripple/app/transactors/CancelOffer.cpp>
+#include <ripple/app/transactors/Payment.cpp>
+#include <ripple/app/transactors/SetRegularKey.cpp>
+#include <ripple/app/transactors/SetAccount.cpp>
+#include <ripple/app/transactors/AddWallet.cpp>
+#include <ripple/app/transactors/SetTrust.cpp>
+#include <ripple/app/transactors/CreateOffer.cpp>
+#include <ripple/app/transactors/CreateOfferDirect.cpp>
+#include <ripple/app/transactors/CreateOfferBridged.cpp>
+#include <ripple/app/transactors/CreateTicket.cpp>
+#include <ripple/app/transactors/CancelTicket.cpp>
--- a/src/ripple/unity/basics.cpp
+++ b/src/ripple/unity/basics.cpp
@@ -19,12 +19,12 @@

 #include <BeastConfig.h>

-#include <ripple/basics/containers/RangeSet.cpp>
-#include <ripple/basics/log/Log.cpp>
-#include <ripple/basics/system/CheckLibraryVersions.cpp>
-#include <ripple/basics/utility/CountedObject.cpp>
-#include <ripple/basics/utility/StringUtilities.cpp>
-#include <ripple/basics/utility/Sustain.cpp>
-#include <ripple/basics/utility/ThreadName.cpp>
-#include <ripple/basics/utility/Time.cpp>
-#include <ripple/basics/utility/UptimeTimer.cpp>
+#include <ripple/basics/impl/RangeSet.cpp>
+#include <ripple/basics/impl/Log.cpp>
+#include <ripple/basics/impl/CheckLibraryVersions.cpp>
+#include <ripple/basics/impl/CountedObject.cpp>
+#include <ripple/basics/impl/StringUtilities.cpp>
+#include <ripple/basics/impl/Sustain.cpp>
+#include <ripple/basics/impl/ThreadName.cpp>
+#include <ripple/basics/impl/Time.cpp>
+#include <ripple/basics/impl/UptimeTimer.cpp>
--- a/src/ripple/unity/basics.h
+++ b/src/ripple/unity/basics.h
@@ -1,45 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_BASICS_H_INCLUDED
-#define RIPPLE_BASICS_H_INCLUDED
-
-#include <beast/Crypto.h>
-
-#include <ripple/basics/system/BoostIncludes.h>
-
-#include <beast/cxx14/memory.h>
-#include <beast/utility/Zero.h>
-
-#include <atomic>
-
-using beast::zero;
-using beast::Zero;
-
-#include <ripple/unity/types.h>
-
-#include <ripple/basics/types/BasicTypes.h>
-
-#include <ripple/basics/log/Log.h>
-#include <ripple/basics/log/LoggedTimings.h>
-#include <ripple/basics/utility/CountedObject.h>
-#include <ripple/basics/utility/PlatformMacros.h>
-#include <ripple/basics/utility/StringUtilities.h>
-
-#endif
--- a/src/ripple/unity/common.cpp
+++ b/src/ripple/unity/common.cpp
@@ -20,7 +20,9 @@
 #include <BeastConfig.h>

 #include <ripple/common/impl/KeyCache.cpp>
-#include <ripple/common/impl/TaggedCache.cpp>
-#include <ripple/common/impl/ResolverAsio.cpp>
 #include <ripple/common/impl/MultiSocket.cpp>
+#include <ripple/common/impl/ResolverAsio.cpp>
 #include <ripple/common/impl/RippleSSLContext.cpp>
+#include <ripple/common/impl/TaggedCache.cpp>
+
+#include <ripple/common/tests/cross_offer.test.cpp>
--- a/src/ripple/unity/core.cpp
+++ b/src/ripple/unity/core.cpp
@@ -19,21 +19,9 @@

 #include <BeastConfig.h>

-#include <fstream>
-#include <map>
-#include <set>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
-#include <beast/http/ParsedURL.h>
-#include <ripple/unity/net.h> // for HTTPClient
-
-#include <ripple/module/core/Config.cpp>
-#include <ripple/module/core/LoadFeeTrackImp.h> // private
-#include <ripple/module/core/LoadFeeTrackImp.cpp>
-#include <ripple/module/core/LoadEvent.cpp>
-#include <ripple/module/core/LoadMonitor.cpp>
-
-#include <ripple/module/core/Job.cpp>
-#include <ripple/module/core/JobQueue.cpp>
+#include <ripple/core/impl/Config.cpp>
+#include <ripple/core/impl/LoadFeeTrackImp.cpp>
+#include <ripple/core/impl/LoadEvent.cpp>
+#include <ripple/core/impl/LoadMonitor.cpp>
+#include <ripple/core/impl/Job.cpp>
+#include <ripple/core/impl/JobQueue.cpp>
--- a/src/ripple/unity/data.cpp
+++ b/src/ripple/unity/data.cpp
@@ -42,7 +42,7 @@
 #include <openssl/err.h>

 #include <ripple/unity/sslutil.h>
-#include <ripple/module/rpc/ErrorCodes.h>
+#include <ripple/rpc/ErrorCodes.h>
 #include <ripple/common/jsonrpc_fields.h>

 // VFALCO TODO fix these warnings!
@@ -55,32 +55,32 @@
 #undef min
 #endif

-#include <ripple/module/data/protocol/STParsedJSON.cpp>
+#include <ripple/data/protocol/STParsedJSON.cpp>

-#include <ripple/module/data/crypto/CKey.h> // needs RippleAddress VFALCO TODO remove this dependency cycle
-#include <ripple/module/data/crypto/RFC1751.h>
+#include <ripple/data/crypto/CKey.h> // needs RippleAddress VFALCO TODO remove this dependency cycle
+#include <ripple/data/crypto/RFC1751.h>

-#include <ripple/module/data/crypto/CKey.cpp>
-#include <ripple/module/data/crypto/CKeyDeterministic.cpp>
-#include <ripple/module/data/crypto/CKeyECIES.cpp>
-#include <ripple/module/data/crypto/Base58Data.cpp>
-#include <ripple/module/data/crypto/RFC1751.cpp>
+#include <ripple/data/crypto/CKey.cpp>
+#include <ripple/data/crypto/CKeyDeterministic.cpp>
+#include <ripple/data/crypto/CKeyECIES.cpp>
+#include <ripple/data/crypto/Base58Data.cpp>
+#include <ripple/data/crypto/RFC1751.cpp>

-#include <ripple/module/data/protocol/BuildInfo.cpp>
-#include <ripple/module/data/protocol/SField.cpp>
-#include <ripple/module/data/protocol/HashPrefix.cpp>
-#include <ripple/module/data/protocol/LedgerFormats.cpp>
-#include <ripple/module/data/protocol/RippleAddress.cpp>
-#include <ripple/module/data/protocol/STInteger.cpp>
-#include <ripple/module/data/protocol/SerializedTypes.cpp>
-#include <ripple/module/data/protocol/Serializer.cpp>
-#include <ripple/module/data/protocol/SerializedObjectTemplate.cpp>
-#include <ripple/module/data/protocol/STObject.cpp>
-#include <ripple/module/data/protocol/STArray.cpp>
-#include <ripple/module/data/protocol/TER.cpp>
-#include <ripple/module/data/protocol/TxFormats.cpp>
-#include <ripple/module/data/protocol/STAmount.cpp>
-#include <ripple/module/data/protocol/STAmount.test.cpp>
+#include <ripple/data/protocol/BuildInfo.cpp>
+#include <ripple/data/protocol/SField.cpp>
+#include <ripple/data/protocol/HashPrefix.cpp>
+#include <ripple/data/protocol/LedgerFormats.cpp>
+#include <ripple/data/protocol/RippleAddress.cpp>
+#include <ripple/data/protocol/STInteger.cpp>
+#include <ripple/data/protocol/SerializedTypes.cpp>
+#include <ripple/data/protocol/Serializer.cpp>
+#include <ripple/data/protocol/SerializedObjectTemplate.cpp>
+#include <ripple/data/protocol/STObject.cpp>
+#include <ripple/data/protocol/STArray.cpp>
+#include <ripple/data/protocol/TER.cpp>
+#include <ripple/data/protocol/TxFormats.cpp>
+#include <ripple/data/protocol/STAmount.cpp>
+#include <ripple/data/protocol/STAmount.test.cpp>

 #if BEAST_MSVC
 #pragma warning (pop)
--- a/src/ripple/unity/data.h
+++ b/src/ripple/unity/data.h
@@ -20,35 +20,35 @@
 #ifndef RIPPLE_DATA_H_INCLUDED
 #define RIPPLE_DATA_H_INCLUDED

-#include <ripple/unity/basics.h>
+#include <ripple/unity/types.h>
 #include <ripple/unity/json.h>
-#include <ripple/sslutil/api/ECDSACanonical.h>
+#include <ripple/sslutil/ECDSACanonical.h>

 struct bignum_st;
 typedef struct bignum_st BIGNUM;

-#include <ripple/module/data/crypto/Base58Data.h>
-#include <ripple/module/data/crypto/RFC1751.h>
-#include <ripple/module/data/protocol/BuildInfo.h>
-#include <ripple/module/data/protocol/SField.h>
-#include <ripple/module/data/protocol/HashPrefix.h>
-#include <ripple/module/data/protocol/Protocol.h>
-#include <ripple/module/data/protocol/RippleAddress.h>
-#include <ripple/module/data/protocol/RippleSystem.h>
-#include <ripple/module/data/protocol/Serializer.h> // needs CKey
-#include <ripple/module/data/protocol/TER.h>
-#include <ripple/module/data/protocol/SerializedTypes.h> // needs Serializer, TER
-#include <ripple/module/data/protocol/SerializedObjectTemplate.h>
-#include <ripple/module/data/protocol/KnownFormats.h>
-#include <ripple/module/data/protocol/LedgerFormats.h> // needs SOTemplate from SerializedObjectTemplate
-#include <ripple/module/data/protocol/TxFormats.h>
-#include <ripple/module/data/protocol/STObject.h>
-#include <ripple/module/data/protocol/STArray.h>
-#include <ripple/module/data/protocol/TxFlags.h>
+#include <ripple/data/crypto/Base58Data.h>
+#include <ripple/data/crypto/RFC1751.h>
+#include <ripple/data/protocol/BuildInfo.h>
+#include <ripple/data/protocol/SField.h>
+#include <ripple/data/protocol/HashPrefix.h>
+#include <ripple/data/protocol/Protocol.h>
+#include <ripple/data/protocol/RippleAddress.h>
+#include <ripple/data/protocol/RippleSystem.h>
+#include <ripple/data/protocol/Serializer.h> // needs CKey
+#include <ripple/data/protocol/TER.h>
+#include <ripple/data/protocol/SerializedTypes.h> // needs Serializer, TER
+#include <ripple/data/protocol/SerializedObjectTemplate.h>
+#include <ripple/data/protocol/KnownFormats.h>
+#include <ripple/data/protocol/LedgerFormats.h> // needs SOTemplate from SerializedObjectTemplate
+#include <ripple/data/protocol/TxFormats.h>
+#include <ripple/data/protocol/STObject.h>
+#include <ripple/data/protocol/STArray.h>
+#include <ripple/data/protocol/TxFlags.h>

-#include <ripple/module/data/utility/UptimeTimerAdapter.h>
+#include <ripple/data/utility/UptimeTimerAdapter.h>

-#include <ripple/module/data/protocol/STParsedJSON.h>
+#include <ripple/data/protocol/STParsedJSON.h>

 //------------------------------------------------------------------------------

--- a/src/ripple/unity/net.cpp
+++ b/src/ripple/unity/net.cpp
@@ -28,35 +28,13 @@

 #include <BeastConfig.h>

-#include <boost/version.hpp>
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/asio.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/array.hpp>
-#include <boost/foreach.hpp>
-#include <boost/mpl/at.hpp>
-#include <boost/mpl/vector.hpp>
-
-#include <ripple/unity/net.h>
-
-#include <ripple/unity/websocket.h> // for HTTPClient, RPCDoor
-
-// VFALCO NOTE This is the "new new new" where individual headers are included
-//             directly (instead of the module header). The corresponding .cpp
-//             still uses the unity style inclusion.
-//
-#include <ripple/module/rpc/ErrorCodes.h>
-#include <ripple/common/jsonrpc_fields.h>
-
-#include <ripple/module/net/basics/HTTPRequest.cpp>
-#include <ripple/module/net/basics/HTTPClient.cpp>
-#include <ripple/module/net/basics/impl/RPCServerImp.h>
-#include <ripple/module/net/basics/SNTPClient.cpp>
-#include <ripple/module/net/rpc/RPCCall.cpp>
-#include <ripple/module/net/rpc/RPCErr.cpp>
-#include <ripple/module/net/rpc/RPCSub.cpp>
-#include <ripple/module/net/rpc/RPCUtil.cpp>
-#include <ripple/module/net/rpc/InfoSub.cpp>
-
-#include <ripple/module/net/basics/RPCDoor.cpp>
+#include <ripple/net/impl/HTTPRequest.cpp>
+#include <ripple/net/impl/HTTPClient.cpp>
+#include <ripple/net/impl/InfoSub.cpp>
+#include <ripple/net/impl/RPCCall.cpp>
+#include <ripple/net/impl/RPCDoor.cpp> // Is this still needed?
+#include <ripple/net/impl/RPCErr.cpp>
+#include <ripple/net/impl/RPCServerImp.h>
+#include <ripple/net/impl/RPCSub.cpp>
+#include <ripple/net/impl/RPCUtil.cpp>
+#include <ripple/net/impl/SNTPClient.cpp>
--- a/src/ripple/unity/net.h
+++ b/src/ripple/unity/net.h
@@ -20,27 +20,25 @@
 #ifndef RIPPLE_NET_H_INCLUDED
 #define RIPPLE_NET_H_INCLUDED

-#include <boost/asio.hpp>
 #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
 #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER /**/
 #include <boost/asio/ssl.hpp>

 #include <ripple/unity/resource.h>

-#include <ripple/unity/basics.h>
 #include <ripple/unity/data.h>
-#include <ripple/module/websocket/autosocket/AutoSocket.h>
+#include <ripple/websocket/autosocket/AutoSocket.h>

-#include <ripple/module/net/basics/HTTPRequest.h>
-#include <ripple/module/net/basics/HTTPClient.h>
-#include <ripple/module/net/basics/RPCServer.h>
-#include <ripple/module/net/basics/RPCDoor.h>
-#include <ripple/module/net/basics/SNTPClient.h>
+#include <ripple/net/HTTPRequest.h>
+#include <ripple/net/HTTPClient.h>
+#include <ripple/net/RPCServer.h>
+#include <ripple/net/RPCDoor.h>
+#include <ripple/net/SNTPClient.h>

-#include <ripple/module/net/rpc/RPCErr.h>
-#include <ripple/module/net/rpc/RPCUtil.h>
-#include <ripple/module/net/rpc/RPCCall.h>
-#include <ripple/module/net/rpc/InfoSub.h>
-#include <ripple/module/net/rpc/RPCSub.h>
+#include <ripple/net/RPCErr.h>
+#include <ripple/net/RPCUtil.h>
+#include <ripple/net/RPCCall.h>
+#include <ripple/net/InfoSub.h>
+#include <ripple/net/RPCSub.h>

 #endif
--- a/src/ripple/unity/peerfinder.cpp
+++ b/src/ripple/unity/peerfinder.cpp
@@ -19,49 +19,12 @@

 #include <BeastConfig.h>

-#include <ripple/unity/peerfinder.h>
-
-#include <ripple/common/Resolver.h>
-
-#include <deque>
-#include <fstream>
-#include <iomanip>
-#include <random>
-#include <set>
-
-#include <boost/array.hpp>
-#include <boost/optional.hpp>
-#include <boost/regex.hpp>
-
-#include <beast/module/sqdb/sqdb.h>
-#include <beast/module/asio/asio.h>
-
-#include <beast/boost/ErrorCode.h>
-#include <beast/chrono/chrono_io.h>
-
-#include <ripple/peerfinder/impl/iosformat.h> // VFALCO NOTE move to beast
-
 #ifndef NDEBUG
 # define consistency_check(cond) bassert(cond)
 #else
 # define consistency_check(cond)
 #endif

-#include <ripple/peerfinder/impl/PrivateTypes.h>
-#include <ripple/peerfinder/impl/Tuning.h>
-#include <ripple/peerfinder/impl/Checker.h>
-#include <ripple/peerfinder/impl/CheckerAdapter.h>
-#include <ripple/peerfinder/impl/Livecache.h>
-#include <ripple/peerfinder/impl/SlotImp.h>
-#include <ripple/peerfinder/impl/Counts.h>
-#include <ripple/peerfinder/impl/Source.h>
-#include <ripple/peerfinder/impl/SourceStrings.h>
-#include <ripple/peerfinder/impl/Store.h>
-#include <ripple/peerfinder/impl/Bootcache.h>
-#include <ripple/peerfinder/impl/StoreSqdb.h>
-#include <ripple/peerfinder/impl/Reporting.h>
-#include <ripple/peerfinder/impl/Logic.h>
-
 #include <ripple/peerfinder/impl/Bootcache.cpp>
 #include <ripple/peerfinder/impl/Checker.cpp>
 #include <ripple/peerfinder/impl/Config.cpp>
--- a/src/ripple/unity/peerfinder.h
+++ b/src/ripple/unity/peerfinder.h
@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_PEERFINDER_H_INCLUDED
-#define RIPPLE_PEERFINDER_H_INCLUDED
-
-#include <ripple/unity/sitefiles.h>
-
-#include <ripple/types/api/RipplePublicKey.h>
-
-#include <ripple/peerfinder/api/Slot.h>
-#include <ripple/peerfinder/api/Endpoint.h>
-#include <ripple/peerfinder/api/Types.h>
-#include <ripple/peerfinder/api/Callback.h>
-#include <ripple/peerfinder/api/Config.h>
-#include <ripple/peerfinder/api/Manager.h>
-
-#endif
--- a/src/ripple/unity/radmap.cpp
+++ b/src/ripple/unity/radmap.cpp
@@ -1,22 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include <BeastConfig.h>
-
-#include <ripple/radmap/impl/BasicFullBelowCache.cpp>
--- a/src/ripple/unity/radmap.h
+++ b/src/ripple/unity/radmap.h
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_RADMAP_H_INCLUDED
-#define RIPPLE_RADMAP_H_INCLUDED
-
-#include <ripple/radmap/api/BasicFullBelowCache.h>
-#include <ripple/radmap/api/Tuning.h>
-
-#endif
--- a/src/ripple/unity/resource.cpp
+++ b/src/ripple/unity/resource.cpp
@@ -23,7 +23,7 @@

 #include <boost/utility/base_from_member.hpp>

-#include <ripple/algorithm/api/DecayingSample.h>
+#include <ripple/common/DecayingSample.h>
 #include <ripple/common/seconds_clock.h>

 #include <beast/Insight.h>
--- a/src/ripple/unity/rpcx.cpp
+++ b/src/ripple/unity/rpcx.cpp
@@ -28,83 +28,83 @@

 #include <ripple/unity/rpcx.h>

-#include <ripple/module/rpc/RPCHandler.h>
+#include <ripple/rpc/RPCHandler.h>
 #include <ripple/overlay/Overlay.h>
 #include <tuple>

-#include <ripple/module/rpc/RPCHandler.h>
-#include <ripple/module/rpc/impl/ErrorCodes.cpp>
-#include <ripple/module/rpc/impl/Manager.cpp>
-#include <ripple/module/rpc/impl/RPCServerHandler.cpp>
-#include <ripple/module/rpc/impl/RPCHandler.cpp>
+#include <ripple/rpc/RPCHandler.h>
+#include <ripple/rpc/impl/ErrorCodes.cpp>
+#include <ripple/rpc/impl/Manager.cpp>
+#include <ripple/rpc/impl/RPCServerHandler.cpp>
+#include <ripple/rpc/impl/RPCHandler.cpp>

-#include <ripple/module/rpc/handlers/Handlers.h>
-#include <ripple/module/rpc/handlers/AccountCurrencies.cpp>
-#include <ripple/module/rpc/handlers/AccountInfo.cpp>
-#include <ripple/module/rpc/handlers/AccountLines.cpp>
-#include <ripple/module/rpc/handlers/AccountOffers.cpp>
-#include <ripple/module/rpc/handlers/AccountTx.cpp>
-#include <ripple/module/rpc/handlers/AccountTxOld.cpp>
-#include <ripple/module/rpc/handlers/AccountTxSwitch.cpp>
-#include <ripple/module/rpc/handlers/BlackList.cpp>
-#include <ripple/module/rpc/handlers/BookOffers.cpp>
-#include <ripple/module/rpc/handlers/Connect.cpp>
-#include <ripple/module/rpc/handlers/ConsensusInfo.cpp>
-#include <ripple/module/rpc/handlers/Feature.cpp>
-#include <ripple/module/rpc/handlers/FetchInfo.cpp>
-#include <ripple/module/rpc/handlers/GetCounts.cpp>
-#include <ripple/module/rpc/handlers/Internal.cpp>
-#include <ripple/module/rpc/handlers/Ledger.cpp>
-#include <ripple/module/rpc/handlers/LedgerAccept.cpp>
-#include <ripple/module/rpc/handlers/LedgerCleaner.cpp>
-#include <ripple/module/rpc/handlers/LedgerClosed.cpp>
-#include <ripple/module/rpc/handlers/LedgerCurrent.cpp>
-#include <ripple/module/rpc/handlers/LedgerData.cpp>
-#include <ripple/module/rpc/handlers/LedgerEntry.cpp>
-#include <ripple/module/rpc/handlers/LedgerHeader.cpp>
-#include <ripple/module/rpc/handlers/LedgerRequest.cpp>
-#include <ripple/module/rpc/handlers/LogLevel.cpp>
-#include <ripple/module/rpc/handlers/LogRotate.cpp>
-#include <ripple/module/rpc/handlers/OwnerInfo.cpp>
-#include <ripple/module/rpc/handlers/PathFind.cpp>
-#include <ripple/module/rpc/handlers/Peers.cpp>
-#include <ripple/module/rpc/handlers/Ping.cpp>
-#include <ripple/module/rpc/handlers/Print.cpp>
-#include <ripple/module/rpc/handlers/ProofCreate.cpp>
-#include <ripple/module/rpc/handlers/ProofSolve.cpp>
-#include <ripple/module/rpc/handlers/ProofVerify.cpp>
-#include <ripple/module/rpc/handlers/Random.cpp>
-#include <ripple/module/rpc/handlers/RipplePathFind.cpp>
-#include <ripple/module/rpc/handlers/SMS.cpp>
-#include <ripple/module/rpc/handlers/ServerInfo.cpp>
-#include <ripple/module/rpc/handlers/ServerState.cpp>
-#include <ripple/module/rpc/handlers/Sign.cpp>
-#include <ripple/module/rpc/handlers/Stop.cpp>
-#include <ripple/module/rpc/handlers/Submit.cpp>
-#include <ripple/module/rpc/handlers/Subscribe.cpp>
-#include <ripple/module/rpc/handlers/TransactionEntry.cpp>
-#include <ripple/module/rpc/handlers/Tx.cpp>
-#include <ripple/module/rpc/handlers/TxHistory.cpp>
-#include <ripple/module/rpc/handlers/UnlAdd.cpp>
-#include <ripple/module/rpc/handlers/UnlDelete.cpp>
-#include <ripple/module/rpc/handlers/UnlList.cpp>
-#include <ripple/module/rpc/handlers/UnlLoad.cpp>
-#include <ripple/module/rpc/handlers/UnlNetwork.cpp>
-#include <ripple/module/rpc/handlers/UnlReset.cpp>
-#include <ripple/module/rpc/handlers/UnlScore.cpp>
-#include <ripple/module/rpc/handlers/Unsubscribe.cpp>
-#include <ripple/module/rpc/handlers/ValidationCreate.cpp>
-#include <ripple/module/rpc/handlers/ValidationSeed.cpp>
-#include <ripple/module/rpc/handlers/WalletAccounts.cpp>
-#include <ripple/module/rpc/handlers/WalletPropose.cpp>
-#include <ripple/module/rpc/handlers/WalletSeed.cpp>
+#include <ripple/rpc/handlers/Handlers.h>
+#include <ripple/rpc/handlers/AccountCurrencies.cpp>
+#include <ripple/rpc/handlers/AccountInfo.cpp>
+#include <ripple/rpc/handlers/AccountLines.cpp>
+#include <ripple/rpc/handlers/AccountOffers.cpp>
+#include <ripple/rpc/handlers/AccountTx.cpp>
+#include <ripple/rpc/handlers/AccountTxOld.cpp>
+#include <ripple/rpc/handlers/AccountTxSwitch.cpp>
+#include <ripple/rpc/handlers/BlackList.cpp>
+#include <ripple/rpc/handlers/BookOffers.cpp>
+#include <ripple/rpc/handlers/Connect.cpp>
+#include <ripple/rpc/handlers/ConsensusInfo.cpp>
+#include <ripple/rpc/handlers/Feature.cpp>
+#include <ripple/rpc/handlers/FetchInfo.cpp>
+#include <ripple/rpc/handlers/GetCounts.cpp>
+#include <ripple/rpc/handlers/Internal.cpp>
+#include <ripple/rpc/handlers/Ledger.cpp>
+#include <ripple/rpc/handlers/LedgerAccept.cpp>
+#include <ripple/rpc/handlers/LedgerCleaner.cpp>
+#include <ripple/rpc/handlers/LedgerClosed.cpp>
+#include <ripple/rpc/handlers/LedgerCurrent.cpp>
+#include <ripple/rpc/handlers/LedgerData.cpp>
+#include <ripple/rpc/handlers/LedgerEntry.cpp>
+#include <ripple/rpc/handlers/LedgerHeader.cpp>
+#include <ripple/rpc/handlers/LedgerRequest.cpp>
+#include <ripple/rpc/handlers/LogLevel.cpp>
+#include <ripple/rpc/handlers/LogRotate.cpp>
+#include <ripple/rpc/handlers/OwnerInfo.cpp>
+#include <ripple/rpc/handlers/PathFind.cpp>
+#include <ripple/rpc/handlers/Peers.cpp>
+#include <ripple/rpc/handlers/Ping.cpp>
+#include <ripple/rpc/handlers/Print.cpp>
+#include <ripple/rpc/handlers/ProofCreate.cpp>
+#include <ripple/rpc/handlers/ProofSolve.cpp>
+#include <ripple/rpc/handlers/ProofVerify.cpp>
+#include <ripple/rpc/handlers/Random.cpp>
+#include <ripple/rpc/handlers/RipplePathFind.cpp>
+#include <ripple/rpc/handlers/SMS.cpp>
+#include <ripple/rpc/handlers/ServerInfo.cpp>
+#include <ripple/rpc/handlers/ServerState.cpp>
+#include <ripple/rpc/handlers/Sign.cpp>
+#include <ripple/rpc/handlers/Stop.cpp>
+#include <ripple/rpc/handlers/Submit.cpp>
+#include <ripple/rpc/handlers/Subscribe.cpp>
+#include <ripple/rpc/handlers/TransactionEntry.cpp>
+#include <ripple/rpc/handlers/Tx.cpp>
+#include <ripple/rpc/handlers/TxHistory.cpp>
+#include <ripple/rpc/handlers/UnlAdd.cpp>
+#include <ripple/rpc/handlers/UnlDelete.cpp>
+#include <ripple/rpc/handlers/UnlList.cpp>
+#include <ripple/rpc/handlers/UnlLoad.cpp>
+#include <ripple/rpc/handlers/UnlNetwork.cpp>
+#include <ripple/rpc/handlers/UnlReset.cpp>
+#include <ripple/rpc/handlers/UnlScore.cpp>
+#include <ripple/rpc/handlers/Unsubscribe.cpp>
+#include <ripple/rpc/handlers/ValidationCreate.cpp>
+#include <ripple/rpc/handlers/ValidationSeed.cpp>
+#include <ripple/rpc/handlers/WalletAccounts.cpp>
+#include <ripple/rpc/handlers/WalletPropose.cpp>
+#include <ripple/rpc/handlers/WalletSeed.cpp>

-#include <ripple/module/rpc/impl/AccountFromString.cpp>
-#include <ripple/module/rpc/impl/Accounts.cpp>
-#include <ripple/module/rpc/impl/Authorize.cpp>
-#include <ripple/module/rpc/impl/GetMasterGenerator.cpp>
-#include <ripple/module/rpc/impl/Handler.cpp>
-#include <ripple/module/rpc/impl/LegacyPathFind.cpp>
-#include <ripple/module/rpc/impl/LookupLedger.cpp>
-#include <ripple/module/rpc/impl/ParseAccountIds.cpp>
-#include <ripple/module/rpc/impl/TransactionSign.cpp>
+#include <ripple/rpc/impl/AccountFromString.cpp>
+#include <ripple/rpc/impl/Accounts.cpp>
+#include <ripple/rpc/impl/Authorize.cpp>
+#include <ripple/rpc/impl/GetMasterGenerator.cpp>
+#include <ripple/rpc/impl/Handler.cpp>
+#include <ripple/rpc/impl/LegacyPathFind.cpp>
+#include <ripple/rpc/impl/LookupLedger.cpp>
+#include <ripple/rpc/impl/ParseAccountIds.cpp>
+#include <ripple/rpc/impl/TransactionSign.cpp>
--- a/src/ripple/unity/rpcx.h
+++ b/src/ripple/unity/rpcx.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_RPC_H_INCLUDED
 #define RIPPLE_RPC_H_INCLUDED

-#include <ripple/module/rpc/ErrorCodes.h>
-#include <ripple/module/rpc/Manager.h>
-#include <ripple/module/rpc/Request.h>
+#include <ripple/rpc/ErrorCodes.h>
+#include <ripple/rpc/Manager.h>
+#include <ripple/rpc/Request.h>

 #endif
--- a/src/ripple/unity/sslutil.h
+++ b/src/ripple/unity/sslutil.h
@@ -27,10 +27,10 @@
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>

-#include <ripple/sslutil/api/bignum_error.h>
-#include <ripple/sslutil/api/CAutoBN_CTX.h>
-#include <ripple/sslutil/api/CBigNum.h>
-#include <ripple/sslutil/api/DHUtil.h>
-#include <ripple/sslutil/api/ECDSACanonical.h>
+#include <ripple/sslutil/bignum_error.h>
+#include <ripple/sslutil/CAutoBN_CTX.h>
+#include <ripple/sslutil/CBigNum.h>
+#include <ripple/sslutil/DHUtil.h>
+#include <ripple/sslutil/ECDSACanonical.h>

 #endif
--- a/src/ripple/unity/types.cpp
+++ b/src/ripple/unity/types.cpp
@@ -43,5 +43,3 @@
 #include <ripple/types/impl/UintTypes.cpp>
 #include <ripple/types/impl/RippleIdentifierTests.cpp>
 #include <ripple/types/impl/Issue.cpp>
-
-#include <ripple/common/tests/cross_offer.test.cpp>
--- a/src/ripple/unity/types.h
+++ b/src/ripple/unity/types.h
@@ -38,26 +38,26 @@
 #include <sys/types.h>
 #endif

-#include <ripple/types/api/AgedHistory.h>
-#include <ripple/types/api/Blob.h>
-#include <ripple/types/api/Base58.h>
-#include <ripple/types/api/Book.h>
-#include <ripple/types/api/ByteOrder.h>
-#include <ripple/types/api/strHex.h>
-#include <ripple/types/api/UInt160.h>
-#include <ripple/types/api/RandomNumbers.h>
-#include <ripple/types/api/HashMaps.h>
+#include <ripple/types/AgedHistory.h>
+#include <ripple/types/Blob.h>
+#include <ripple/types/Base58.h>
+#include <ripple/types/Book.h>
+#include <ripple/types/ByteOrder.h>
+#include <ripple/types/strHex.h>
+#include <ripple/types/UInt160.h>
+#include <ripple/types/RandomNumbers.h>
+#include <ripple/types/HashMaps.h>

-#include <ripple/types/api/IdentifierType.h>
-#include <ripple/types/api/IdentifierStorage.h>
-#include <ripple/types/api/CryptoIdentifier.h>
-#include <ripple/types/api/RippleAccountID.h>
-#include <ripple/types/api/RippleAccountPublicKey.h>
-#include <ripple/types/api/RippleAccountPrivateKey.h>
-#include <ripple/types/api/RipplePublicKey.h>
-#include <ripple/types/api/RipplePrivateKey.h>
-#include <ripple/types/api/SimpleIdentifier.h>
-#include <ripple/types/api/RippleLedgerHash.h>
-#include <ripple/types/api/RipplePublicKeyHash.h>
+#include <ripple/types/IdentifierType.h>
+#include <ripple/types/IdentifierStorage.h>
+#include <ripple/types/CryptoIdentifier.h>
+#include <ripple/types/RippleAccountID.h>
+#include <ripple/types/RippleAccountPublicKey.h>
+#include <ripple/types/RippleAccountPrivateKey.h>
+#include <ripple/types/RipplePublicKey.h>
+#include <ripple/types/RipplePrivateKey.h>
+#include <ripple/types/SimpleIdentifier.h>
+#include <ripple/types/RippleLedgerHash.h>
+#include <ripple/types/RipplePublicKeyHash.h>

 #endif
--- a/src/ripple/unity/websocket.cpp
+++ b/src/ripple/unity/websocket.cpp
@@ -42,5 +42,5 @@
 #include <websocket/src/network_utilities.cpp>
 #include <websocket/src/sha1/sha1.cpp>

-#include <ripple/module/websocket/autosocket/AutoSocket.cpp>
-#include <ripple/module/websocket/autosocket/LogWebsockets.cpp>
+#include <ripple/websocket/autosocket/AutoSocket.cpp>
+#include <ripple/websocket/autosocket/LogWebsockets.cpp>