From 045c3cc01fbadb729d786caef92cfb8a36cefeea Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Mon, 3 Jun 2013 17:38:28 -0700
Subject: [PATCH] Reorganize all includes in ripple_main.cpp

---
 .../containers/ripple_RangeSet.h              |   1 +
 modules/ripple_data/ripple_data.h             |   2 +
 modules/ripple_main/ripple_main.cpp           | 211 +++---
 newcoin.vcxproj                               |  18 +-
 newcoin.vcxproj.filters                       | 697 +++++++++---------
 src/cpp/database/SqliteDatabase.cpp           |   2 -
 src/cpp/ripple/Application.h                  |   1 -
 src/cpp/ripple/JobQueue.cpp                   |   1 -
 src/cpp/ripple/JobQueue.h                     |  29 +-
 src/cpp/ripple/Ledger.h                       |   2 -
 src/cpp/ripple/LedgerConsensus.h              |   1 -
 src/cpp/ripple/NetworkOPs.h                   |   1 -
 src/cpp/ripple/Peer.h                         |   1 -
 src/cpp/ripple/SerializedTypes.h              |  10 +-
 src/cpp/ripple/WSConnection.h                 |   5 +
 src/cpp/ripple/ripple_HashValue.cpp           |  17 -
 src/cpp/ripple/ripple_HashValue.h             |  17 -
 src/cpp/ripple/ripple_IValidations.h          |   7 -
 ...LoadMonitor.cpp => ripple_LoadMonitor.cpp} |   5 +-
 .../{LoadMonitor.h => ripple_LoadMonitor.h}   |  10 +-
 20 files changed, 503 insertions(+), 535 deletions(-)
 rename src/cpp/ripple/{LoadMonitor.cpp => ripple_LoadMonitor.cpp} (98%)
 rename src/cpp/ripple/{LoadMonitor.h => ripple_LoadMonitor.h} (84%)

diff --git a/modules/ripple_basics/containers/ripple_RangeSet.h b/modules/ripple_basics/containers/ripple_RangeSet.h
index 53708ff05c..4047ffe251 100644
--- a/modules/ripple_basics/containers/ripple_RangeSet.h
+++ b/modules/ripple_basics/containers/ripple_RangeSet.h
@@ -94,6 +94,7 @@ template<typename T> T range_check_max(const T& value, const T& maximum)
 }
 */
 
