diff --git a/RippleD.props b/RippleD.props
index f98064815..17597548c 100644
--- a/RippleD.props
+++ b/RippleD.props
@@ -16,6 +16,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp
index d314a8066..e7cce570a 100644
--- a/modules/ripple_ledger/ripple_ledger.cpp
+++ b/modules/ripple_ledger/ripple_ledger.cpp
@@ -22,88 +22,4 @@
     @ingroup ripple_ledger
 */
 
-// VFALCO: TODO, fix these warnings!
-#ifdef _MSC_VER
-//#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
-#pragma warning (disable: 4018) // signed/unsigned mismatch
-#pragma warning (disable: 4244) // conversion, possible loss of data
-#endif
-
-
-
 #include "ripple_ledger.h"
-
-//------------------------------------------------------------------------------
-
-// main
-#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
-#include "src/cpp/ripple/Application.cpp"
-#include "src/cpp/ripple/LoadManager.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/AccountState.cpp" // no log
-#include "src/cpp/ripple/FeatureTable.cpp"
-#include "src/cpp/ripple/Ledger.cpp"
-#include "src/cpp/ripple/LedgerAcquire.cpp"
-#include "src/cpp/ripple/LedgerConsensus.cpp"
-#include "src/cpp/ripple/LedgerEntrySet.cpp"
-#include "src/cpp/ripple/LedgerFormats.cpp" // no log
-#include "src/cpp/ripple/LedgerHistory.cpp" // no log
-#include "src/cpp/ripple/LedgerMaster.cpp"
-#include "src/cpp/ripple/LedgerProposal.cpp" // no log
-#include "src/cpp/ripple/LedgerTiming.cpp"
-#include "src/cpp/ripple/NicknameState.cpp" // no log
-#include "src/cpp/ripple/Offer.cpp" // no log
-#include "src/cpp/ripple/OrderBook.cpp" // no log
-#include "src/cpp/ripple/OrderBookDB.cpp"
-#include "src/cpp/ripple/Pathfinder.cpp"
-#include "src/cpp/ripple/PFRequest.cpp"
-#include "src/cpp/ripple/RippleCalc.cpp"
-#include "src/cpp/ripple/RippleState.cpp" // no log
-
-// serialization
-#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/Transaction.cpp"
-#include "src/cpp/ripple/TransactionAcquire.cpp"
-#include "src/cpp/ripple/TransactionCheck.cpp"
-#include "src/cpp/ripple/TransactionEngine.cpp"
-#include "src/cpp/ripple/TransactionErr.cpp" // no log
-#include "src/cpp/ripple/TransactionFormats.cpp" // no log
-#include "src/cpp/ripple/TransactionMaster.cpp" // no log
-#include "src/cpp/ripple/TransactionMeta.cpp"
-#include "src/cpp/ripple/TransactionQueue.cpp" // no log
-#include "src/cpp/ripple/Transactor.cpp"
-#include "src/cpp/ripple/TrustSetTransactor.cpp"
-#include "src/cpp/ripple/Wallet.cpp"
-#include "src/cpp/ripple/WalletAddTransactor.cpp"
-
-// Implementation of interfaces
-
-#include "src/cpp/ripple/ripple_FeeVote.cpp"
-#include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
-#include "src/cpp/ripple/ripple_Validations.cpp"
-
-#ifdef _MSC_VER
-//#pragma warning (pop)
-#endif
diff --git a/modules/ripple_ledger/ripple_ledger.h b/modules/ripple_ledger/ripple_ledger.h
index 42ca20451..2328f1c4a 100644
--- a/modules/ripple_ledger/ripple_ledger.h
+++ b/modules/ripple_ledger/ripple_ledger.h
@@ -36,96 +36,4 @@
 
 #include "../ripple_data/ripple_data.h"
 
