diff --git a/SConstruct b/SConstruct
index abd45d0e2..c456c8870 100644
--- a/SConstruct
+++ b/SConstruct
@@ -103,15 +103,15 @@ COMPILED_FILES = [
     'src/cpp/database/sqlite3.c',
     'src/cpp/leveldb_core.cpp',
     'src/cpp/websocket_core.cpp',
+    'Subtrees/beast/modules/beast_core/beast_core.cpp',
+    'Subtrees/beast/modules/beast_basics/beast_basics.cpp',
     'modules/ripple_basics/ripple_basics.cpp',
     'modules/ripple_data/ripple_data.cpp',
     'modules/ripple_json/ripple_json.cpp',
-    'modules/ripple_main/ripple_main_pt1.cpp',
-    'modules/ripple_main/ripple_main_pt2.cpp',
-    'modules/ripple_main/ripple_main_pt3.cpp',
-    'modules/ripple_main/ripple_main_pt4.cpp',
-    'Subtrees/beast/modules/beast_core/beast_core.cpp',
-    'Subtrees/beast/modules/beast_basics/beast_basics.cpp'
+    'modules/ripple_app/ripple_app_pt1.cpp',
+    'modules/ripple_app/ripple_app_pt2.cpp',
+    'modules/ripple_app/ripple_app_pt3.cpp',
+    'modules/ripple_app/ripple_app_pt4.cpp'
     ]
 
 #-------------------------------------------------------------------------------
diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_app/ripple_app.cpp
similarity index 99%
rename from modules/ripple_main/ripple_main.cpp
rename to modules/ripple_app/ripple_app.cpp
index 70bdde3e4..d6c2ef185 100644
--- a/modules/ripple_main/ripple_main.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -4,10 +4,10 @@
 */
 //==============================================================================
 
-/** Add this to get the @ref ripple_main module.
+/** Add this to get the @ref ripple_app module.
 
-    @file ripple_main.cpp
-    @ingroup ripple_main
+    @file ripple_app.cpp
+    @ingroup ripple_app
 */
 
 //------------------------------------------------------------------------------
@@ -88,7 +88,7 @@
 #endif
 
 // VFALCO NOTE these includes generate warnings, unfortunately.
-#include "ripple_main.h"
+#include "ripple_app.h"
 
 #include "../ripple_data/ripple_data.h"
 
diff --git a/modules/ripple_main/ripple_main.h b/modules/ripple_app/ripple_app.h
similarity index 76%
rename from modules/ripple_main/ripple_main.h
rename to modules/ripple_app/ripple_app.h
index ff56cbed5..15e362a28 100644
--- a/modules/ripple_main/ripple_main.h
+++ b/modules/ripple_app/ripple_app.h
@@ -4,17 +4,17 @@
 */
 //==============================================================================
 
-/** Include this to get the @ref ripple_main module.
+/** Include this to get the @ref ripple_app module.
 
-    @file ripple_main.h
-    @ingroup ripple_main
+    @file ripple_app.h
+    @ingroup ripple_app
 */
 
 /** Core classes.
 
     This module contains the Ripple core instance object and related objects.
 
-    @defgroup ripple_main
+    @defgroup ripple_app
 */
 
 #ifndef RIPPLE_MAIN_H
diff --git a/modules/ripple_main/ripple_main_pt1.cpp b/modules/ripple_app/ripple_app_pt1.cpp
similarity index 89%
rename from modules/ripple_main/ripple_main_pt1.cpp
rename to modules/ripple_app/ripple_app_pt1.cpp
index d6bea4bba..0d37520e2 100644
--- a/modules/ripple_main/ripple_main_pt1.cpp
+++ b/modules/ripple_app/ripple_app_pt1.cpp
@@ -5,4 +5,4 @@
 //==============================================================================
 
 #define RIPPLE_MAIN_PART 1
-#include "ripple_main.cpp"
+#include "ripple_app.cpp"
diff --git a/modules/ripple_main/ripple_main_pt2.cpp b/modules/ripple_app/ripple_app_pt2.cpp
similarity index 89%
rename from modules/ripple_main/ripple_main_pt2.cpp
rename to modules/ripple_app/ripple_app_pt2.cpp
index c0e4ff6f0..d107da43e 100644
--- a/modules/ripple_main/ripple_main_pt2.cpp
+++ b/modules/ripple_app/ripple_app_pt2.cpp
@@ -5,4 +5,4 @@
 //==============================================================================
 
 #define RIPPLE_MAIN_PART 2
