Merge branch 'develop' of github.com:ripple/rippled into develop

Builds/QtCreator/rippled.pro

@@ -1,7 +1,7 @@
 
 # Ripple protocol buffers
 
-PROTOS = ../../src/cpp/ripple/ripple.proto
+PROTOS = ../../modules/ripple_data/protocol/ripple.proto
 PROTOS_DIR = ../../build/proto
 
 # Google Protocol Buffers support
@@ -55,7 +55,6 @@ OTHER_FILES += \
 
 #   $$files(../../Subtrees/beast/modules/beast_core/, true)
 #   $$files(../../modules/*, true) \
-#   $$files(../../src/cpp/ripple/*, true) \
 
 UI_HEADERS_DIR += ../../modules/ripple_basics
 

Builds/VisualStudio2012/RippleD.props

@@ -3,7 +3,6 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <RepoDir>..\..</RepoDir>
-    <SrcDir>$(RepoDir)\src\cpp\ripple</SrcDir>
   </PropertyGroup>
   <PropertyGroup>
     <OutDir>$(RepoDir)\build\VisualStudio2012\$(Configuration).$(Platform)\</OutDir>
@@ -27,8 +26,5 @@
     <BuildMacro Include="RepoDir">
       <Value>$(RepoDir)</Value>
     </BuildMacro>