-//#define WIN32_LEAN_AND_MEAN 
-
-#include <algorithm>
-#include <cassert>
-#include <fstream>
-#include <iostream>
-#include <openssl/ec.h>
-#include <openssl/ripemd.h>
-#include <openssl/sha.h>
-#include <string>
-#include <vector>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/pointer_cast.hpp>
-#include <boost/ref.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/thread.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-#include <boost/unordered_set.hpp>
-
-#include "src/cpp/database/SqliteDatabase.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/Application.h"
-#include "src/cpp/ripple/CanonicalTXSet.h"
-#include "src/cpp/ripple/ChangeTransactor.h"
-#include "src/cpp/ripple/Config.h"
-#include "src/cpp/ripple/HashPrefixes.h"
-#include "src/cpp/ripple/Ledger.h"
-#include "src/cpp/ripple/LedgerAcquire.h"
-#include "src/cpp/ripple/LedgerConsensus.h"
-#include "src/cpp/ripple/LedgerEntrySet.h"
-#include "src/cpp/ripple/LedgerFormats.h"
-#include "src/cpp/ripple/LedgerHistory.h"
-#include "src/cpp/ripple/LedgerMaster.h"
-#include "src/cpp/ripple/LedgerProposal.h"
-#include "src/cpp/ripple/LedgerTiming.h"
-#include "src/cpp/ripple/NetworkOPs.h"
-#include "src/cpp/ripple/NicknameState.h"
-#include "src/cpp/ripple/Offer.h"
-#include "src/cpp/ripple/OfferCancelTransactor.h"
-#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/RegularKeySetTransactor.h"
-#include "src/cpp/ripple/RippleCalc.h"
-#include "src/cpp/ripple/RippleState.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"
-#include "src/cpp/ripple/TransactionFormats.h"
-#include "src/cpp/ripple/TransactionMaster.h"
-#include "src/cpp/ripple/TransactionMeta.h"
-#include "src/cpp/ripple/TransactionQueue.h"
-#include "src/cpp/ripple/Transactor.h"
-#include "src/cpp/ripple/TrustSetTransactor.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"
-
-
-// New abstract interfaces
-#include "src/cpp/ripple/ripple_IFeatures.h"
-#include "src/cpp/ripple/ripple_IFeeVote.h"
-#include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
-#include "src/cpp/ripple/ripple_IValidations.h"
-#include "src/cpp/ripple/FeatureTable.h"
-
 #endif
diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp
index 5bda2a5e6..790b13496 100644
--- a/modules/ripple_main/ripple_main.cpp
+++ b/modules/ripple_main/ripple_main.cpp
@@ -22,9 +22,34 @@
     @ingroup ripple_main
 */
 
-#include "ripple_main.h"
+//------------------------------------------------------------------------------
 
-#include "../ripple_data/ripple_data.h"
+#include <algorithm>
+#include <cassert>
+#include <fstream>
+#include <iostream>
+#include <openssl/ec.h>
+#include <openssl/ripemd.h>
+#include <openssl/sha.h>
+#include <string>
+#include <vector>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/pointer_cast.hpp>
+#include <boost/ref.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/thread.hpp>
+#include <boost/tuple/tuple_comparison.hpp>
+#include <boost/unordered_set.hpp>
+
+//------------------------------------------------------------------------------
 
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
@@ -34,16 +59,204 @@
 #pragma warning (disable: 4535) // call requires /EHa
 #endif
 
-#include "src/cpp/ripple/Application.h" // VFALCO: TODO Remove this dependency
+//------------------------------------------------------------------------------
 