-#include "ripple_main.cpp"
+#include "ripple_app.cpp"
diff --git a/modules/ripple_main/ripple_main_pt3.cpp b/modules/ripple_app/ripple_app_pt3.cpp
similarity index 89%
rename from modules/ripple_main/ripple_main_pt3.cpp
rename to modules/ripple_app/ripple_app_pt3.cpp
index ac31a6874..b340c4907 100644
--- a/modules/ripple_main/ripple_main_pt3.cpp
+++ b/modules/ripple_app/ripple_app_pt3.cpp
@@ -5,4 +5,4 @@
 //==============================================================================
 
 #define RIPPLE_MAIN_PART 3
-#include "ripple_main.cpp"
+#include "ripple_app.cpp"
diff --git a/modules/ripple_main/ripple_main_pt4.cpp b/modules/ripple_app/ripple_app_pt4.cpp
similarity index 89%
rename from modules/ripple_main/ripple_main_pt4.cpp
rename to modules/ripple_app/ripple_app_pt4.cpp
index c6b337098..a207b7b27 100644
--- a/modules/ripple_main/ripple_main_pt4.cpp
+++ b/modules/ripple_app/ripple_app_pt4.cpp
@@ -5,4 +5,4 @@
 //==============================================================================
 
 #define RIPPLE_MAIN_PART 4
-#include "ripple_main.cpp"
+#include "ripple_app.cpp"
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 8efaf2dbc..8109f74ee 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -173,6 +173,16 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="modules\ripple_app\ripple_app.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_app\ripple_app_pt1.cpp" />
+    <ClCompile Include="modules\ripple_app\ripple_app_pt2.cpp" />
+    <ClCompile Include="modules\ripple_app\ripple_app_pt3.cpp" />
+    <ClCompile Include="modules\ripple_app\ripple_app_pt4.cpp" />
     <ClCompile Include="modules\ripple_basics\containers\ripple_RangeSet.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -408,16 +418,6 @@
       <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">
-      <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_pt1.cpp" />
-    <ClCompile Include="modules\ripple_main\ripple_main_pt2.cpp" />
-    <ClCompile Include="modules\ripple_main\ripple_main_pt3.cpp" />
-    <ClCompile Include="modules\ripple_main\ripple_main_pt4.cpp" />
     <ClCompile Include="modules\ripple_net\ripple_net.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1397,6 +1397,7 @@
     <ClInclude Include="build\proto\ripple.pb.h" />
     <ClInclude Include="database\sqlite3.h" />
     <ClInclude Include="database\sqlite3ext.h" />
+    <ClInclude Include="modules\ripple_app\ripple_app.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_KeyCache.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_RangeSet.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_SecureAllocator.h" />
@@ -1456,7 +1457,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\ripple_main.h" />
     <ClInclude Include="modules\ripple_net\ripple_net.h" />
     <ClInclude Include="src\cpp\database\database.h" />
     <ClInclude Include="src\cpp\database\SqliteDatabase.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 1ac6c2c4b..bed56010e 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -52,9 +52,6 @@
     <Filter Include="1. Modules\ripple_basics">
       <UniqueIdentifier>{84e43f43-816e-4ccd-80c2-38b322904894}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main">