+// VFALCO: TODO, these parameters should not be const references.
 template<typename T, typename U> T range_check_cast(const U& value, const T& minimum, const T& maximum)
 {
 	if ((value < minimum) || (value > maximum))
diff --git a/modules/ripple_data/ripple_data.h b/modules/ripple_data/ripple_data.h
index 4da2610bcd..83628e92a9 100644
--- a/modules/ripple_data/ripple_data.h
+++ b/modules/ripple_data/ripple_data.h
@@ -68,6 +68,8 @@
 #include "types/ripple_RippleAddress.h"
 #include "types/ripple_Serializer.h" // needs CKey
 
+#include "src/cpp/ripple/SerializedTypes.h"
+
 // VFALCO: TODO, resolve the location of this file
 #include "ripple.pb.h"
 
diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp
index 3be9a6177e..600245a803 100644
--- a/modules/ripple_main/ripple_main.cpp
+++ b/modules/ripple_main/ripple_main.cpp
@@ -39,6 +39,7 @@
 #include <openssl/sha.h>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
@@ -50,6 +51,7 @@
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
+#include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/unordered_set.hpp>
@@ -57,6 +59,8 @@
 
 //------------------------------------------------------------------------------
 
+//------------------------------------------------------------------------------
+
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -66,25 +70,65 @@
 #pragma warning (disable: 4535) // call requires /EHa
 #endif
 
-//------------------------------------------------------------------------------
-
+// VFALCO: NOTE, these includes generate warnings, unfortunately.
 #include "ripple_main.h"
-
 #include "../ripple_data/ripple_data.h"
 
+//------------------------------------------------------------------------------
+
+// Order and position matter here
+#include "src/cpp/ripple/Ledger.h"
+#include "src/cpp/ripple/SerializedValidation.h"
 #include "src/cpp/database/SqliteDatabase.h"
 
+//------------------------------------------------------------------------------
+//
+// VFALCO: BEGIN CLEAN AREA
+
+#include "src/cpp/ripple/ripple_DatabaseCon.h"
+#include "src/cpp/ripple/ripple_HashValue.h"
 #include "src/cpp/ripple/ripple_LoadEvent.h"
+#include "src/cpp/ripple/ripple_LoadMonitor.h"
+
+#include "src/cpp/ripple/ripple_IFeatures.h"
+#include "src/cpp/ripple/ripple_IFeeVote.h"
+#include "src/cpp/ripple/ripple_IHashRouter.h"
+#include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
+#include "src/cpp/ripple/ripple_IUniqueNodeList.h"
+#include "src/cpp/ripple/ripple_IValidations.h"
+
+// VFALCO: END CLEAN AREA
+//
+//------------------------------------------------------------------------------
+
+
+
+
+// VFALCO: NOTE, Order matters! If you get compile errors, move just 1
+//               include upwards as little as possible to fix it.
+//            
+#include "src/cpp/ripple/ScriptData.h"
+#include "src/cpp/ripple/Contract.h"
+#include "src/cpp/ripple/Interpreter.h"
+#include "src/cpp/ripple/Operation.h"
 
 #include "src/cpp/ripple/AcceptedLedger.h"
 #include "src/cpp/ripple/AccountItems.h"
 #include "src/cpp/ripple/AccountSetTransactor.h"
 #include "src/cpp/ripple/AccountState.h"
+#include "src/cpp/ripple/JobQueue.h"
 #include "src/cpp/ripple/Application.h"
+#include "src/cpp/ripple/AutoSocket.h"
+#include "src/cpp/ripple/CallRPC.h"
 #include "src/cpp/ripple/CanonicalTXSet.h"
 #include "src/cpp/ripple/ChangeTransactor.h"
 #include "src/cpp/ripple/Config.h"
+#include "src/cpp/ripple/ConnectionPool.h"
+#include "src/cpp/ripple/FeatureTable.h"
+#include "src/cpp/ripple/HTTPRequest.h"
 #include "src/cpp/ripple/HashPrefixes.h"
+#include "src/cpp/ripple/HashedObject.h"
+#include "src/cpp/ripple/HttpsClient.h"
 #include "src/cpp/ripple/Ledger.h"
 #include "src/cpp/ripple/LedgerAcquire.h"
 #include "src/cpp/ripple/LedgerConsensus.h"
@@ -94,6 +138,7 @@
 #include "src/cpp/ripple/LedgerMaster.h"
 #include "src/cpp/ripple/LedgerProposal.h"
 #include "src/cpp/ripple/LedgerTiming.h"
+#include "src/cpp/ripple/LoadManager.h"
 #include "src/cpp/ripple/NetworkOPs.h"
 #include "src/cpp/ripple/NicknameState.h"
 #include "src/cpp/ripple/Offer.h"
@@ -101,18 +146,32 @@
 #include "src/cpp/ripple/OfferCreateTransactor.h"
 #include "src/cpp/ripple/OrderBook.h"
 #include "src/cpp/ripple/OrderBookDB.h"
-#include "src/cpp/ripple/PackedMessage.h"
-#include "src/cpp/ripple/PaymentTransactor.h"
 #include "src/cpp/ripple/PFRequest.h"
+#include "src/cpp/ripple/PackedMessage.h"
+#include "src/cpp/ripple/ParameterTable.h"
+#include "src/cpp/ripple/ParseSection.h"
+#include "src/cpp/ripple/Pathfinder.h"
+#include "src/cpp/ripple/PaymentTransactor.h"
+#include "src/cpp/ripple/Peer.h"
+#include "src/cpp/ripple/PeerDoor.h"
+#include "src/cpp/ripple/ProofOfWork.h"
+#include "src/cpp/ripple/RPC.h"
+#include "src/cpp/ripple/RPCDoor.h"
+#include "src/cpp/ripple/RPCErr.h"
+#include "src/cpp/ripple/RPCHandler.h"
+#include "src/cpp/ripple/RPCServer.h"
+#include "src/cpp/ripple/RPCSub.h"
 #include "src/cpp/ripple/RegularKeySetTransactor.h"
 #include "src/cpp/ripple/RippleCalc.h"
 #include "src/cpp/ripple/RippleState.h"
+#include "src/cpp/ripple/SHAMap.h"
+#include "src/cpp/ripple/SHAMapSync.h"
+#include "src/cpp/ripple/SNTPClient.h"
 #include "src/cpp/ripple/SerializedLedger.h"
 #include "src/cpp/ripple/SerializedObject.h"
 #include "src/cpp/ripple/SerializedTransaction.h"
 #include "src/cpp/ripple/SerializedTypes.h"
 #include "src/cpp/ripple/SerializedValidation.h"
-#include "src/cpp/ripple/SHAMapSync.h"
 #include "src/cpp/ripple/Transaction.h"
 #include "src/cpp/ripple/TransactionEngine.h"
 #include "src/cpp/ripple/TransactionErr.h"
@@ -122,25 +181,15 @@
 #include "src/cpp/ripple/TransactionQueue.h"
 #include "src/cpp/ripple/Transactor.h"
 #include "src/cpp/ripple/TrustSetTransactor.h"
+#include "src/cpp/ripple/Version.h"
+#include "src/cpp/ripple/WSConnection.h"
+#include "src/cpp/ripple/WSDoor.h"
+#include "src/cpp/ripple/WSHandler.h"
 #include "src/cpp/ripple/Wallet.h"
 #include "src/cpp/ripple/WalletAddTransactor.h"
 
-// contract stuff, order matters
-#include "src/cpp/ripple/ScriptData.h"
-#include "src/cpp/ripple/Contract.h"
-#include "src/cpp/ripple/Interpreter.h"
-#include "src/cpp/ripple/Operation.h"
-
 #include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
 
-// New abstract interfaces
-#include "src/cpp/ripple/ripple_IFeatures.h"
-#include "src/cpp/ripple/ripple_IFeeVote.h"
-#include "src/cpp/ripple/ripple_IHashRouter.h"
-#include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
-#include "src/cpp/ripple/ripple_IValidations.h"
-#include "src/cpp/ripple/ripple_IUniqueNodeList.h"
-
 //------------------------------------------------------------------------------
 
 // VFALCO: TODO, figure out who needs these and move to a sensible private header.
@@ -159,31 +208,27 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 
 //------------------------------------------------------------------------------
 
-// main
-#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
-#include "src/cpp/ripple/Application.cpp"
-#include "src/cpp/ripple/LoadManager.cpp"
-#include "src/cpp/ripple/Config.cpp" // no log
-#include "src/cpp/ripple/JobQueue.cpp"
-#include "src/cpp/ripple/LoadMonitor.cpp"
-#include "src/cpp/ripple/UpdateTables.cpp"
-#include "src/cpp/ripple/main.cpp"
-
-// storage
 #include "src/cpp/database/database.cpp"
 #include "src/cpp/database/SqliteDatabase.cpp"
-#include "src/cpp/ripple/DBInit.cpp"
-
-// contracts
-#include "src/cpp/ripple/Contract.cpp" // no log
-#include "src/cpp/ripple/Interpreter.cpp" // no log
-#include "src/cpp/ripple/ScriptData.cpp" // no log
-#include "src/cpp/ripple/Operation.cpp" // no log
-
-// processing
 #include "src/cpp/ripple/AcceptedLedger.cpp" // no log
 #include "src/cpp/ripple/AccountItems.cpp" // no log
+#include "src/cpp/ripple/AccountSetTransactor.cpp"
 #include "src/cpp/ripple/AccountState.cpp" // no log
+#include "src/cpp/ripple/Amount.cpp"
+#include "src/cpp/ripple/AmountRound.cpp"
+#include "src/cpp/ripple/Application.cpp"
+#include "src/cpp/ripple/CallRPC.cpp"
+#include "src/cpp/ripple/CanonicalTXSet.cpp"
+#include "src/cpp/ripple/ChangeTransactor.cpp" // no log
+#include "src/cpp/ripple/Config.cpp" // no log
+#include "src/cpp/ripple/ConnectionPool.cpp"
+#include "src/cpp/ripple/Contract.cpp" // no log
+#include "src/cpp/ripple/DBInit.cpp"
+#include "src/cpp/ripple/HashedObject.cpp"
+#include "src/cpp/ripple/HTTPRequest.cpp"
+#include "src/cpp/ripple/HttpsClient.cpp"
+#include "src/cpp/ripple/Interpreter.cpp" // no log
+#include "src/cpp/ripple/JobQueue.cpp"
 #include "src/cpp/ripple/Ledger.cpp"
 #include "src/cpp/ripple/LedgerAcquire.cpp"
 #include "src/cpp/ripple/LedgerConsensus.cpp"
@@ -193,30 +238,45 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/LedgerMaster.cpp"
 #include "src/cpp/ripple/LedgerProposal.cpp" // no log
 #include "src/cpp/ripple/LedgerTiming.cpp"
+#include "src/cpp/ripple/LoadManager.cpp"
+#include "src/cpp/ripple/main.cpp"
+#include "src/cpp/ripple/NetworkOPs.cpp"
 #include "src/cpp/ripple/NicknameState.cpp" // no log
 #include "src/cpp/ripple/Offer.cpp" // no log
+#include "src/cpp/ripple/OfferCancelTransactor.cpp"
+#include "src/cpp/ripple/OfferCreateTransactor.cpp"
+#include "src/cpp/ripple/Operation.cpp" // no log
 #include "src/cpp/ripple/OrderBook.cpp" // no log
 #include "src/cpp/ripple/OrderBookDB.cpp"
+#include "src/cpp/ripple/PackedMessage.cpp" // no log
+#include "src/cpp/ripple/ParameterTable.cpp" // no log
+#include "src/cpp/ripple/ParseSection.cpp"
 #include "src/cpp/ripple/Pathfinder.cpp"
+#include "src/cpp/ripple/PaymentTransactor.cpp"
+#include "src/cpp/ripple/Peer.cpp"
+#include "src/cpp/ripple/PeerDoor.cpp"
 #include "src/cpp/ripple/PFRequest.cpp"
+#include "src/cpp/ripple/ProofOfWork.cpp"
+#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
 #include "src/cpp/ripple/RippleCalc.cpp"
 #include "src/cpp/ripple/RippleState.cpp" // no log
-
-// serialization
+#include "src/cpp/ripple/rpc.cpp"
+#include "src/cpp/ripple/RPCDoor.cpp"
+#include "src/cpp/ripple/RPCErr.cpp"
+#include "src/cpp/ripple/RPCHandler.cpp"
+#include "src/cpp/ripple/RPCServer.cpp"
+#include "src/cpp/ripple/RPCSub.cpp"
+#include "src/cpp/ripple/ScriptData.cpp" // no log
 #include "src/cpp/ripple/SerializedLedger.cpp"
 #include "src/cpp/ripple/SerializedObject.cpp"
 #include "src/cpp/ripple/SerializedTransaction.cpp"
 #include "src/cpp/ripple/SerializedTypes.cpp"
 #include "src/cpp/ripple/SerializedValidation.cpp"
-
-// transactions
-#include "src/cpp/ripple/AccountSetTransactor.cpp"
-#include "src/cpp/ripple/ChangeTransactor.cpp" // no log
-#include "src/cpp/ripple/CanonicalTXSet.cpp"
-#include "src/cpp/ripple/OfferCancelTransactor.cpp"
-#include "src/cpp/ripple/OfferCreateTransactor.cpp"
-#include "src/cpp/ripple/PaymentTransactor.cpp"
-#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
+#include "src/cpp/ripple/SHAMap.cpp"
+#include "src/cpp/ripple/SHAMapDiff.cpp" // no log
+#include "src/cpp/ripple/SHAMapNodes.cpp" // no log
+#include "src/cpp/ripple/SHAMapSync.cpp"
+#include "src/cpp/ripple/SNTPClient.cpp"
 #include "src/cpp/ripple/Transaction.cpp"
 #include "src/cpp/ripple/TransactionAcquire.cpp"
 #include "src/cpp/ripple/TransactionCheck.cpp"
@@ -228,60 +288,23 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/TransactionQueue.cpp" // no log
 #include "src/cpp/ripple/Transactor.cpp"
 #include "src/cpp/ripple/TrustSetTransactor.cpp"
+#include "src/cpp/ripple/UpdateTables.cpp"
 #include "src/cpp/ripple/Wallet.cpp"
 #include "src/cpp/ripple/WalletAddTransactor.cpp"
-
-// types
-#include "src/cpp/ripple/Amount.cpp"
-#include "src/cpp/ripple/AmountRound.cpp"
-#include "src/cpp/ripple/HashedObject.cpp"
-#include "src/cpp/ripple/PackedMessage.cpp" // no log
-#include "src/cpp/ripple/ParameterTable.cpp" // no log
-#include "src/cpp/ripple/ParseSection.cpp"
-#include "src/cpp/ripple/ProofOfWork.cpp"
-
-// containers
-#include "src/cpp/ripple/SHAMap.cpp"
-#include "src/cpp/ripple/SHAMapDiff.cpp" // no log
-#include "src/cpp/ripple/SHAMapNodes.cpp" // no log
-#include "src/cpp/ripple/SHAMapSync.cpp"
-
-// misc
-#include "src/cpp/ripple/ripple_HashValue.cpp"
-
-// sockets
-#include "src/cpp/ripple/SNTPClient.cpp"
-#include "src/cpp/ripple/ConnectionPool.cpp"
-#include "src/cpp/ripple/NetworkOPs.cpp"
-#include "src/cpp/ripple/Peer.cpp"
-#include "src/cpp/ripple/PeerDoor.cpp"
 #include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h 
-#include "src/cpp/ripple/ripple_LogWebsockets.cpp"
-
-// http
-#include "src/cpp/ripple/HTTPRequest.cpp"
-#include "src/cpp/ripple/HttpsClient.cpp"
-
-// rpc
-#include "src/cpp/ripple/CallRPC.cpp"
-#include "src/cpp/ripple/rpc.cpp"
-#include "src/cpp/ripple/RPCDoor.cpp"
-#include "src/cpp/ripple/RPCErr.cpp"
-#include "src/cpp/ripple/RPCHandler.cpp"
-#include "src/cpp/ripple/RPCServer.cpp"
-#include "src/cpp/ripple/RPCSub.cpp"
 
 //------------------------------------------------------------------------------
 
 // Refactored sources
 
-#include "src/cpp/ripple/ripple_LoadEvent.cpp"
-
-// Implementation of interfaces
-
+#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
 #include "src/cpp/ripple/ripple_Features.cpp"
 #include "src/cpp/ripple/ripple_FeeVote.cpp"
 #include "src/cpp/ripple/ripple_HashRouter.cpp"
+#include "src/cpp/ripple/ripple_HashValue.cpp"
+#include "src/cpp/ripple/ripple_LoadEvent.cpp"
+#include "src/cpp/ripple/ripple_LoadMonitor.cpp"
+#include "src/cpp/ripple/ripple_LogWebsockets.cpp"
 #include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
 #include "src/cpp/ripple/ripple_Validations.cpp"
 #include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 876a33910c..844e8b1fa2 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -319,12 +319,6 @@
     </ClCompile>
     <ClCompile Include="modules\ripple_json\ripple_json.cpp" />
     <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" />
-    <ClCompile Include="modules\ripple_main\misc\ripple_HashValue.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="modules\ripple_main\ripple_main.cpp" />
     <ClCompile Include="modules\ripple_mess\ripple_mess.cpp" />
     <ClCompile Include="modules\ripple_net\ripple_net.cpp" />
@@ -832,7 +826,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LoadMonitor.cpp">
+    <ClCompile Include="src\cpp\ripple\ripple_HashValue.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_LoadMonitor.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1294,7 +1294,6 @@
     <ClInclude Include="modules\ripple_json\json\json_writer.h" />
     <ClInclude Include="modules\ripple_json\ripple_json.h" />
     <ClInclude Include="modules\ripple_ledger\ripple_ledger.h" />
-    <ClInclude Include="modules\ripple_main\misc\ripple_HashValue.h" />
     <ClInclude Include="modules\ripple_main\ripple_main.h" />
     <ClInclude Include="modules\ripple_mess\ripple_mess.h" />
     <ClInclude Include="modules\ripple_net\ripple_net.h" />
@@ -1636,7 +1635,8 @@
     <ClInclude Include="src\cpp\ripple\LedgerProposal.h" />
     <ClInclude Include="src\cpp\ripple\LedgerTiming.h" />
     <ClInclude Include="src\cpp\ripple\LoadManager.h" />
-    <ClInclude Include="src\cpp\ripple\LoadMonitor.h" />
+    <ClInclude Include="src\cpp\ripple\ripple_HashValue.h" />
+    <ClInclude Include="src\cpp\ripple\ripple_LoadMonitor.h" />
     <ClInclude Include="src\cpp\ripple\NetworkOPs.h" />
     <ClInclude Include="src\cpp\ripple\NicknameState.h" />
     <ClInclude Include="src\cpp\ripple\Offer.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 869166ac41..d9d45cee7a 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -85,33 +85,6 @@
     <Filter Include="1. Modules\ripple_data\protobuf">
       <UniqueIdentifier>{9f8ed40a-9f16-42fe-82fd-caf72d3d6a2b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main\containers">
-      <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\contracts">
-      <UniqueIdentifier>{c7f863ce-204b-4a15-b236-24fe1e3430e5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\main">
-      <UniqueIdentifier>{1ccfc5ad-5cd7-4a8e-b305-08f663c2397c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\misc">
-      <UniqueIdentifier>{a624c4e9-2c7b-4b98-9dff-f57d876999f0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\sockets">
-      <UniqueIdentifier>{78b0aa30-f238-4e41-821f-ce84dde82ceb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\processing">
-      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\serialization">
-      <UniqueIdentifier>{4b5cbcb4-5525-4ac8-83b7-32bfb0a0b5bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\transactions">
-      <UniqueIdentifier>{1d36a65a-de7c-41f9-85dd-93b29d67606e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\types">
-      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="2. Empty">
       <UniqueIdentifier>{786657f9-b1b3-483c-a8e6-863cc2e02eb8}</UniqueIdentifier>
     </Filter>
@@ -124,21 +97,51 @@
     <Filter Include="2. Empty\ripple_net">
       <UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main\rpc">
-      <UniqueIdentifier>{3f351c55-360d-40bc-a136-4944ce572efd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\http">
-      <UniqueIdentifier>{29cd2103-d553-4d82-9e6a-224e3b1cb667}</UniqueIdentifier>
-    </Filter>
     <Filter Include="2. Empty\ripple_client">
       <UniqueIdentifier>{97c96b68-70fd-4679-89fc-c1c8c87c265e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main\storage">
-      <UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="2. Empty\ripple_db">
       <UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored">
+      <UniqueIdentifier>{86d0831e-74e5-443b-b5f9-d6b39d5b4c97}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\refactored">
+      <UniqueIdentifier>{bfd76b72-9979-469b-8fd1-834e0622728a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\contracts">
+      <UniqueIdentifier>{c7f863ce-204b-4a15-b236-24fe1e3430e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\processing">
+      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\rpc">
+      <UniqueIdentifier>{3f351c55-360d-40bc-a136-4944ce572efd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\serialization">
+      <UniqueIdentifier>{4b5cbcb4-5525-4ac8-83b7-32bfb0a0b5bf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\sockets">
+      <UniqueIdentifier>{78b0aa30-f238-4e41-821f-ce84dde82ceb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\storage">
+      <UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\transactions">
+      <UniqueIdentifier>{1d36a65a-de7c-41f9-85dd-93b29d67606e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\types">
+      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\http">
+      <UniqueIdentifier>{29cd2103-d553-4d82-9e6a-224e3b1cb667}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\main">
+      <UniqueIdentifier>{1ccfc5ad-5cd7-4a8e-b305-08f663c2397c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\containers">
+      <UniqueIdentifier>{6a33d317-620f-4cf0-88a9-2d943b4c00a1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -415,94 +418,94 @@
       <Filter>0. Third Party Code\websocket</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Transaction.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionAcquire.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionCheck.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionErr.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionMaster.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionMeta.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionQueue.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Transactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OfferCreateTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OfferCancelTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RegularKeySetTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PaymentTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Operation.cpp">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Contract.cpp">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedLedger.cpp">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedObject.cpp">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedTransaction.cpp">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedTypes.cpp">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Amount.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PackedMessage.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParameterTable.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParseSection.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ProofOfWork.cpp">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
       <Filter>1. Modules\ripple_basics</Filter>
@@ -510,143 +513,71 @@
     <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
       <Filter>2. Empty\ripple_ledger</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\AcceptedLedger.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\AccountItems.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\AccountState.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Ledger.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Offer.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\OrderBook.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\RippleState.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\CallRPC.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\rpc.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCDoor.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCErr.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCHandler.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCSub.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_client\ripple_client.cpp">
       <Filter>2. Empty\ripple_client</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ChangeTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\CanonicalTXSet.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCServer.cpp">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_db\ripple_db.cpp">
       <Filter>2. Empty\ripple_db</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\database\database.cpp">
-      <Filter>1. Modules\ripple_main\storage</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\storage</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\DBInit.cpp">
-      <Filter>1. Modules\ripple_main\storage</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\storage</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\database\SqliteDatabase.cpp">
-      <Filter>1. Modules\ripple_main\storage</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\storage</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_main\ripple_main.cpp">
       <Filter>1. Modules\ripple_main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HttpsClient.cpp">
-      <Filter>1. Modules\ripple_main\http</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\http</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
-      <Filter>1. Modules\ripple_main\http</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\http</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_net\ripple_net.cpp">
       <Filter>2. Empty\ripple_net</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Interpreter.cpp">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ScriptData.cpp">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Wallet.cpp">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
-      <Filter>1. Modules\ripple_main\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
-      <Filter>1. Modules\ripple_main\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
-      <Filter>1. Modules\ripple_main\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
-      <Filter>1. Modules\ripple_main\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\PFRequest.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_mess\ripple_mess.cpp">
       <Filter>2. Empty\ripple_mess</Filter>
@@ -696,9 +627,6 @@
     <ClCompile Include="modules\ripple_data\ripple_data.cpp">
       <Filter>1. Modules\ripple_data</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_main\misc\ripple_HashValue.cpp">
-      <Filter>1. Modules\ripple_main\misc</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_data\crypto\ripple_CBigNum.cpp">
       <Filter>1. Modules\ripple_data\crypto</Filter>
     </ClCompile>
@@ -735,74 +663,149 @@
     <ClCompile Include="build\proto\ripple.pb.cc">
       <Filter>1. Modules\ripple_data\protobuf</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_FeeVote.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\Application.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_LoadFeeTrack.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LoadManager.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_DatabaseCon.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_Validations.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Config.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\JobQueue.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LoadMonitor.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\main.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Peer.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_LogWebsockets.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClCompile>
     <ClCompile Include="Subtrees\beast\modules\beast_core\beast_core.cpp">
       <Filter>0. Third Party Code\beast</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_UniqueNodeList.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+    <ClCompile Include="src\cpp\ripple\ripple_LoadMonitor.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_HashRouter.cpp">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple_Features.cpp">
-      <Filter>1. Modules\ripple_main\processing</Filter>
+    <ClCompile Include="src\cpp\ripple\ripple_DatabaseCon.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LoadEvent.cpp">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_LoadFeeTrack.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_Validations.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_Features.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_FeeVote.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_HashRouter.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_LogWebsockets.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_UniqueNodeList.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\AcceptedLedger.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\AccountItems.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\AccountState.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Ledger.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Offer.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\OrderBook.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PFRequest.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RippleState.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
+      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_HashValue.cpp">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1077,85 +1080,85 @@
       <Filter>0. Third Party Code\protobuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Transaction.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionEngine.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionErr.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionFormats.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionMaster.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionMeta.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionQueue.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Transactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TrustSetTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OfferCreateTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OfferCancelTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RegularKeySetTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PaymentTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AccountSetTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Operation.h">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Contract.h">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedLedger.h">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedObject.h">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedTransaction.h">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedTypes.h">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedValidation.h">
-      <Filter>1. Modules\ripple_main\serialization</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HashedObject.h">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HashPrefixes.h">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PackedMessage.h">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParameterTable.h">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParseSection.h">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ProofOfWork.h">
-      <Filter>1. Modules\ripple_main\types</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\ripple_basics.h">
       <Filter>1. Modules\ripple_basics</Filter>
@@ -1163,137 +1166,71 @@
     <ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
       <Filter>2. Empty\ripple_ledger</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\AcceptedLedger.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\AccountItems.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\AccountState.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Ledger.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerAcquire.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerConsensus.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerFormats.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerHistory.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerMaster.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerProposal.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LedgerTiming.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Offer.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\OrderBook.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\OrderBookDB.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\RippleCalc.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\RippleState.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSHandler.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\CallRPC.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPC.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCDoor.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCErr.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCHandler.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCSub.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_client\ripple_client.h">
       <Filter>2. Empty\ripple_client</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ChangeTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\CanonicalTXSet.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCServer.h">
-      <Filter>1. Modules\ripple_main\rpc</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_db\ripple_db.h">
       <Filter>2. Empty\ripple_db</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\database\database.h">
-      <Filter>1. Modules\ripple_main\storage</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\storage</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\database\SqliteDatabase.h">
-      <Filter>1. Modules\ripple_main\storage</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\storage</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_main\ripple_main.h">
       <Filter>1. Modules\ripple_main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HttpsClient.h">
-      <Filter>1. Modules\ripple_main\http</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\http</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HTTPRequest.h">
-      <Filter>1. Modules\ripple_main\http</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\http</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_net\ripple_net.h">
       <Filter>2. Empty\ripple_net</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Interpreter.h">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ScriptData.h">
-      <Filter>1. Modules\ripple_main\contracts</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Wallet.h">
-      <Filter>1. Modules\ripple_main\transactions</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\NicknameState.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\SHAMap.h">
-      <Filter>1. Modules\ripple_main\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\SHAMapSync.h">
-      <Filter>1. Modules\ripple_main\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\PFRequest.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Pathfinder.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_mess\ripple_mess.h">
       <Filter>2. Empty\ripple_mess</Filter>
@@ -1382,9 +1319,6 @@
     <ClInclude Include="modules\ripple_data\ripple_data.h">
       <Filter>1. Modules\ripple_data</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_main\misc\ripple_HashValue.h">
-      <Filter>1. Modules\ripple_main\misc</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_data\crypto\ripple_CBigNum.h">
       <Filter>1. Modules\ripple_data\crypto</Filter>
     </ClInclude>
@@ -1421,71 +1355,140 @@
     <ClInclude Include="build\proto\ripple.pb.h">
       <Filter>1. Modules\ripple_data\protobuf</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_IFeatures.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_IFeeVote.h">
-      <Filter>1. Modules\ripple_main\processing</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\Application.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_ILoadFeeTrack.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LoadManager.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_DatabaseCon.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_IValidations.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Config.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\JobQueue.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LoadMonitor.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Version.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSDoor.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AutoSocket.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ConnectionPool.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\NetworkOPs.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Peer.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PeerDoor.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SNTPClient.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSConnection.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\sockets</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_IUniqueNodeList.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+    <ClInclude Include="src\cpp\ripple\ripple_LoadMonitor.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple_IHashRouter.h">
-      <Filter>1. Modules\ripple_main\sockets</Filter>
+    <ClInclude Include="src\cpp\ripple\ripple_DatabaseCon.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_ILoadFeeTrack.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_IValidations.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LoadEvent.h">
-      <Filter>1. Modules\ripple_main\main</Filter>
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_IFeatures.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_IFeeVote.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_IHashRouter.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_IUniqueNodeList.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\AcceptedLedger.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\AccountItems.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\AccountState.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Ledger.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerAcquire.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerConsensus.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerFormats.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerHistory.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerMaster.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerProposal.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\LedgerTiming.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\NicknameState.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Offer.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\OrderBook.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\OrderBookDB.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Pathfinder.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\PFRequest.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\RippleCalc.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\RippleState.h">
+      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\SHAMap.h">
+      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\SHAMapSync.h">
+      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ripple_HashValue.h">
+      <Filter>1. Modules\ripple_main\refactored</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/cpp/database/SqliteDatabase.cpp b/src/cpp/database/SqliteDatabase.cpp
index 2d83738076..08756639b6 100644
--- a/src/cpp/database/SqliteDatabase.cpp
+++ b/src/cpp/database/SqliteDatabase.cpp
@@ -9,8 +9,6 @@
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 
-#include "../ripple/JobQueue.h"
-
 SETUP_LOG (SqliteDatabase)
 
 using namespace std;
diff --git a/src/cpp/ripple/Application.h b/src/cpp/ripple/Application.h
index 3d1121e214..3255799e01 100644
--- a/src/cpp/ripple/Application.h
+++ b/src/cpp/ripple/Application.h
@@ -16,7 +16,6 @@
 #include "NetworkOPs.h"
 #include "WSDoor.h"
 #include "SNTPClient.h"
-#include "JobQueue.h"
 #include "RPCHandler.h"
 #include "ProofOfWork.h"
 #include "LoadManager.h"
diff --git a/src/cpp/ripple/JobQueue.cpp b/src/cpp/ripple/JobQueue.cpp
index 7fd6cbfb64..0d43ddeb1e 100644
--- a/src/cpp/ripple/JobQueue.cpp
+++ b/src/cpp/ripple/JobQueue.cpp
@@ -1,4 +1,3 @@
-#include "JobQueue.h"
 
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
diff --git a/src/cpp/ripple/JobQueue.h b/src/cpp/ripple/JobQueue.h
index 9c20376c7b..8819a52bc1 100644
--- a/src/cpp/ripple/JobQueue.h
+++ b/src/cpp/ripple/JobQueue.h
@@ -1,26 +1,11 @@
 #ifndef JOB_QUEUE__H
 #define JOB_QUEUE__H
 
-#include <map>
-#include <set>
-#include <vector>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/asio.hpp>
-#include <boost/ref.hpp>
-
-// VFALCO: Does this belong here?
-#include "ripple_LoadEvent.h"
-
-#include "LoadMonitor.h"
-
 // Note that this queue should only be used for CPU-bound jobs
 // It is primarily intended for signature checking
-
 enum JobType
-{ // must be in priority order, low to high
+{
+    // must be in priority order, low to high
 	jtINVALID		= -1,
 	jtPACK			= 1,	// Make a fetch pack for a peer
 	jtPUBOLDLEDGER	= 2,	// An old ledger has been accepted
@@ -50,7 +35,9 @@ enum JobType
 	jtHO_READ		= 30,
 	jtHO_WRITE		= 31,
 }; // CAUTION: If you add new types, add them to JobType.cpp too
-#define NUM_JOB_TYPES 48
+
+// VFALCO: TODO, move this into the enum so it calculates itself?
+#define NUM_JOB_TYPES 48 // why 48 and not 32?
 
 class Job
 {
@@ -77,7 +64,7 @@ public:
 	bool operator<=(const Job& j) const;
 	bool operator>=(const Job& j) const;
 
-	static const char* toString(JobType);
+	static const char* toString (JobType);
 
 protected:
 	JobType						mType;
@@ -123,8 +110,8 @@ private:
 	boost::condition_variable		mJobCond;
 
 	uint64							mLastJob;
-	std::set<Job>					mJobSet;
-	LoadMonitor						mJobLoads[NUM_JOB_TYPES];
+	std::set <Job>					mJobSet;
+	LoadMonitor						mJobLoads [NUM_JOB_TYPES];
 	int								mThreadCount;
 	bool							mShuttingDown;
 
diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h
index 510f927b2e..307d4d51f9 100644
--- a/src/cpp/ripple/Ledger.h
+++ b/src/cpp/ripple/Ledger.h
@@ -14,8 +14,6 @@
 #include "AccountState.h"
 #include "NicknameState.h"
 #include "SHAMap.h"
-#include "LoadMonitor.h"
-#include "JobQueue.h"
 
 enum LedgerStateParms
 {
diff --git a/src/cpp/ripple/LedgerConsensus.h b/src/cpp/ripple/LedgerConsensus.h
index c1d8acd4c6..4e9a3e5be8 100644
--- a/src/cpp/ripple/LedgerConsensus.h
+++ b/src/cpp/ripple/LedgerConsensus.h
@@ -14,7 +14,6 @@
 #include "Peer.h"
 #include "CanonicalTXSet.h"
 #include "TransactionEngine.h"
-#include "LoadMonitor.h"
 
 DEFINE_INSTANCE(LedgerConsensus);
 DEFINE_INSTANCE(TransactionAcquire);
diff --git a/src/cpp/ripple/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h
index ea08c23879..7f86233038 100644
--- a/src/cpp/ripple/NetworkOPs.h
+++ b/src/cpp/ripple/NetworkOPs.h
@@ -13,7 +13,6 @@
 #include "SerializedValidation.h"
 #include "LedgerAcquire.h"
 #include "LedgerProposal.h"
-#include "JobQueue.h"
 #include "AcceptedLedger.h"
 
 // Operations that clients may wish to perform against the network
diff --git a/src/cpp/ripple/Peer.h b/src/cpp/ripple/Peer.h
index 180b2c8422..f5f2846e6e 100644
--- a/src/cpp/ripple/Peer.h
+++ b/src/cpp/ripple/Peer.h
@@ -11,7 +11,6 @@
 #include "PackedMessage.h"
 #include "Ledger.h"
 #include "Transaction.h"
-#include "JobQueue.h"
 #include "ProofOfWork.h"
 #include "LoadManager.h"
 
diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h
index d66be3ab1b..f88636ee92 100644
--- a/src/cpp/ripple/SerializedTypes.h
+++ b/src/cpp/ripple/SerializedTypes.h
@@ -26,10 +26,12 @@ enum PathFlags
 	PF_ISSUE			= 0x80,
 };
 
+// VFALCO: TODO, make these non static or otherwise clean constants.
 static const uint160 u160_zero(0), u160_one(1);
 static inline const uint160& get_u160_zero() { return u160_zero; }
 static inline const uint160& get_u160_one() { return u160_one; }
 
+// VFALCO: TODO, replace these with language constructs, gah!
 #define CURRENCY_XRP		get_u160_zero()
 #define CURRENCY_ONE		get_u160_one()					// Used as a place holder.
 #define CURRENCY_BAD		uint160(0x5852500000000000)		// Do not allow XRP as an IOU currency.
@@ -39,10 +41,11 @@ static inline const uint160& get_u160_one() { return u160_one; }
 class SerializedType
 {
 public:
-
 	SerializedType() : fName(&sfGeneric) { ; }
-	SerializedType(SField::ref n) : fName(&n) { assert(fName); }
-	virtual ~SerializedType() { ; }
+	
+    explicit SerializedType (SField::ref n) : fName(&n) { assert(fName); }
+
+    virtual ~SerializedType() { }
 
 	static UPTR_T<SerializedType> deserialize(SField::ref name)
 	{ return UPTR_T<SerializedType>(new SerializedType(name)); }
@@ -472,6 +475,7 @@ private:
 	}
 };
 
+// VFALCO: TODO Make static member accessors for these in STAmount
 extern const STAmount saZero;
 extern const STAmount saOne;
 
diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index 1ec35fad78..b8aa57de21 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/src/cpp/ripple/WSConnection.h
@@ -1,4 +1,7 @@
 
+#ifndef RIPPLE_WSCONNECTION_H
+#define RIPPLE_WSCONNECTION_H
+
 #include "../websocketpp/src/sockets/autotls.hpp"
 #include "../websocketpp/src/websocketpp.hpp"
 
@@ -255,4 +258,6 @@ private:
 	bool								mDead;
 };
 
+#endif
+
 // vim:ts=4
diff --git a/src/cpp/ripple/ripple_HashValue.cpp b/src/cpp/ripple/ripple_HashValue.cpp
index 4f0f1d05a8..fa04fb34cd 100644
--- a/src/cpp/ripple/ripple_HashValue.cpp
+++ b/src/cpp/ripple/ripple_HashValue.cpp
@@ -1,20 +1,3 @@
-//------------------------------------------------------------------------------
-/*
-	Copyright (c) 2011-2013, OpenCoin, 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.
-*/
-//==============================================================================
 
 std::size_t hash_value(const uint256& u)
 {
diff --git a/src/cpp/ripple/ripple_HashValue.h b/src/cpp/ripple/ripple_HashValue.h
index 54b51a48ea..0d4e594488 100644
--- a/src/cpp/ripple/ripple_HashValue.h
+++ b/src/cpp/ripple/ripple_HashValue.h
@@ -1,20 +1,3 @@
-//------------------------------------------------------------------------------
-/*
-	Copyright (c) 2011-2013, OpenCoin, 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_HASH_VALUE_H
 #define RIPPLE_HASH_VALUE_H
diff --git a/src/cpp/ripple/ripple_IValidations.h b/src/cpp/ripple/ripple_IValidations.h
index 02312001c6..c277252bb7 100644
--- a/src/cpp/ripple/ripple_IValidations.h
+++ b/src/cpp/ripple/ripple_IValidations.h
@@ -1,13 +1,6 @@
 #ifndef RIPPLE_IVALIDATIONS_H
 #define RIPPLE_IVALIDATIONS_H
 
-//#include <vector>
-//#include <boost/unordered_map.hpp>
-//#include <boost/thread/mutex.hpp>
-
-//#include "SerializedValidation.h"
-//#include "JobQueue.h"
-
 // VFALCO: TODO rename and move these typedefs into the IValidations interface
 typedef boost::unordered_map<uint160, SerializedValidation::pointer> ValidationSet;
 typedef std::pair<int, uint160> currentValidationCount; // nodes validating and highest node ID validating
diff --git a/src/cpp/ripple/LoadMonitor.cpp b/src/cpp/ripple/ripple_LoadMonitor.cpp
similarity index 98%
rename from src/cpp/ripple/LoadMonitor.cpp
rename to src/cpp/ripple/ripple_LoadMonitor.cpp
index fa85ec6c90..7663c09391 100644
--- a/src/cpp/ripple/LoadMonitor.cpp
+++ b/src/cpp/ripple/ripple_LoadMonitor.cpp
@@ -1,5 +1,3 @@
-#include "LoadMonitor.h"
-
 SETUP_LOG (LoadMonitor)
 
 LoadMonitor::LoadMonitor ()
@@ -48,7 +46,8 @@ void LoadMonitor::update ()
 		mLatencyEvents -= ((mLatencyEvents + 3) / 4);
 		mLatencyMSAvg -= (mLatencyMSAvg / 4);
 		mLatencyMSPeak -= (mLatencyMSPeak / 4);
-	} while (mLastUpdate < now);
+	}
+    while (mLastUpdate < now);
 }
 
 void LoadMonitor::addCount ()
diff --git a/src/cpp/ripple/LoadMonitor.h b/src/cpp/ripple/ripple_LoadMonitor.h
similarity index 84%
rename from src/cpp/ripple/LoadMonitor.h
rename to src/cpp/ripple/ripple_LoadMonitor.h
index e78c6d2702..1abd8a907c 100644
--- a/src/cpp/ripple/LoadMonitor.h
+++ b/src/cpp/ripple/ripple_LoadMonitor.h
@@ -1,11 +1,5 @@
-#ifndef LOADMONITOR__H_
-#define LOADMONITOR__H_
-
-#include <string>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/shared_ptr.hpp>
-
+#ifndef RIPPLE_LOADMONITOR_H
+#define RIPPLE_LOADMONITOR_H
 
 // Monitors load levels and response times