+#include "ripple_main.h"
+
+#include "../ripple_data/ripple_data.h"
+
+#include "src/cpp/database/SqliteDatabase.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/Application.h"
+#include "src/cpp/ripple/CanonicalTXSet.h"
+#include "src/cpp/ripple/ChangeTransactor.h"
+#include "src/cpp/ripple/Config.h"
+#include "src/cpp/ripple/HashPrefixes.h"
+#include "src/cpp/ripple/Ledger.h"
+#include "src/cpp/ripple/LedgerAcquire.h"
+#include "src/cpp/ripple/LedgerConsensus.h"
+#include "src/cpp/ripple/LedgerEntrySet.h"
+#include "src/cpp/ripple/LedgerFormats.h"
+#include "src/cpp/ripple/LedgerHistory.h"
+#include "src/cpp/ripple/LedgerMaster.h"
+#include "src/cpp/ripple/LedgerProposal.h"
+#include "src/cpp/ripple/LedgerTiming.h"
+#include "src/cpp/ripple/NetworkOPs.h"
+#include "src/cpp/ripple/NicknameState.h"
+#include "src/cpp/ripple/Offer.h"
+#include "src/cpp/ripple/OfferCancelTransactor.h"
+#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/RegularKeySetTransactor.h"
+#include "src/cpp/ripple/RippleCalc.h"
+#include "src/cpp/ripple/RippleState.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"
+#include "src/cpp/ripple/TransactionFormats.h"
+#include "src/cpp/ripple/TransactionMaster.h"
+#include "src/cpp/ripple/TransactionMeta.h"
+#include "src/cpp/ripple/TransactionQueue.h"
+#include "src/cpp/ripple/Transactor.h"
+#include "src/cpp/ripple/TrustSetTransactor.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_ILoadFeeTrack.h"
+#include "src/cpp/ripple/ripple_IValidations.h"
+#include "src/cpp/ripple/FeatureTable.h"
+
+//------------------------------------------------------------------------------
+
+// VFALCO: TODO, figure out who needs these and move to a sensible private header.
+static const uint64 tenTo14 = 100000000000000ull;
+static const uint64 tenTo14m1 = tenTo14 - 1;
+static const uint64 tenTo17 = tenTo14 * 1000;
+static const uint64 tenTo17m1 = tenTo17 - 1;
+
+// This is for PeerDoor and WSDoor
+// Generate DH for SSL connection.
+static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
+{
+// VFALCO: TODO, eliminate this horrendous dependency on theApp and Wallet
+	return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024();
+}
+
+//------------------------------------------------------------------------------
+
+// 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"
 
-#include "misc/ripple_HashValue.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/AccountState.cpp" // no log
+#include "src/cpp/ripple/FeatureTable.cpp"
+#include "src/cpp/ripple/Ledger.cpp"
+#include "src/cpp/ripple/LedgerAcquire.cpp"
+#include "src/cpp/ripple/LedgerConsensus.cpp"
+#include "src/cpp/ripple/LedgerEntrySet.cpp"
+#include "src/cpp/ripple/LedgerFormats.cpp" // no log
+#include "src/cpp/ripple/LedgerHistory.cpp" // no log
+#include "src/cpp/ripple/LedgerMaster.cpp"
+#include "src/cpp/ripple/LedgerProposal.cpp" // no log
+#include "src/cpp/ripple/LedgerTiming.cpp"
+#include "src/cpp/ripple/NicknameState.cpp" // no log
+#include "src/cpp/ripple/Offer.cpp" // no log
+#include "src/cpp/ripple/OrderBook.cpp" // no log
+#include "src/cpp/ripple/OrderBookDB.cpp"
+#include "src/cpp/ripple/Pathfinder.cpp"
+#include "src/cpp/ripple/PFRequest.cpp"
+#include "src/cpp/ripple/RippleCalc.cpp"
+#include "src/cpp/ripple/RippleState.cpp" // no log
+
+// serialization
+#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/Transaction.cpp"
+#include "src/cpp/ripple/TransactionAcquire.cpp"
+#include "src/cpp/ripple/TransactionCheck.cpp"
+#include "src/cpp/ripple/TransactionEngine.cpp"
+#include "src/cpp/ripple/TransactionErr.cpp" // no log
+#include "src/cpp/ripple/TransactionFormats.cpp" // no log
+#include "src/cpp/ripple/TransactionMaster.cpp" // no log
+#include "src/cpp/ripple/TransactionMeta.cpp"
+#include "src/cpp/ripple/TransactionQueue.cpp" // no log
+#include "src/cpp/ripple/Transactor.cpp"
+#include "src/cpp/ripple/TrustSetTransactor.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/Suppression.cpp" // no log
+#include "src/cpp/ripple/UniqueNodeList.cpp"
+#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"
+
+//------------------------------------------------------------------------------
+
+// Implementation of interfaces
+
+#include "src/cpp/ripple/ripple_FeeVote.cpp"
+#include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
+#include "src/cpp/ripple/ripple_Validations.cpp"
+
+//------------------------------------------------------------------------------
 
 #ifdef _MSC_VER
 //#pragma warning (pop)
 #endif