-      <UniqueIdentifier>{1a379c07-ccf1-4636-8018-2cfc0685edf0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_basics\containers">
       <UniqueIdentifier>{96cbc9ff-0118-4844-bb4c-05aef58a60b5}</UniqueIdentifier>
     </Filter>
@@ -79,60 +76,15 @@
     <Filter Include="1. Modules\ripple_data\crypto">
       <UniqueIdentifier>{095d33d8-dbf7-44d0-a675-6722b02bb3be}</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\rpc">
-      <UniqueIdentifier>{3f351c55-360d-40bc-a136-4944ce572efd}</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\main">
-      <UniqueIdentifier>{1ccfc5ad-5cd7-4a8e-b305-08f663c2397c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\_unfactored\ledger">
-      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\_unfactored\network">
-      <UniqueIdentifier>{78b0aa30-f238-4e41-821f-ce84dde82ceb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\_unfactored\db">
-      <UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_data\protocol">
       <UniqueIdentifier>{2f3572a9-2882-4656-ab93-82b7761c9e3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="1. Modules\ripple_data\utility">
       <UniqueIdentifier>{ba524810-8446-4c50-ad59-d284747ba220}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main\refactored\shamap">
-      <UniqueIdentifier>{5b22fcf9-c9f0-4260-9a17-7b448e30bb57}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_data\utility">
       <UniqueIdentifier>{82b7f371-8bc6-474b-b10c-18c004467b46}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_main\refactored\transactions">
-      <UniqueIdentifier>{babbb25a-e143-4140-bc6f-16b659d8098b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\refactored\consensus">
-      <UniqueIdentifier>{8b88138b-e5bd-492b-bd34-012b9f43e544}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\refactored\pathing">
-      <UniqueIdentifier>{90a5527e-0de0-4d5f-a731-b6b196a013b5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_main\refactored\ledger">
-      <UniqueIdentifier>{857187f0-ff25-4ebe-af30-544b7b7f503a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="2. %28Unused%29">
       <UniqueIdentifier>{786657f9-b1b3-483c-a8e6-863cc2e02eb8}</UniqueIdentifier>
     </Filter>
@@ -148,6 +100,54 @@
     <Filter Include="2. %28Unused%29\ripple_client">
       <UniqueIdentifier>{97c96b68-70fd-4679-89fc-c1c8c87c265e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_app">
+      <UniqueIdentifier>{1a379c07-ccf1-4636-8018-2cfc0685edf0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored">
+      <UniqueIdentifier>{86d0831e-74e5-443b-b5f9-d6b39d5b4c97}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\contracts">
+      <UniqueIdentifier>{c7f863ce-204b-4a15-b236-24fe1e3430e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\rpc">
+      <UniqueIdentifier>{3f351c55-360d-40bc-a136-4944ce572efd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\transactions">
+      <UniqueIdentifier>{1d36a65a-de7c-41f9-85dd-93b29d67606e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\types">
+      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\main">
+      <UniqueIdentifier>{1ccfc5ad-5cd7-4a8e-b305-08f663c2397c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\ledger">
+      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\network">
+      <UniqueIdentifier>{78b0aa30-f238-4e41-821f-ce84dde82ceb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\_unfactored\db">
+      <UniqueIdentifier>{6097a179-ddad-4c69-9a34-2e3fc2c9fa1d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\refactored">
+      <UniqueIdentifier>{bfd76b72-9979-469b-8fd1-834e0622728a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\refactored\shamap">
+      <UniqueIdentifier>{5b22fcf9-c9f0-4260-9a17-7b448e30bb57}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\refactored\transactions">
+      <UniqueIdentifier>{babbb25a-e143-4140-bc6f-16b659d8098b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\refactored\consensus">
+      <UniqueIdentifier>{8b88138b-e5bd-492b-bd34-012b9f43e544}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\refactored\pathing">
+      <UniqueIdentifier>{90a5527e-0de0-4d5f-a731-b6b196a013b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_app\refactored\ledger">
+      <UniqueIdentifier>{857187f0-ff25-4ebe-af30-544b7b7f503a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -424,55 +424,55 @@
       <Filter>0. Third Party Code\websocket</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Transaction.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionCheck.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionMaster.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionMeta.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TransactionQueue.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Transactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OfferCreateTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OfferCancelTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RegularKeySetTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PaymentTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Operation.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Contract.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParameterTable.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParseSection.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\types</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
       <Filter>1. Modules\ripple_basics</Filter>
@@ -484,34 +484,31 @@
       <Filter>2. %28Unused%29\ripple_client</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ChangeTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_db\ripple_db.cpp">
       <Filter>2. %28Unused%29\ripple_db</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\database\database.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\db</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\DBInit.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\db</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\database\SqliteDatabase.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\db</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_main\ripple_main.cpp">
-      <Filter>1. Modules\ripple_main</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_net\ripple_net.cpp">
       <Filter>2. %28Unused%29\ripple_net</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Interpreter.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ScriptData.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_json\json\json_reader.cpp">
       <Filter>1. Modules\ripple_json\json</Filter>
@@ -580,109 +577,109 @@
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\main.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\main</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\main</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</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_LoadMonitor.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_DatabaseCon.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LoadEvent.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LoadFeeTrack.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Validations.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Features.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_FeeVote.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_HashRouter.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LogWebsockets.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_UniqueNodeList.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Ledger.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyDeterministic.cpp">
       <Filter>1. Modules\ripple_data\crypto</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Config.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Job.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_JobQueue.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HttpsClient.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\CallRPC.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\rpc.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCDoor.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCErr.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCHandler.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCServer.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RPCSub.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_data\protocol\ripple_FieldNames.cpp">
       <Filter>1. Modules\ripple_data\protocol</Filter>
@@ -718,148 +715,136 @@
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_ProofOfWorkFactory.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_ProofOfWork.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Peer.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Peers.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_HashedObjectStore.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_HashedObject.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_data\protocol\ripple_SerializedObjectTemplate.cpp">
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_InfoSub.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_PeerSet.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_CanonicalTXSet.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SerializedLedger.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SerializedTransaction.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_AcceptedLedgerTx.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_AcceptedLedger.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_data\utility\ripple_JSONCache.cpp">
       <Filter>1. Modules\ripple_data\utility</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_OrderBook.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_main\ripple_main_pt1.cpp">
-      <Filter>1. Modules\ripple_main</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_main\ripple_main_pt2.cpp">
-      <Filter>1. Modules\ripple_main</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_main\ripple_main_pt3.cpp">
-      <Filter>1. Modules\ripple_main</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_main\ripple_main_pt4.cpp">
-      <Filter>1. Modules\ripple_main</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_AccountItem.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_AccountItems.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapDelta.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapItem.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapMissingNode.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapNode.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapSync.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapSyncFilters.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMapTreeNode.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_SHAMap.cpp">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_basics\containers\ripple_TaggedCache.cpp">
       <Filter>1. Modules\ripple_basics\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WSConnection.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WSHandler.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_AccountState.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="build\proto\ripple.pb.cc">
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_TransactionAcquire.cpp">
-      <Filter>1. Modules\ripple_main\refactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\refactored\transactions</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_DisputedTx.cpp">
-      <Filter>1. Modules\ripple_main\refactored\consensus</Filter>
+      <Filter>1. Modules\ripple_app\refactored\consensus</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LedgerConsensus.cpp">
-      <Filter>1. Modules\ripple_main\refactored\consensus</Filter>
+      <Filter>1. Modules\ripple_app\refactored\consensus</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Offer.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_NicknameState.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LoadManager.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Application.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_PathRequest.cpp">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_Pathfinder.cpp">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_RippleState.cpp">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_RippleLineCache.cpp">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_PathState.cpp">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_RippleCalc.cpp">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_data\protocol\ripple_TxFormat.cpp">
       <Filter>1. Modules\ripple_data\protocol</Filter>
@@ -868,23 +853,38 @@
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LocalCredentials.cpp">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LedgerEntrySet.cpp">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_LedgerHistory.cpp">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_InboundLedger.cpp">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ripple_InboundLedgers.cpp">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClCompile>
     <ClCompile Include="Subtrees\beast\modules\beast_basics\beast_basics.cpp">
       <Filter>0. Third Party Code\beast</Filter>
     </ClCompile>
+    <ClCompile Include="modules\ripple_app\ripple_app.cpp">
+      <Filter>1. Modules\ripple_app</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_app\ripple_app_pt1.cpp">
+      <Filter>1. Modules\ripple_app</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_app\ripple_app_pt2.cpp">
+      <Filter>1. Modules\ripple_app</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_app\ripple_app_pt3.cpp">
+      <Filter>1. Modules\ripple_app</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_app\ripple_app_pt4.cpp">
+      <Filter>1. Modules\ripple_app</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">
@@ -1158,52 +1158,52 @@
       <Filter>0. Third Party Code\protobuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Transaction.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionEngine.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionMaster.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionMeta.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TransactionQueue.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Transactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TrustSetTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OfferCreateTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OfferCancelTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RegularKeySetTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PaymentTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AccountSetTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Operation.h">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Contract.h">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParameterTable.h">
-      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParseSection.h">
-      <Filter>1. Modules\ripple_main\_unfactored\types</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\types</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\ripple_basics.h">
       <Filter>1. Modules\ripple_basics</Filter>
@@ -1215,31 +1215,28 @@
       <Filter>2. %28Unused%29\ripple_client</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ChangeTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_db\ripple_db.h">
       <Filter>2. %28Unused%29\ripple_db</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\database\database.h">
-      <Filter>1. Modules\ripple_main\_unfactored\db</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\database\SqliteDatabase.h">
-      <Filter>1. Modules\ripple_main\_unfactored\db</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\ripple_main\ripple_main.h">
-      <Filter>1. Modules\ripple_main</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_net\ripple_net.h">
       <Filter>2. %28Unused%29\ripple_net</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Interpreter.h">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ScriptData.h">
-      <Filter>1. Modules\ripple_main\_unfactored\contracts</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\contracts</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\containers\ripple_KeyCache.h">
       <Filter>1. Modules\ripple_basics\containers</Filter>
@@ -1347,106 +1344,106 @@
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSDoor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\AutoSocket.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\NetworkOPs.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PeerDoor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SNTPClient.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSConnection.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LoadMonitor.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_DatabaseCon.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_ILoadFeeTrack.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IValidations.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LoadEvent.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IFeatures.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IFeeVote.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IHashRouter.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IUniqueNodeList.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Ledger.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerMaster.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerProposal.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\LedgerTiming.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\OrderBookDB.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializedValidation.h">
-      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_Config.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_Job.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_JobQueue.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HTTPRequest.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HttpsClient.h">
-      <Filter>1. Modules\ripple_main\_unfactored\network</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\network</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\CallRPC.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPC.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCDoor.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCErr.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCHandler.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCServer.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RPCSub.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WSHandler.h">
-      <Filter>1. Modules\ripple_main\_unfactored\rpc</Filter>
+      <Filter>1. Modules\ripple_app\_unfactored\rpc</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_data\protocol\ripple_FieldNames.h">
       <Filter>1. Modules\ripple_data\protocol</Filter>
@@ -1482,49 +1479,49 @@
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_ProofOfWork.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IProofOfWorkFactory.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_Peer.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IPeers.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_HashedObjectStore.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_HashedObject.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_data\protocol\ripple_SerializedObjectTemplate.h">
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_InfoSub.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_PeerSet.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\types\ripple_BasicTypes.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_CanonicalTXSet.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SerializedLedger.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SerializedTransaction.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_AcceptedLedgerTx.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_AcceptedLedger.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_data\utility\ripple_UptimeTimerAdapter.h">
       <Filter>1. Modules\ripple_data\utility</Filter>
@@ -1533,40 +1530,40 @@
       <Filter>1. Modules\ripple_data\utility</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_OrderBook.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_AccountItem.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_AccountItems.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapTreeNode.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapAddNode.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapItem.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapMissingNode.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapNode.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapSyncFilter.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMapSyncFilters.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_SHAMap.h">
-      <Filter>1. Modules\ripple_main\refactored\shamap</Filter>
+      <Filter>1. Modules\ripple_app\refactored\shamap</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_AccountState.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_data\utility\ripple_UptimeTimerAdapter.h">
       <Filter>1. Modules\ripple_data\utility</Filter>
@@ -1575,43 +1572,43 @@
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_TransactionAcquire.h">
-      <Filter>1. Modules\ripple_main\refactored\transactions</Filter>
+      <Filter>1. Modules\ripple_app\refactored\transactions</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_DisputedTx.h">
-      <Filter>1. Modules\ripple_main\refactored\consensus</Filter>
+      <Filter>1. Modules\ripple_app\refactored\consensus</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LedgerConsensus.h">
-      <Filter>1. Modules\ripple_main\refactored\consensus</Filter>
+      <Filter>1. Modules\ripple_app\refactored\consensus</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_Offer.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_NicknameState.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LoadManager.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_IApplication.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_PathRequest.h">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_Pathfinder.h">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_RippleState.h">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_RippleLineCache.h">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_PathState.h">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_RippleCalc.h">
-      <Filter>1. Modules\ripple_main\refactored\pathing</Filter>
+      <Filter>1. Modules\ripple_app\refactored\pathing</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_data\protocol\ripple_HashPrefix.h">
       <Filter>1. Modules\ripple_data\protocol</Filter>
@@ -1629,24 +1626,27 @@
       <Filter>1. Modules\ripple_data\protocol</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LocalCredentials.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_Version.h">
-      <Filter>1. Modules\ripple_main\refactored</Filter>
+      <Filter>1. Modules\ripple_app\refactored</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LedgerEntrySet.h">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_LedgerHistory.h">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_InboundLedger.h">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ripple_InboundLedgers.h">
-      <Filter>1. Modules\ripple_main\refactored\ledger</Filter>
+      <Filter>1. Modules\ripple_app\refactored\ledger</Filter>
     </ClInclude>
     <ClInclude Include="BeastConfig.h" />
+    <ClInclude Include="modules\ripple_app\ripple_app.h">
+      <Filter>1. Modules\ripple_app</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SConstruct" />