-    <BuildMacro Include="SrcDir">
-      <Value>$(SrcDir)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -97,30 +97,6 @@
     <Filter Include="[0] Subtrees\leveldb\port\win">
       <UniqueIdentifier>{223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_main">
-      <UniqueIdentifier>{cf19fa31-c40b-4203-b497-63a8c3dcb282}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_network">
-      <UniqueIdentifier>{7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_pathing">
-      <UniqueIdentifier>{66d2d40a-72bd-41f5-9cf9-1f464a40bb04}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_peers">
-      <UniqueIdentifier>{ec6b9e0e-4a92-4c06-833d-441d51b0b163}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_rpc">
-      <UniqueIdentifier>{d46790be-df64-4e31-b51c-ac9e95a24747}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_transactions">
-      <UniqueIdentifier>{7b3efe80-291a-49bc-b32e-085b5af47f98}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_misc">
-      <UniqueIdentifier>{29393027-f1ed-4700-bbd1-c880091ab96b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_shamap">
-      <UniqueIdentifier>{e54bae0e-09f1-483e-bcf7-fb6b17b8d561}</UniqueIdentifier>
-    </Filter>
     <Filter Include="[1] Ripple\ripple_basio">
       <UniqueIdentifier>{c6a852db-1174-4bf6-a726-ebaabf595743}</UniqueIdentifier>
     </Filter>
@@ -133,9 +109,6 @@
     <Filter Include="[1] Ripple\ripple_net\basics">
       <UniqueIdentifier>{febf2e7e-f071-4a6c-9b81-68498fc8ea57}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_misc\_consensus">
-      <UniqueIdentifier>{82a6d3f3-fa01-4cc6-9730-f928e61b9929}</UniqueIdentifier>
-    </Filter>
     <Filter Include="[1] Ripple\ripple_app\node">
       <UniqueIdentifier>{bd48a825-192f-4d5e-9230-661fdd65f9b6}</UniqueIdentifier>
     </Filter>
@@ -157,6 +130,33 @@
     <Filter Include="[1] Ripple\ripple_core\validator">
       <UniqueIdentifier>{efccddf1-024d-41c4-b7f5-26ce2dd79f21}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[1] Ripple\ripple_app\main">
+      <UniqueIdentifier>{cf19fa31-c40b-4203-b497-63a8c3dcb282}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\misc">
+      <UniqueIdentifier>{29393027-f1ed-4700-bbd1-c880091ab96b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\network">
+      <UniqueIdentifier>{7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\paths">
+      <UniqueIdentifier>{66d2d40a-72bd-41f5-9cf9-1f464a40bb04}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\peers">
+      <UniqueIdentifier>{ec6b9e0e-4a92-4c06-833d-441d51b0b163}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\rpc">
+      <UniqueIdentifier>{d46790be-df64-4e31-b51c-ac9e95a24747}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\shamap">
+      <UniqueIdentifier>{e54bae0e-09f1-483e-bcf7-fb6b17b8d561}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\tx">
+      <UniqueIdentifier>{7b3efe80-291a-49bc-b32e-085b5af47f98}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\consensus">
+      <UniqueIdentifier>{82a6d3f3-fa01-4cc6-9730-f928e61b9929}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Subtrees\sqlite\sqlite3.c">
@@ -534,216 +534,6 @@
     <ClCompile Include="..\..\modules\ripple_client\ripple_client.cpp">
       <Filter>[1] Ripple\ripple_client</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_DisputedTx.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LedgerConsensus.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ParameterTable.cpp">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Application.cpp">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LoadManager.cpp">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LocalCredentials.cpp">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Main.cpp">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_AccountItem.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_AccountItems.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_AccountState.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_CanonicalTXSet.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Features.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_FeeVote.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_HashRouter.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_InfoSub.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_NicknameState.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Offer.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_OrderBook.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_ProofOfWork.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_ProofOfWorkFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SerializedLedger.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SerializedTransaction.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SerializedTransactionUnitTests.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Validations.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\WSConnection.cpp">
-      <Filter>[1] Ripple\ripple_app\_network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\WSDoor.cpp">
-      <Filter>[1] Ripple\ripple_app\_network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\PeerDoor.cpp">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Peer.cpp">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_PeerSet.cpp">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Peers.cpp">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_UniqueNodeList.cpp">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\NetworkOPs.cpp">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Pathfinder.cpp">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_PathRequest.cpp">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_PathState.cpp">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_RippleCalc.cpp">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_RippleLineCache.cpp">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_RippleState.cpp">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\RPCDoor.cpp">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\RPCErr.cpp">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\RPCHandler.cpp">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\RPCSub.cpp">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\rpc.cpp">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\CallRPC.cpp">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMap.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapDelta.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapItem.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapMissingNode.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapNode.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapSync.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapSyncFilters.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapSyncUnitTests.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapTreeNode.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SHAMapUnitTests.cpp">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\AccountSetTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ChangeTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\OfferCancelTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\OfferCreateTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\PaymentTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\RegularKeySetTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_TransactionAcquire.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Transaction.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\TransactionCheck.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\TransactionEngine.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\TransactionMaster.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\TransactionMeta.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\TransactionQueue.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Transactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\TrustSetTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\WalletAddTransactor.cpp">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt5.cpp">
       <Filter>[1] Ripple\ripple_app</Filter>
     </ClCompile>
@@ -786,9 +576,6 @@
     <ClCompile Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.cpp">
       <Filter>[1] Ripple\ripple_net\basics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_WSHandler.cpp">
-      <Filter>[1] Ripple\ripple_app\_network</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_basio\boost\ripple_SslContext.cpp">
       <Filter>[1] Ripple\ripple_basio\boost</Filter>
     </ClCompile>
@@ -906,6 +693,219 @@
     <ClCompile Include="..\..\modules\ripple_app\node\ripple_MemoryBackendFactory.cpp">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\main\ParameterTable.cpp">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\main\ripple_Application.cpp">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\main\ripple_LoadManager.cpp">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\main\ripple_LocalCredentials.cpp">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\main\ripple_Main.cpp">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_AccountItem.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_AccountItems.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_AccountState.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_CanonicalTXSet.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_Features.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_FeeVote.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_HashRouter.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_InfoSub.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_NicknameState.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_Offer.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_OrderBook.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_ProofOfWork.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_ProofOfWorkFactory.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_SerializedLedger.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_SerializedTransaction.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_SerializedTransactionUnitTests.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_Validations.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\misc\NetworkOPs.cpp">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\network\WSConnection.cpp">
+      <Filter>[1] Ripple\ripple_app\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\network\WSDoor.cpp">
+      <Filter>[1] Ripple\ripple_app\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\network\ripple_WSHandler.cpp">
+      <Filter>[1] Ripple\ripple_app\network</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\paths\ripple_Pathfinder.cpp">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\paths\ripple_PathRequest.cpp">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\paths\ripple_PathState.cpp">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\paths\ripple_RippleCalc.cpp">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\paths\ripple_RippleLineCache.cpp">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\paths\ripple_RippleState.cpp">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\peers\ripple_Peer.cpp">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\peers\ripple_Peers.cpp">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\peers\ripple_PeerSet.cpp">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\peers\ripple_UniqueNodeList.cpp">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\peers\PeerDoor.cpp">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\CallRPC.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\rpc.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCDoor.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCHandler.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCSub.cpp">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMap.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapDelta.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapItem.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapMissingNode.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapNode.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapSync.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapSyncFilters.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapSyncUnitTests.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapTreeNode.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMapUnitTests.cpp">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\consensus\ripple_LedgerConsensus.cpp">
+      <Filter>[1] Ripple\ripple_app\consensus</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\consensus\ripple_DisputedTx.cpp">
+      <Filter>[1] Ripple\ripple_app\consensus</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\AccountSetTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\ChangeTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\OfferCancelTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\OfferCreateTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\PaymentTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\RegularKeySetTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\ripple_TransactionAcquire.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\Transaction.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\TransactionCheck.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\TransactionEngine.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\TransactionMaster.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\TransactionMeta.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\TransactionQueue.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\Transactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\TrustSetTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\tx\WalletAddTransactor.cpp">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1326,207 +1326,12 @@
     <ClInclude Include="..\..\modules\ripple_client\ripple_client.h">
       <Filter>[1] Ripple\ripple_client</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_DisputedTx.h">
-      <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerConsensus.h">
-      <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ParameterTable.h">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LocalCredentials.h">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AccountItem.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AccountItems.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AccountState.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_CanonicalTXSet.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_IFeatures.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_IFeeVote.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_IHashRouter.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_InfoSub.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_IValidations.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_NicknameState.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_Offer.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_OrderBook.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_ProofOfWork.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_ProofOfWorkFactory.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SerializedLedger.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SerializedTransaction.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\WSConnection.h">
-      <Filter>[1] Ripple\ripple_app\_network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\WSDoor.h">
-      <Filter>[1] Ripple\ripple_app\_network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Peer.h">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\PeerDoor.h">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_Peer.h">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_PeerSet.h">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_IPeers.h">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\NetworkOPs.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_IProofOfWorkFactory.h">
-      <Filter>[1] Ripple\ripple_app\_misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_Pathfinder.h">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_PathRequest.h">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_PathState.h">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_RippleCalc.h">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_RippleLineCache.h">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_RippleState.h">
-      <Filter>[1] Ripple\ripple_app\_pathing</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\RPCSub.h">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\RPC.h">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\RPCDoor.h">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\RPCErr.h">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\RPCHandler.h">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\CallRPC.h">
-      <Filter>[1] Ripple\ripple_app\_rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMap.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapAddNode.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapItem.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapMissingNode.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapNode.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapSyncFilter.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapSyncFilters.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapTreeNode.h">
-      <Filter>[1] Ripple\ripple_app\_shamap</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_BuildVersion.h">
       <Filter>[1] Ripple\ripple_app\basics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_Version.h">
       <Filter>[1] Ripple\ripple_app\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\AccountSetTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ChangeTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\OfferCancelTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\OfferCreateTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\PaymentTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\RegularKeySetTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_TransactionAcquire.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Transaction.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\TransactionEngine.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\TransactionMaster.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\TransactionMeta.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\TransactionQueue.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Transactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\TrustSetTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\WalletAddTransactor.h">
-      <Filter>[1] Ripple\ripple_app\_transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_ILoadManager.h">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_LogFile.h">
       <Filter>[1] Ripple\ripple_basics\utility</Filter>
     </ClInclude>
@@ -1566,12 +1371,6 @@
     <ClInclude Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.h">
       <Filter>[1] Ripple\ripple_net\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_WSHandler.h">
-      <Filter>[1] Ripple\ripple_app\_network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_UniqueNodeList.h">
-      <Filter>[1] Ripple\ripple_app\_peers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_basio\boost\ripple_SslContext.h">
       <Filter>[1] Ripple\ripple_basio\boost</Filter>
     </ClInclude>
@@ -1659,9 +1458,6 @@
     <ClInclude Include="..\..\modules\ripple_app\ledger\SerializedValidation.h">
       <Filter>[1] Ripple\ripple_app\ledger</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_Application.h">
-      <Filter>[1] Ripple\ripple_app\_main</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_core\validator\ripple_ValidatorList.h">
       <Filter>[1] Ripple\ripple_core\validator</Filter>
     </ClInclude>
@@ -1695,9 +1491,218 @@
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_MemoryBackendFactory.h">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\main\ParameterTable.h">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\main\ripple_Application.h">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\main\ripple_ILoadManager.h">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\main\ripple_LocalCredentials.h">
+      <Filter>[1] Ripple\ripple_app\main</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\NetworkOPs.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_AccountItem.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_AccountItems.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_AccountState.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_CanonicalTXSet.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IFeatures.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IFeeVote.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IHashRouter.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_InfoSub.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IProofOfWorkFactory.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IValidations.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_NicknameState.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_Offer.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_OrderBook.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_ProofOfWork.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_ProofOfWorkFactory.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_SerializedLedger.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_SerializedTransaction.h">
+      <Filter>[1] Ripple\ripple_app\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\network\ripple_WSHandler.h">
+      <Filter>[1] Ripple\ripple_app\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\network\WSConnection.h">
+      <Filter>[1] Ripple\ripple_app\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\network\WSDoor.h">
+      <Filter>[1] Ripple\ripple_app\network</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\paths\ripple_Pathfinder.h">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\paths\ripple_PathRequest.h">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\paths\ripple_PathState.h">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\paths\ripple_RippleCalc.h">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\paths\ripple_RippleLineCache.h">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\paths\ripple_RippleState.h">
+      <Filter>[1] Ripple\ripple_app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\PeerDoor.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_IPeers.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_Peer.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_PeerSet.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_UniqueNodeList.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\Peer.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_ClusterNodeStatus.h">
+      <Filter>[1] Ripple\ripple_app\peers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\CallRPC.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPC.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCDoor.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCHandler.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCSub.h">
+      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMap.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapAddNode.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapItem.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapMissingNode.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapNode.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapSyncFilter.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapSyncFilters.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapTreeNode.h">
+      <Filter>[1] Ripple\ripple_app\shamap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\consensus\ripple_DisputedTx.h">
+      <Filter>[1] Ripple\ripple_app\consensus</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\consensus\ripple_LedgerConsensus.h">
+      <Filter>[1] Ripple\ripple_app\consensus</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\AccountSetTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\ChangeTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\OfferCancelTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\OfferCreateTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\PaymentTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\RegularKeySetTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\ripple_TransactionAcquire.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\Transaction.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\TransactionEngine.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\TransactionMaster.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\TransactionMeta.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\TransactionQueue.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\Transactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\TrustSetTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\tx\WalletAddTransactor.h">
+      <Filter>[1] Ripple\ripple_app\tx</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\src\cpp\ripple\ripple.proto" />
+    <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">
+      <Filter>[1] Ripple\ripple_data\protocol</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\modules\ripple_json\json\json_internalarray.inl">

SConstruct

@@ -114,8 +114,7 @@ INCLUDE_PATHS = [
     'Subtrees/leveldb',
     'Subtrees/leveldb/port',
     'Subtrees/leveldb/include',
-    'Subtrees/beast',
+    'Subtrees/beast'
-    'src/cpp/ripple'
     ]
 
 COMPILED_FILES = [
@@ -198,7 +197,7 @@ if OSX:
     env.Append(LINKFLAGS = ['-L/usr/local/opt/openssl/lib'])
     env.Append(CXXFLAGS = ['-I/usr/local/opt/openssl/include'])
 
-PROTO_SRCS = env.Protoc([], 'src/cpp/ripple/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
+PROTO_SRCS = env.Protoc([], 'modules/ripple_data/protocol/ripple.proto', PROTOCOUTDIR='build/proto', PROTOCPYTHONOUTDIR=None)
 env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
 
 # Only tag actual Ripple files.

TODO.txt

@@ -5,6 +5,7 @@ RIPPLE TODO
 Items marked '*' can be handled by third parties.
 
 Vinnie's Short List (Changes day to day)
+- Review boost::asio wrappers and consolidation of network code in ripple_net
 - Make theConfig a SharedSingleton to prevent leak warnings
 - Refactor Section code into ConfigFile
 - Improved Mutex to track deadlocks
@@ -16,6 +17,10 @@ Vinnie's Short List (Changes day to day)
 
 --------------------------------------------------------------------------------
 
+- Take away the "I" prefix from abstract interface classes, in both the class
+  name and the file name. It is messing up sorting in the IDE. Use "Imp" or
+  suffix for implementations.
+
 - Raise the warning level and fix everything
 
 * Restyle all the macros in ripple_ConfigSection.h
@@ -52,10 +57,6 @@ Vinnie's Short List (Changes day to day)
 
 - Maybe rename RPCServer to RPCClientServicer
 
-- Take away the "I" prefix from abstract interface classes, in both the class
-  name and the file name. It is messing up sorting in the IDE. Use "Imp" or
-  suffix for implementations.
-
 - Profile/VTune the application to identify hot spots
   * Determine why rippled has a slow startup on Windows
   * Improve the performance when running all unit tests on Windows

modules/ripple_app/peers/ripple_ClusterNodeStatus.h

@@ -1,8 +1,11 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
 
-
+#ifndef RIPPLE_CLUSTERNODESTATUS_H_INCLUDED
-
+#define RIPPLE_CLUSTERNODESTATUS_H_INCLUDED
-#ifndef RIPPLE_CLUSTERNODESTATUS_H
-#define RIPPLE_CLUSTERNODESTATUS_H
 
 class ClusterNodeStatus
 {
@@ -11,7 +14,7 @@ public:
     ClusterNodeStatus() : mLoadFee(0), mReportTime(0)
     { ; }
 
-    ClusterNodeStatus(std::string const& name) : mNodeName(name), mLoadFee(0), mReportTime(0)
+    explicit ClusterNodeStatus(std::string const& name) : mNodeName(name), mLoadFee(0), mReportTime(0)
     { ; }
 
     ClusterNodeStatus(const std::string& name, uint32 fee, uint32 rtime) :

modules/ripple_app/ripple_app.cpp

@@ -112,84 +112,84 @@ namespace ripple
 #include "node/ripple_NullBackendFactory.h"
 #include "node/ripple_SqliteBackendFactory.h"
 
-#include "src/cpp/ripple/ripple_SHAMapItem.h"
+#include "shamap/ripple_SHAMapItem.h"
-#include "src/cpp/ripple/ripple_SHAMapNode.h"
+#include "shamap/ripple_SHAMapNode.h"
-#include "src/cpp/ripple/ripple_SHAMapTreeNode.h"
+#include "shamap/ripple_SHAMapTreeNode.h"
-#include "src/cpp/ripple/ripple_SHAMapMissingNode.h"
+#include "shamap/ripple_SHAMapMissingNode.h"
-#include "src/cpp/ripple/ripple_SHAMapSyncFilter.h"
+#include "shamap/ripple_SHAMapSyncFilter.h"
-#include "src/cpp/ripple/ripple_SHAMapAddNode.h"
+#include "shamap/ripple_SHAMapAddNode.h"
-#include "src/cpp/ripple/ripple_SHAMap.h"
+#include "shamap/ripple_SHAMap.h"
-#include "src/cpp/ripple/ripple_SerializedTransaction.h"
+#include "misc/ripple_SerializedTransaction.h"
-#include "src/cpp/ripple/ripple_SerializedLedger.h"
+#include "misc/ripple_SerializedLedger.h"
-#include "src/cpp/ripple/TransactionMeta.h"
+#include "tx/TransactionMeta.h"
-#include "src/cpp/ripple/Transaction.h"
+#include "tx/Transaction.h"
-#include "src/cpp/ripple/ripple_AccountState.h"
+#include "misc/ripple_AccountState.h"
-#include "src/cpp/ripple/ripple_NicknameState.h"
+#include "misc/ripple_NicknameState.h"
 #include "ledger/Ledger.h"
 #include "ledger/SerializedValidation.h"
-#include "src/cpp/ripple/ripple_ILoadManager.h"
+#include "main/ripple_ILoadManager.h"
-#include "src/cpp/ripple/ripple_ProofOfWork.h"
+#include "misc/ripple_ProofOfWork.h"
-#include "src/cpp/ripple/ripple_InfoSub.h"
+#include "misc/ripple_InfoSub.h"
-#include "src/cpp/ripple/ripple_OrderBook.h"
+#include "misc/ripple_OrderBook.h"
-#include "src/cpp/ripple/ripple_SHAMapSyncFilters.h"
+#include "shamap/ripple_SHAMapSyncFilters.h"
-#include "src/cpp/ripple/ripple_IFeatures.h"
+#include "misc/ripple_IFeatures.h"
-#include "src/cpp/ripple/ripple_IFeeVote.h"
+#include "misc/ripple_IFeeVote.h"
-#include "src/cpp/ripple/ripple_IHashRouter.h"
+#include "misc/ripple_IHashRouter.h"
-#include "src/cpp/ripple/ripple_Peer.h" // VFALCO TODO Rename to IPeer
+#include "peers/ripple_Peer.h" // VFALCO TODO Rename to IPeer
-#include "src/cpp/ripple/ripple_IPeers.h"
+#include "peers/ripple_IPeers.h"
-#include "src/cpp/ripple/ripple_IProofOfWorkFactory.h"
+#include "misc/ripple_IProofOfWorkFactory.h"
-#include "src/cpp/ripple/ripple_ClusterNodeStatus.h"
+#include "peers/ripple_ClusterNodeStatus.h"
-#include "src/cpp/ripple/ripple_UniqueNodeList.h"
+#include "peers/ripple_UniqueNodeList.h"
-#include "src/cpp/ripple/ripple_IValidations.h"
+#include "misc/ripple_IValidations.h"
-#include "src/cpp/ripple/ripple_PeerSet.h"
+#include "peers/ripple_PeerSet.h"
 #include "ledger/ripple_InboundLedger.h"
 #include "ledger/ripple_InboundLedgers.h"
-#include "src/cpp/ripple/ripple_AccountItem.h"
+#include "misc/ripple_AccountItem.h"
-#include "src/cpp/ripple/ripple_AccountItems.h"
+#include "misc/ripple_AccountItems.h"
 #include "ledger/ripple_AcceptedLedgerTx.h"
 #include "ledger/ripple_AcceptedLedger.h"
 #include "ledger/ripple_LedgerEntrySet.h"
-#include "src/cpp/ripple/TransactionEngine.h"
+#include "tx/TransactionEngine.h"
-#include "src/cpp/ripple/ripple_CanonicalTXSet.h"
+#include "misc/ripple_CanonicalTXSet.h"
 #include "ledger/ripple_LedgerHistory.h"
 #include "ledger/LedgerMaster.h"
 #include "ledger/LedgerProposal.h"
-#include "src/cpp/ripple/NetworkOPs.h"
+#include "misc/NetworkOPs.h"
-#include "src/cpp/ripple/TransactionMaster.h"
+#include "tx/TransactionMaster.h"
-#include "src/cpp/ripple/ripple_LocalCredentials.h"
+#include "main/ripple_LocalCredentials.h"
-#include "src/cpp/ripple/WSDoor.h"
+#include "network/WSDoor.h"
-#include "src/cpp/ripple/ripple_Application.h"
+#include "main/ripple_Application.h"
-#include "src/cpp/ripple/RPCHandler.h"
+#include "rpc/RPCHandler.h"
-#include "src/cpp/ripple/TransactionQueue.h"
+#include "tx/TransactionQueue.h"
 #include "ledger/OrderBookDB.h"
-#include "src/cpp/ripple/CallRPC.h"
+#include "rpc/CallRPC.h"
-#include "src/cpp/ripple/Transactor.h"
+#include "tx/Transactor.h"
-#include "src/cpp/ripple/ChangeTransactor.h"
+#include "tx/ChangeTransactor.h"
-#include "src/cpp/ripple/ripple_TransactionAcquire.h"
+#include "tx/ripple_TransactionAcquire.h"
-#include "src/cpp/ripple/ripple_DisputedTx.h"
+#include "consensus/ripple_DisputedTx.h"
-#include "src/cpp/ripple/ripple_LedgerConsensus.h"
+#include "consensus/ripple_LedgerConsensus.h"
 #include "ledger/LedgerTiming.h"
-#include "src/cpp/ripple/ripple_Offer.h"
+#include "misc/ripple_Offer.h"
-#include "src/cpp/ripple/OfferCancelTransactor.h"
+#include "tx/OfferCancelTransactor.h"
-#include "src/cpp/ripple/OfferCreateTransactor.h"
+#include "tx/OfferCreateTransactor.h"
-#include "src/cpp/ripple/ripple_PathRequest.h"
+#include "paths/ripple_PathRequest.h"
-#include "src/cpp/ripple/ParameterTable.h"
+#include "main/ParameterTable.h"
- #include "src/cpp/ripple/ripple_RippleLineCache.h"
+ #include "paths/ripple_RippleLineCache.h"
- #include "src/cpp/ripple/ripple_PathState.h"
+ #include "paths/ripple_PathState.h"
- #include "src/cpp/ripple/ripple_RippleCalc.h"
+ #include "paths/ripple_RippleCalc.h"
-#include  "src/cpp/ripple/ripple_Pathfinder.h"
+#include  "paths/ripple_Pathfinder.h"
-#include "src/cpp/ripple/PaymentTransactor.h"
+#include "tx/PaymentTransactor.h"
-#include "src/cpp/ripple/PeerDoor.h"
+#include "peers/PeerDoor.h"
-#include "src/cpp/ripple/RPC.h"
+#include "rpc/RPC.h"
-#include "src/cpp/ripple/RPCErr.h"
+#include "rpc/RPCErr.h"
-#include "src/cpp/ripple/RPCSub.h"
+#include "rpc/RPCSub.h"
-#include "src/cpp/ripple/RegularKeySetTransactor.h"
+#include "tx/RegularKeySetTransactor.h"
-#include "src/cpp/ripple/ripple_RippleState.h"
+#include "paths/ripple_RippleState.h"
-#include "src/cpp/ripple/AccountSetTransactor.h"
+#include "tx/AccountSetTransactor.h"
-#include "src/cpp/ripple/TrustSetTransactor.h"
+#include "tx/TrustSetTransactor.h"
-#include "src/cpp/ripple/WSConnection.h"
+#include "network/WSConnection.h"
-#include "src/cpp/ripple/ripple_WSHandler.h"
+#include "network/ripple_WSHandler.h"
-#include "src/cpp/ripple/WalletAddTransactor.h"
+#include "tx/WalletAddTransactor.h"
 
 #include "contracts/ripple_ScriptData.h"
 #include "contracts/ripple_Contract.h"
@@ -200,7 +200,7 @@ namespace ripple
 #include "basics/ripple_BuildVersion.h" // private
 #include "basics/ripple_RPCServerHandler.h"
 
-#include "src/cpp/ripple/RPCDoor.h" // needs RPCServer
+#include "rpc/RPCDoor.h" // needs RPCServer
 
 }
 
@@ -257,13 +257,13 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "node/ripple_SqliteBackendFactory.cpp"
 
 #include "ledger/Ledger.cpp"
-#include "src/cpp/ripple/ripple_SHAMapDelta.cpp"
+#include "shamap/ripple_SHAMapDelta.cpp"
-#include "src/cpp/ripple/ripple_SHAMapNode.cpp"
+#include "shamap/ripple_SHAMapNode.cpp"
-#include "src/cpp/ripple/ripple_SHAMapTreeNode.cpp"
+#include "shamap/ripple_SHAMapTreeNode.cpp"
 
-#include "src/cpp/ripple/ripple_AccountItems.cpp"
+#include "misc/ripple_AccountItems.cpp"
-#include "src/cpp/ripple/ripple_AccountState.cpp"
+#include "misc/ripple_AccountState.cpp"
-#include "src/cpp/ripple/ChangeTransactor.cpp"
+#include "tx/ChangeTransactor.cpp"
 
 #include "contracts/ripple_Contract.cpp"
 #include "contracts/ripple_Operation.cpp"
@@ -276,19 +276,19 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 2
 
-#include "src/cpp/ripple/RPCHandler.cpp"
+#include "rpc/RPCHandler.cpp"
-#include "src/cpp/ripple/ripple_SHAMap.cpp" // Uses theApp
+#include "shamap/ripple_SHAMap.cpp" // Uses theApp
-#include "src/cpp/ripple/ripple_SHAMapItem.cpp"
+#include "shamap/ripple_SHAMapItem.cpp"
-#include "src/cpp/ripple/ripple_SHAMapSync.cpp"
+#include "shamap/ripple_SHAMapSync.cpp"
-#include "src/cpp/ripple/ripple_SHAMapMissingNode.cpp"
+#include "shamap/ripple_SHAMapMissingNode.cpp"
 
-#include "src/cpp/ripple/ripple_AccountItem.cpp"
+#include "misc/ripple_AccountItem.cpp"
-#include "src/cpp/ripple/AccountSetTransactor.cpp"
+#include "tx/AccountSetTransactor.cpp"
-#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
+#include "misc/ripple_CanonicalTXSet.cpp"
 #include "ledger/LedgerProposal.cpp"
-#include "src/cpp/ripple/ripple_LoadManager.cpp"
+#include "main/ripple_LoadManager.cpp"
-#include "src/cpp/ripple/ripple_NicknameState.cpp"
+#include "misc/ripple_NicknameState.cpp"
-#include "src/cpp/ripple/OfferCancelTransactor.cpp"
+#include "tx/OfferCancelTransactor.cpp"
 #include "ledger/OrderBookDB.cpp"
 
 #include "data/ripple_Database.cpp"
@@ -310,23 +310,23 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
     return 512 == iKeyLength ? getApp().getLocalCredentials ().getDh512 () : getApp().getLocalCredentials ().getDh1024 ();
 }
 
-#include "src/cpp/ripple/ripple_RippleCalc.cpp"
+#include "paths/ripple_RippleCalc.cpp"
-#include "src/cpp/ripple/CallRPC.cpp"
+#include "paths/ripple_PathState.cpp"
-#include "src/cpp/ripple/ripple_PathState.cpp"
+#include "rpc/CallRPC.cpp"
 
-#include "src/cpp/ripple/ParameterTable.cpp"
+#include "main/ParameterTable.cpp"
-#include "src/cpp/ripple/PeerDoor.cpp"
+#include "peers/PeerDoor.cpp"
-#include "src/cpp/ripple/ripple_RippleLineCache.cpp"
+#include "paths/ripple_RippleLineCache.cpp"
-#include "src/cpp/ripple/rpc.cpp"
+#include "rpc/rpc.cpp"
-#include "src/cpp/ripple/RPCErr.cpp"
+#include "rpc/RPCErr.cpp"
-#include "src/cpp/ripple/RPCSub.cpp"
+#include "rpc/RPCSub.cpp"
 #include "ledger/SerializedValidation.cpp"
-#include "src/cpp/ripple/Transaction.cpp"
+#include "tx/Transaction.cpp"
-#include "src/cpp/ripple/TransactionEngine.cpp"
+#include "tx/TransactionEngine.cpp"
-#include "src/cpp/ripple/TransactionMeta.cpp"
+#include "tx/TransactionMeta.cpp"
-#include "src/cpp/ripple/Transactor.cpp"
+#include "tx/Transactor.cpp"
-#include "src/cpp/ripple/WSConnection.cpp"
+#include "network/WSConnection.cpp"
-#include "src/cpp/ripple/WSDoor.cpp"
+#include "network/WSDoor.cpp"
 
 #endif
 
@@ -334,18 +334,18 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 4
 
-#include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
+#include "peers/ripple_UniqueNodeList.cpp"
 #include "ledger/ripple_InboundLedger.cpp"
 
-#include "src/cpp/ripple/PaymentTransactor.cpp"
+#include "tx/PaymentTransactor.cpp"
-#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
+#include "tx/RegularKeySetTransactor.cpp"
-#include "src/cpp/ripple/ripple_RippleState.cpp"
+#include "paths/ripple_RippleState.cpp"
-#include "src/cpp/ripple/RPCDoor.cpp"
+#include "rpc/RPCDoor.cpp"
-#include "src/cpp/ripple/TransactionCheck.cpp"
+#include "tx/TransactionCheck.cpp"
-#include "src/cpp/ripple/TransactionMaster.cpp"
+#include "tx/TransactionMaster.cpp"
-#include "src/cpp/ripple/TransactionQueue.cpp"
+#include "tx/TransactionQueue.cpp"
-#include "src/cpp/ripple/TrustSetTransactor.cpp"
+#include "tx/TrustSetTransactor.cpp"
-#include "src/cpp/ripple/ripple_WSHandler.cpp"
+#include "network/ripple_WSHandler.cpp"
 
 #endif
 
@@ -353,14 +353,14 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 5
 
-#include "src/cpp/ripple/ripple_Peer.cpp"
+#include "peers/ripple_Peer.cpp"
-#include "src/cpp/ripple/ripple_Application.cpp"
+#include "main/ripple_Application.cpp"
-#include "src/cpp/ripple/OfferCreateTransactor.cpp"
+#include "tx/OfferCreateTransactor.cpp"
-#include "src/cpp/ripple/ripple_Validations.cpp"
+#include "misc/ripple_Validations.cpp"
 
-#include "src/cpp/ripple/WalletAddTransactor.cpp"
+#include "tx/WalletAddTransactor.cpp"
 #include "ledger/ripple_AcceptedLedgerTx.cpp"
-#include "src/cpp/ripple/ripple_FeeVote.cpp"
+#include "misc/ripple_FeeVote.cpp"
 #include "ledger/LedgerTiming.cpp"
 
 #endif
@@ -370,15 +370,15 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 6
 
 #include "ledger/ripple_LedgerEntrySet.cpp"
-#include "src/cpp/ripple/ripple_Pathfinder.cpp"
+#include "paths/ripple_Pathfinder.cpp"
-#include "src/cpp/ripple/ripple_Features.cpp"
+#include "misc/ripple_Features.cpp"
 
-#include "src/cpp/ripple/ripple_LocalCredentials.cpp"
+#include "main/ripple_LocalCredentials.cpp"
 #include "ledger/ripple_AcceptedLedger.cpp"
-#include "src/cpp/ripple/ripple_DisputedTx.cpp"
+#include "consensus/ripple_DisputedTx.cpp"
-#include "src/cpp/ripple/ripple_HashRouter.cpp"
+#include "misc/ripple_HashRouter.cpp"
-#include "src/cpp/ripple/ripple_Main.cpp"
+#include "main/ripple_Main.cpp"
-#include "src/cpp/ripple/ripple_Offer.cpp"
+#include "misc/ripple_Offer.cpp"
 
 #endif
 
@@ -386,14 +386,14 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 7
 
-#include "src/cpp/ripple/NetworkOPs.cpp"
+#include "misc/NetworkOPs.cpp"
-#include "src/cpp/ripple/ripple_Peers.cpp"
+#include "peers/ripple_Peers.cpp"
 
 #include "ledger/ripple_InboundLedgers.cpp"
 #include "ledger/ripple_LedgerHistory.cpp"
-#include "src/cpp/ripple/ripple_PathRequest.cpp"
+#include "paths/ripple_PathRequest.cpp"
-#include "src/cpp/ripple/ripple_SerializedLedger.cpp"
+#include "misc/ripple_SerializedLedger.cpp"
-#include "src/cpp/ripple/ripple_TransactionAcquire.cpp"
+#include "tx/ripple_TransactionAcquire.cpp"
 
 #endif
 
@@ -401,18 +401,17 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 8
 
-#include "src/cpp/ripple/ripple_LedgerConsensus.cpp"
+#include "consensus/ripple_LedgerConsensus.cpp"
 #include "ledger/LedgerMaster.cpp"
+#include "peers/ripple_PeerSet.cpp"
+#include "misc/ripple_InfoSub.cpp"
+#include "misc/ripple_OrderBook.cpp"
+#include "misc/ripple_ProofOfWork.cpp"
+#include "misc/ripple_ProofOfWorkFactory.h" // private
+#include "misc/ripple_ProofOfWorkFactory.cpp" // requires ProofOfWork.cpp for ProofOfWork::sMaxDifficulty
+#include "misc/ripple_SerializedTransaction.cpp"
 
-#include "src/cpp/ripple/ripple_InfoSub.cpp"
+#include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application
-#include "src/cpp/ripple/ripple_OrderBook.cpp"
-#include "src/cpp/ripple/ripple_PeerSet.cpp"
-#include "src/cpp/ripple/ripple_ProofOfWork.cpp"
-#include "src/cpp/ripple/ripple_ProofOfWorkFactory.h" // private
-#include "src/cpp/ripple/ripple_ProofOfWorkFactory.cpp" // requires ProofOfWork.cpp for ProofOfWork::sMaxDifficulty
-#include "src/cpp/ripple/ripple_SerializedTransaction.cpp"
-
-#include "src/cpp/ripple/ripple_SHAMapSyncFilters.cpp" // requires Application
 
 #endif
 
@@ -431,9 +430,9 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 // VFALCO TODO Eliminate the need for boost for unit tests.
 //
 #include "ledger/LedgerUnitTests.cpp"
-#include "src/cpp/ripple/ripple_SHAMapUnitTests.cpp"
+#include "shamap/ripple_SHAMapUnitTests.cpp"
-#include "src/cpp/ripple/ripple_SHAMapSyncUnitTests.cpp"
+#include "shamap/ripple_SHAMapSyncUnitTests.cpp"
-#include "src/cpp/ripple/ripple_SerializedTransactionUnitTests.cpp"
+#include "misc/ripple_SerializedTransactionUnitTests.cpp"
 
 //------------------------------------------------------------------------------