+
diff --git a/modules/ripple_mess/ripple_mess.cpp b/modules/ripple_mess/ripple_mess.cpp
index c7e116255..2d4611bb3 100644
--- a/modules/ripple_mess/ripple_mess.cpp
+++ b/modules/ripple_mess/ripple_mess.cpp
@@ -23,33 +23,3 @@
 */
 
 #include "ripple_mess.h"
-
-#include "../ripple_data/ripple_data.h"
-
-static const uint64 tenTo14 = 100000000000000ull;
-static const uint64 tenTo14m1 = tenTo14 - 1;
-static const uint64 tenTo17 = tenTo14 * 1000;
-static const uint64 tenTo17m1 = tenTo17 - 1;
-
-// VFALCO: TODO, fix these warnings!
-#ifdef _MSC_VER
-//#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
-#pragma warning (disable: 4018) // signed/unsigned mismatch
-#pragma warning (disable: 4244) // conversion, possible loss of data
-#endif
-
-#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"
-#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"
-
-#ifdef _MSC_VER
-//#pragma warning (pop)
-#endif
diff --git a/modules/ripple_net/ripple_net.cpp b/modules/ripple_net/ripple_net.cpp
index 289e4865a..f3c2956de 100644
--- a/modules/ripple_net/ripple_net.cpp
+++ b/modules/ripple_net/ripple_net.cpp
@@ -23,43 +23,3 @@
 */
 
 #include "ripple_net.h"
-
-#include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
-
-#include "../ripple_data/ripple_data.h"
-#include "../ripple_ledger/ripple_ledger.h"
-
-// VFALCO: TODO, fix these warnings!
-#ifdef _MSC_VER
-//#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
-#pragma warning (disable: 4018) // signed/unsigned mismatch
-#pragma warning (disable: 4244) // conversion, possible loss of data
-#pragma warning (disable: 4309) // truncation of constant value
-#endif
-
-#include "src/cpp/ripple/Application.h"
-
-// This is for PeerDoor and WSDoor
-// Generate DH for SSL connection.
-static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
-{
-// VFALCO: TODO, eliminate this horrendous dependency on theApp and Wallet
-	return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024();
-}
-
-#include "src/cpp/ripple/Suppression.cpp" // no log
-#include "src/cpp/ripple/UniqueNodeList.cpp"
-
-#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 "sockets/ripple_LogWebsockets.cpp"
-
-#ifdef _MSC_VER
-//#pragma warning (pop)
-#endif
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 96794c7b8..4e7b98b44 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -328,12 +328,6 @@
     <ClCompile Include="modules\ripple_main\ripple_main.cpp" />
     <ClCompile Include="modules\ripple_mess\ripple_mess.cpp" />
     <ClCompile Include="modules\ripple_net\ripple_net.cpp" />
-    <ClCompile Include="modules\ripple_net\sockets\ripple_LogWebsockets.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\database\database.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -992,6 +986,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ripple_LogWebsockets.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_Validations.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 27861eec7..f9fc360cf 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -55,27 +55,9 @@
     <Filter Include="1. Modules\ripple_db">
       <UniqueIdentifier>{a5190241-c5bc-4e23-8ef1-6adf757c75e3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_ledger">
-      <UniqueIdentifier>{b6175f9a-7d46-4b57-877f-f58b0b3bba89}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_ledger\transactions">
-      <UniqueIdentifier>{1d36a65a-de7c-41f9-85dd-93b29d67606e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_ledger\contracts">
-      <UniqueIdentifier>{c7f863ce-204b-4a15-b236-24fe1e3430e5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_ledger\serialization">
-      <UniqueIdentifier>{4b5cbcb4-5525-4ac8-83b7-32bfb0a0b5bf}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_main">
       <UniqueIdentifier>{1a379c07-ccf1-4636-8018-2cfc0685edf0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_net">
-      <UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_ledger\processing">
-      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_client\rpc">
       <UniqueIdentifier>{3f351c55-360d-40bc-a136-4944ce572efd}</UniqueIdentifier>
     </Filter>
@@ -85,18 +67,6 @@
     <Filter Include="1. Modules\ripple_client\http">
       <UniqueIdentifier>{29cd2103-d553-4d82-9e6a-224e3b1cb667}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_net\sockets">
-      <UniqueIdentifier>{afd09812-59e2-45e2-bf7f-d561b23d7da2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_mess">
-      <UniqueIdentifier>{becffa9b-61f7-42d4-815a-1ec822cad0e7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_mess\containers">
-      <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_mess\types">
-      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_basics\containers">
       <UniqueIdentifier>{96cbc9ff-0118-4844-bb4c-05aef58a60b5}</UniqueIdentifier>
     </Filter>
@@ -115,30 +85,57 @@
     <Filter Include="1. Modules\ripple_basics\types">
       <UniqueIdentifier>{0d38ac4f-f094-4b17-9f4c-ac4011ea3bca}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_net\_unsorted">
-      <UniqueIdentifier>{b78453cf-8932-43ad-9312-09e5a8ca3375}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_data">
       <UniqueIdentifier>{8d0241d2-071c-4d6c-a15e-980cc51b26ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="1. Modules\ripple_data\crypto">
       <UniqueIdentifier>{095d33d8-dbf7-44d0-a675-6722b02bb3be}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main\_old">
-      <UniqueIdentifier>{ed7b05c1-13c1-417c-a0c7-fb93a8edc5c9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\misc">
-      <UniqueIdentifier>{a624c4e9-2c7b-4b98-9dff-f57d876999f0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_data\types">
       <UniqueIdentifier>{2f3572a9-2882-4656-ab93-82b7761c9e3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="1. Modules\ripple_data\protobuf">
       <UniqueIdentifier>{9f8ed40a-9f16-42fe-82fd-caf72d3d6a2b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_ledger\main">
+    <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="3. Empty">
+      <UniqueIdentifier>{786657f9-b1b3-483c-a8e6-863cc2e02eb8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="3. Empty\ripple_ledger">
+      <UniqueIdentifier>{b6175f9a-7d46-4b57-877f-f58b0b3bba89}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="3. Empty\ripple_mess">
+      <UniqueIdentifier>{becffa9b-61f7-42d4-815a-1ec822cad0e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="3. Empty\ripple_net">
+      <UniqueIdentifier>{7f76ce57-c428-487e-97a0-979c0990a81d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -415,154 +412,154 @@
       <Filter>0. Third Party Code\websocket</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Transaction.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionAcquire.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionCheck.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionErr.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionMaster.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionMeta.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionQueue.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Transactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OfferCreateTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OfferCancelTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RegularKeySetTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PaymentTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Operation.cpp">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Contract.cpp">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedLedger.cpp">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedObject.cpp">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedTransaction.cpp">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedTypes.cpp">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Amount.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PackedMessage.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParameterTable.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParseSection.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ProofOfWork.cpp">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
       <Filter>1. Modules\ripple_basics</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
-      <Filter>1. Modules\ripple_ledger</Filter>
+      <Filter>3. Empty\ripple_ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AcceptedLedger.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AccountItems.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AccountState.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\FeatureTable.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Ledger.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Offer.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OrderBook.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RippleState.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\CallRPC.cpp">
       <Filter>1. Modules\ripple_client\rpc</Filter>
@@ -586,10 +583,10 @@
       <Filter>1. Modules\ripple_client</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ChangeTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\CanonicalTXSet.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCServer.cpp">
       <Filter>1. Modules\ripple_client\rpc</Filter>
@@ -606,18 +603,6 @@
     <ClCompile Include="src\cpp\database\SqliteDatabase.cpp">
       <Filter>1. Modules\ripple_db\storage</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Config.cpp">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\JobQueue.cpp">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\LoadMonitor.cpp">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\main.cpp">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_main\ripple_main.cpp">
       <Filter>1. Modules\ripple_main</Filter>
     </ClCompile>
@@ -628,46 +613,43 @@
       <Filter>1. Modules\ripple_client\http</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_net\ripple_net.cpp">
-      <Filter>1. Modules\ripple_net</Filter>
+      <Filter>3. Empty\ripple_net</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Interpreter.cpp">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ScriptData.cpp">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Wallet.cpp">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
-      <Filter>1. Modules\ripple_mess\containers</Filter>
+      <Filter>1. Modules\ripple_main\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
-      <Filter>1. Modules\ripple_mess\containers</Filter>
+      <Filter>1. Modules\ripple_main\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
-      <Filter>1. Modules\ripple_mess\containers</Filter>
+      <Filter>1. Modules\ripple_main\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
-      <Filter>1. Modules\ripple_mess\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
-      <Filter>1. Modules\ripple_main\_old</Filter>
+      <Filter>1. Modules\ripple_main\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PFRequest.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_mess\ripple_mess.cpp">
-      <Filter>1. Modules\ripple_mess</Filter>
+      <Filter>3. Empty\ripple_mess</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_json\json\json_reader.cpp">
       <Filter>1. Modules\ripple_json\json</Filter>
@@ -711,33 +693,6 @@
     <ClCompile Include="modules\ripple_basics\utility\ripple_DiffieHellmanUtil.cpp">
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_net\sockets\ripple_LogWebsockets.cpp">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Peer.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Suppression.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_data\ripple_data.cpp">
       <Filter>1. Modules\ripple_data</Filter>
     </ClCompile>
@@ -781,22 +736,64 @@
       <Filter>1. Modules\ripple_data\protobuf</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_FeeVote.cpp">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Application.cpp">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LoadFeeTrack.cpp">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LoadManager.cpp">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_DatabaseCon.cpp">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Validations.cpp">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Config.cpp">
+      <Filter>1. Modules\ripple_main\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>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\main.cpp">
+      <Filter>1. Modules\ripple_main\main</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
+      <Filter>1. Modules\ripple_main\main</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Peer.cpp">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Suppression.cpp">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp">
+      <Filter>1. Modules\ripple_main\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>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1071,145 +1068,145 @@
       <Filter>0. Third Party Code\protobuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Transaction.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionEngine.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionErr.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionFormats.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionMaster.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionMeta.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionQueue.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Transactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TrustSetTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OfferCreateTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OfferCancelTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RegularKeySetTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PaymentTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AccountSetTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Operation.h">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Contract.h">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedLedger.h">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedObject.h">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedTransaction.h">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedTypes.h">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedValidation.h">
-      <Filter>1. Modules\ripple_ledger\serialization</Filter>
+      <Filter>1. Modules\ripple_main\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HashedObject.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HashPrefixes.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PackedMessage.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParameterTable.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParseSection.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ProofOfWork.h">
-      <Filter>1. Modules\ripple_mess\types</Filter>
+      <Filter>1. Modules\ripple_main\types</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\ripple_basics.h">
       <Filter>1. Modules\ripple_basics</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
-      <Filter>1. Modules\ripple_ledger</Filter>
+      <Filter>3. Empty\ripple_ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AcceptedLedger.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AccountItems.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AccountState.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\FeatureTable.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Ledger.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerAcquire.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerConsensus.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerFormats.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerHistory.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerMaster.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerProposal.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerTiming.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Offer.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OrderBook.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OrderBookDB.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RippleCalc.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RippleState.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSHandler.h">
       <Filter>1. Modules\ripple_client\rpc</Filter>
@@ -1236,10 +1233,10 @@
       <Filter>1. Modules\ripple_client</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ChangeTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\CanonicalTXSet.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCServer.h">
       <Filter>1. Modules\ripple_client\rpc</Filter>
@@ -1253,15 +1250,6 @@
     <ClInclude Include="src\cpp\database\SqliteDatabase.h">
       <Filter>1. Modules\ripple_db\storage</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Config.h">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\JobQueue.h">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\LoadMonitor.h">
-      <Filter>1. Modules\ripple_main\_old</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_main\ripple_main.h">
       <Filter>1. Modules\ripple_main</Filter>
     </ClInclude>
@@ -1272,43 +1260,37 @@
       <Filter>1. Modules\ripple_client\http</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_net\ripple_net.h">
-      <Filter>1. Modules\ripple_net</Filter>
+      <Filter>3. Empty\ripple_net</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Interpreter.h">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ScriptData.h">
-      <Filter>1. Modules\ripple_ledger\contracts</Filter>
+      <Filter>1. Modules\ripple_main\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Wallet.h">
-      <Filter>1. Modules\ripple_ledger\transactions</Filter>
+      <Filter>1. Modules\ripple_main\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\NicknameState.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SHAMap.h">
-      <Filter>1. Modules\ripple_mess\containers</Filter>
+      <Filter>1. Modules\ripple_main\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SHAMapSync.h">
-      <Filter>1. Modules\ripple_mess\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Version.h">
-      <Filter>1. Modules\ripple_main\_old</Filter>
+      <Filter>1. Modules\ripple_main\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PFRequest.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Pathfinder.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\NetworkStatus.h">
-      <Filter>1. Modules\ripple_main\_old</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_mess\ripple_mess.h">
-      <Filter>1. Modules\ripple_mess</Filter>
+      <Filter>3. Empty\ripple_mess</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\containers\ripple_KeyCache.h">
       <Filter>1. Modules\ripple_basics\containers</Filter>
@@ -1388,36 +1370,6 @@
     <ClInclude Include="modules\ripple_basics\types\ripple_UInt256.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\WSDoor.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\AutoSocket.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ConnectionPool.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\NetworkOPs.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Peer.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\PeerDoor.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\WSConnection.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Suppression.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\SNTPClient.h">
-      <Filter>1. Modules\ripple_net\_unsorted</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_basics\utility\ripple_HashUtilities.h">
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
@@ -1464,25 +1416,70 @@
       <Filter>1. Modules\ripple_data\protobuf</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IFeatures.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IFeeVote.h">
-      <Filter>1. Modules\ripple_ledger\processing</Filter>
+      <Filter>1. Modules\ripple_main\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Application.h">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_ILoadFeeTrack.h">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LoadManager.h">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_DatabaseCon.h">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IValidations.h">
-      <Filter>1. Modules\ripple_ledger\main</Filter>
+      <Filter>1. Modules\ripple_main\main</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Config.h">
+      <Filter>1. Modules\ripple_main\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>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\NetworkStatus.h">
+      <Filter>1. Modules\ripple_main\main</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Version.h">
+      <Filter>1. Modules\ripple_main\main</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\WSDoor.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\AutoSocket.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ConnectionPool.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\NetworkOPs.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Peer.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\PeerDoor.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\SNTPClient.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Suppression.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\WSConnection.h">
+      <Filter>1. Modules\ripple_main\sockets</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/cpp/ripple/HashedObject.h b/src/cpp/ripple/HashedObject.h
index 25c05aeba..cf8957d26 100644
--- a/src/cpp/ripple/HashedObject.h
+++ b/src/cpp/ripple/HashedObject.h
@@ -6,7 +6,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
 
-#include "modules/ripple_main/misc/ripple_HashValue.h"
+#include "ripple_HashValue.h"
 
 
 // VFALCO: TODO, Move this to someplace sensible!!
diff --git a/modules/ripple_main/misc/ripple_HashValue.cpp b/src/cpp/ripple/ripple_HashValue.cpp
similarity index 100%
rename from modules/ripple_main/misc/ripple_HashValue.cpp
rename to src/cpp/ripple/ripple_HashValue.cpp
diff --git a/modules/ripple_main/misc/ripple_HashValue.h b/src/cpp/ripple/ripple_HashValue.h
similarity index 100%
rename from modules/ripple_main/misc/ripple_HashValue.h
rename to src/cpp/ripple/ripple_HashValue.h
diff --git a/modules/ripple_net/sockets/ripple_LogWebsockets.cpp b/src/cpp/ripple/ripple_LogWebsockets.cpp
similarity index 100%
rename from modules/ripple_net/sockets/ripple_LogWebsockets.cpp
rename to src/cpp/ripple/ripple_LogWebsockets.cpp