From 169bac3640be7274fe3c4a9e8dc05f1f0e8f93df Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 10 Jul 2013 15:41:44 -0700
Subject: [PATCH] Move files to ripple_app

---
 Builds/VisualStudio2012/RippleD.vcxproj       | 202 +++++-------------
 .../VisualStudio2012/RippleD.vcxproj.filters  | 189 +++++-----------
 TODO.txt                                      |   8 +-
 .../ripple_app/contracts/ripple_Contract.cpp  |   0
 .../ripple_app/contracts/ripple_Contract.h    |   0
 .../contracts/ripple_Interpreter.cpp          |   0
 .../ripple_app/contracts/ripple_Interpreter.h |   0
 .../ripple_app/contracts/ripple_Operation.cpp |   0
 .../ripple_app/contracts/ripple_Operation.h   |   0
 .../contracts/ripple_ScriptData.cpp           |   0
 .../ripple_app/contracts/ripple_ScriptData.h  |   0
 .../ripple_app/data}/ripple_DBInit.cpp        |   0
 .../ripple_app/data}/ripple_DBInit.h          |   0
 .../ripple_app/data}/ripple_Database.cpp      |   0
 .../ripple_app/data}/ripple_Database.h        |   0
 .../ripple_app/data}/ripple_DatabaseCon.cpp   |   0
 .../ripple_app/data}/ripple_DatabaseCon.h     |   0
 .../data}/ripple_SqliteDatabase.cpp           |   0
 .../ripple_app/data}/ripple_SqliteDatabase.h  |   0
 .../ripple_app/ledger}/Ledger.cpp             |   0
 .../ripple_app/ledger}/Ledger.h               |   0
 .../ripple_app/ledger}/LedgerMaster.cpp       |   0
 .../ripple_app/ledger}/LedgerMaster.h         |   0
 .../ripple_app/ledger}/LedgerProposal.cpp     |   0
 .../ripple_app/ledger}/LedgerProposal.h       |   0
 .../ripple_app/ledger}/LedgerTiming.cpp       |   0
 .../ripple_app/ledger}/LedgerTiming.h         |   0
 .../ripple_app/ledger}/LedgerUnitTests.cpp    |   0
 .../ripple_app/ledger}/OrderBookDB.cpp        |   0
 .../ripple_app/ledger}/OrderBookDB.h          |   0
 .../ledger}/SerializedValidation.cpp          |   0
 .../ripple_app/ledger}/SerializedValidation.h |   0
 .../ledger}/ripple_AcceptedLedger.cpp         |   0
 .../ledger}/ripple_AcceptedLedger.h           |   0
 .../ledger}/ripple_AcceptedLedgerTx.cpp       |   0
 .../ledger}/ripple_AcceptedLedgerTx.h         |   0
 .../ledger}/ripple_InboundLedger.cpp          |   0
 .../ripple_app/ledger}/ripple_InboundLedger.h |   0
 .../ledger}/ripple_InboundLedgers.cpp         |   0
 .../ledger}/ripple_InboundLedgers.h           |   0
 .../ledger}/ripple_LedgerEntrySet.cpp         |   0
 .../ledger}/ripple_LedgerEntrySet.h           |   0
 .../ledger}/ripple_LedgerHistory.cpp          |   0
 .../ripple_app/ledger}/ripple_LedgerHistory.h |   0
 modules/ripple_app/ripple_app.cpp             |  36 ++--
 45 files changed, 136 insertions(+), 299 deletions(-)
 rename src/cpp/ripple/Contract.cpp => modules/ripple_app/contracts/ripple_Contract.cpp (100%)
 rename src/cpp/ripple/Contract.h => modules/ripple_app/contracts/ripple_Contract.h (100%)
 rename src/cpp/ripple/Interpreter.cpp => modules/ripple_app/contracts/ripple_Interpreter.cpp (100%)
 rename src/cpp/ripple/Interpreter.h => modules/ripple_app/contracts/ripple_Interpreter.h (100%)
 rename src/cpp/ripple/Operation.cpp => modules/ripple_app/contracts/ripple_Operation.cpp (100%)
 rename src/cpp/ripple/Operation.h => modules/ripple_app/contracts/ripple_Operation.h (100%)
 rename src/cpp/ripple/ScriptData.cpp => modules/ripple_app/contracts/ripple_ScriptData.cpp (100%)
 rename src/cpp/ripple/ScriptData.h => modules/ripple_app/contracts/ripple_ScriptData.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_DBInit.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_DBInit.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_Database.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_Database.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_DatabaseCon.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_DatabaseCon.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_SqliteDatabase.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/data}/ripple_SqliteDatabase.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/Ledger.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/Ledger.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerMaster.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerMaster.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerProposal.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerProposal.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerTiming.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerTiming.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/LedgerUnitTests.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/OrderBookDB.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/OrderBookDB.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/SerializedValidation.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/SerializedValidation.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_AcceptedLedger.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_AcceptedLedger.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_AcceptedLedgerTx.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_AcceptedLedgerTx.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_InboundLedger.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_InboundLedger.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_InboundLedgers.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_InboundLedgers.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_LedgerEntrySet.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_LedgerEntrySet.h (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_LedgerHistory.cpp (100%)
 rename {src/cpp/ripple => modules/ripple_app/ledger}/ripple_LedgerHistory.h (100%)

diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index ba9ba1223a..8dfd810cd0 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -25,6 +25,54 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\contracts\ripple_Contract.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\contracts\ripple_Interpreter.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\contracts\ripple_Operation.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\contracts\ripple_ScriptData.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\data\ripple_Database.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\data\ripple_DatabaseCon.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\data\ripple_DBInit.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\data\ripple_SqliteDatabase.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\node\ripple_NodeObject.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -454,48 +502,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Contract.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\Interpreter.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\Ledger.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\LedgerMaster.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\LedgerProposal.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\LedgerTiming.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\LedgerUnitTests.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\NetworkOPs.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -514,18 +520,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Operation.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\OrderBookDB.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\ParameterTable.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -550,18 +544,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_AcceptedLedger.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_AcceptedLedgerTx.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_AccountItem.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -592,24 +574,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Database.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_DatabaseCon.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_DBInit.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_DisputedTx.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -634,18 +598,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_InboundLedger.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_InboundLedgers.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_InfoSub.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -658,18 +610,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LedgerEntrySet.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_LedgerHistory.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_LoadManager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -856,12 +796,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.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_TransactionAcquire.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -910,18 +844,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ScriptData.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\SerializedValidation.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\Transaction.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1350,6 +1272,14 @@
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_BuildVersion.h" />
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.h" />
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_Version.h" />
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Contract.h" />
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Interpreter.h" />
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Operation.h" />
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_ScriptData.h" />
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_Database.h" />
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_DatabaseCon.h" />
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_DBInit.h" />
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_SqliteDatabase.h" />
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h" />
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeStore.h" />
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_LevelDBBackendFactory.h" />
@@ -1442,47 +1372,30 @@
     <ClInclude Include="..\..\src\cpp\ripple\AccountSetTransactor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\CallRPC.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ChangeTransactor.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\Contract.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\Interpreter.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\Ledger.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\LedgerMaster.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\LedgerProposal.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\LedgerTiming.h" />
     <ClInclude Include="..\..\src\cpp\ripple\NetworkOPs.h" />
     <ClInclude Include="..\..\src\cpp\ripple\OfferCancelTransactor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\OfferCreateTransactor.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\Operation.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\OrderBookDB.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ParameterTable.h" />
     <ClInclude Include="..\..\src\cpp\ripple\PaymentTransactor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\Peer.h" />
     <ClInclude Include="..\..\src\cpp\ripple\PeerDoor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\RegularKeySetTransactor.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AcceptedLedger.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AcceptedLedgerTx.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_AccountItem.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_AccountItems.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_AccountState.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_CanonicalTXSet.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_Database.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_DatabaseCon.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_DBInit.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_DisputedTx.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IApplication.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IFeatures.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IFeeVote.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IHashRouter.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_ILoadManager.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_InboundLedger.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_InboundLedgers.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_InfoSub.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IPeers.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IProofOfWorkFactory.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_UniqueNodeList.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_IValidations.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerConsensus.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerEntrySet.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerHistory.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_LocalCredentials.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_NicknameState.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_Offer.h" />
@@ -1507,15 +1420,12 @@
     <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapSyncFilter.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapSyncFilters.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapTreeNode.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.h" />
     <ClInclude Include="..\..\src\cpp\ripple\ripple_TransactionAcquire.h" />
     <ClInclude Include="..\..\src\cpp\ripple\RPC.h" />
     <ClInclude Include="..\..\src\cpp\ripple\RPCDoor.h" />
     <ClInclude Include="..\..\src\cpp\ripple\RPCErr.h" />
     <ClInclude Include="..\..\src\cpp\ripple\RPCHandler.h" />
     <ClInclude Include="..\..\src\cpp\ripple\RPCSub.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\ScriptData.h" />
-    <ClInclude Include="..\..\src\cpp\ripple\SerializedValidation.h" />
     <ClInclude Include="..\..\src\cpp\ripple\Transaction.h" />
     <ClInclude Include="..\..\src\cpp\ripple\TransactionEngine.h" />
     <ClInclude Include="..\..\src\cpp\ripple\TransactionMaster.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 1487bad876..cd054df149 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -97,15 +97,6 @@
     <Filter Include="[0] Subtrees\leveldb\port\win">
       <UniqueIdentifier>{223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_contracts">
-      <UniqueIdentifier>{46bda3c0-166b-4188-8f6b-da6f6ff638fc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_data">
-      <UniqueIdentifier>{01ac5649-14bd-4c61-ac6b-169742a86036}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_app\_ledger">
-      <UniqueIdentifier>{85ea08c2-f8a6-477b-8d59-9a7339761d20}</UniqueIdentifier>
-    </Filter>
     <Filter Include="[1] Ripple\ripple_app\_main">
       <UniqueIdentifier>{cf19fa31-c40b-4203-b497-63a8c3dcb282}</UniqueIdentifier>
     </Filter>
@@ -148,6 +139,15 @@
     <Filter Include="[1] Ripple\ripple_app\node">
       <UniqueIdentifier>{bd48a825-192f-4d5e-9230-661fdd65f9b6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[1] Ripple\ripple_app\contracts">
+      <UniqueIdentifier>{3ac448dc-9f2e-472b-9f3c-cf9140dddf3a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\data">
+      <UniqueIdentifier>{28809512-5c30-469f-a094-90839fbfa210}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\ledger">
+      <UniqueIdentifier>{85ea08c2-f8a6-477b-8d59-9a7339761d20}</UniqueIdentifier>
+    </Filter>
     <Filter Include="[1] Ripple\ripple_mdb">
       <UniqueIdentifier>{6a769530-8edf-4836-afc8-8836fe315603}</UniqueIdentifier>
     </Filter>
@@ -531,75 +531,12 @@
     <ClCompile Include="..\..\modules\ripple_client\ripple_client.cpp">
       <Filter>[1] Ripple\ripple_client</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Contract.cpp">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Interpreter.cpp">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Operation.cpp">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ScriptData.cpp">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ripple_DisputedTx.cpp">
       <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ripple_LedgerConsensus.cpp">
       <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_Database.cpp">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_DatabaseCon.cpp">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_DBInit.cpp">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.cpp">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\Ledger.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\LedgerMaster.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\LedgerProposal.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\LedgerTiming.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\LedgerUnitTests.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\OrderBookDB.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_AcceptedLedger.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_AcceptedLedgerTx.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_InboundLedger.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_InboundLedgers.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LedgerEntrySet.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\ripple_LedgerHistory.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\ripple\SerializedValidation.cpp">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cpp\ripple\ParameterTable.cpp">
       <Filter>[1] Ripple\ripple_app\_main</Filter>
     </ClCompile>
@@ -876,6 +813,30 @@
     <ClCompile Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.cpp">
       <Filter>[1] Ripple\ripple_hyperleveldb</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\contracts\ripple_Contract.cpp">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\contracts\ripple_Interpreter.cpp">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\contracts\ripple_Operation.cpp">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\contracts\ripple_ScriptData.cpp">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\data\ripple_Database.cpp">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\data\ripple_DatabaseCon.cpp">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\data\ripple_DBInit.cpp">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\data\ripple_SqliteDatabase.cpp">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1299,69 +1260,12 @@
     <ClInclude Include="..\..\modules\ripple_client\ripple_client.h">
       <Filter>[1] Ripple\ripple_client</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Contract.h">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Interpreter.h">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Operation.h">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ScriptData.h">
-      <Filter>[1] Ripple\ripple_app\_contracts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cpp\ripple\ripple_DisputedTx.h">
       <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerConsensus.h">
       <Filter>[1] Ripple\ripple_app\_misc\_consensus</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_Database.h">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_DatabaseCon.h">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.h">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\Ledger.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\LedgerMaster.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\LedgerProposal.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\LedgerTiming.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\OrderBookDB.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AcceptedLedger.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_AcceptedLedgerTx.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_InboundLedger.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_InboundLedgers.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerEntrySet.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_LedgerHistory.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\SerializedValidation.h">
-      <Filter>[1] Ripple\ripple_app\_ledger</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cpp\ripple\ParameterTable.h">
       <Filter>[1] Ripple\ripple_app\_main</Filter>
     </ClInclude>
@@ -1608,9 +1512,6 @@
     <ClInclude Include="..\..\modules\ripple_basio\boost\ripple_SslContext.h">
       <Filter>[1] Ripple\ripple_basio\boost</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cpp\ripple\ripple_DBInit.h">
-      <Filter>[1] Ripple\ripple_app\_data</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClInclude>
@@ -1632,6 +1533,30 @@
     <ClInclude Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.h">
       <Filter>[1] Ripple\ripple_hyperleveldb</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Contract.h">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Interpreter.h">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Operation.h">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_ScriptData.h">
+      <Filter>[1] Ripple\ripple_app\contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_Database.h">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_DatabaseCon.h">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_DBInit.h">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\data\ripple_SqliteDatabase.h">
+      <Filter>[1] Ripple\ripple_app\data</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\cpp\ripple\ripple.proto" />
diff --git a/TODO.txt b/TODO.txt
index 2f4756596f..6cac78f235 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,6 +2,10 @@
 RIPPLE TODO
 --------------------------------------------------------------------------------
 
+- Move everything in src/cpp/ripple into ripple_app and sort them into
+  subdirectories within the module as per the project filters.
+  * Make sure there are no pending commits from David
+
 - See if UniqueNodeList is really used, and if its not used remove it. If
   only some small part of it is used, then delete the rest. David says
   that it is broken anyway.
@@ -30,10 +34,6 @@ RIPPLE TODO
   by providing an observer (beast::ListenerList or Listeners). This way
   LoadManager does not need stopThread() function.
 
-- Move everything in src/cpp/ripple into ripple_app and sort them into
-  subdirectories within the module as per the project filters.
-  * Make sure there are no pending commits from David
-
 - Rewrite Sustain to use Beast and work on Windows as well
   * Do not enable watchdog process if a debugger is attached
 
diff --git a/src/cpp/ripple/Contract.cpp b/modules/ripple_app/contracts/ripple_Contract.cpp
similarity index 100%
rename from src/cpp/ripple/Contract.cpp
rename to modules/ripple_app/contracts/ripple_Contract.cpp
diff --git a/src/cpp/ripple/Contract.h b/modules/ripple_app/contracts/ripple_Contract.h
similarity index 100%
rename from src/cpp/ripple/Contract.h
rename to modules/ripple_app/contracts/ripple_Contract.h
diff --git a/src/cpp/ripple/Interpreter.cpp b/modules/ripple_app/contracts/ripple_Interpreter.cpp
similarity index 100%
rename from src/cpp/ripple/Interpreter.cpp
rename to modules/ripple_app/contracts/ripple_Interpreter.cpp
diff --git a/src/cpp/ripple/Interpreter.h b/modules/ripple_app/contracts/ripple_Interpreter.h
similarity index 100%
rename from src/cpp/ripple/Interpreter.h
rename to modules/ripple_app/contracts/ripple_Interpreter.h
diff --git a/src/cpp/ripple/Operation.cpp b/modules/ripple_app/contracts/ripple_Operation.cpp
similarity index 100%
rename from src/cpp/ripple/Operation.cpp
rename to modules/ripple_app/contracts/ripple_Operation.cpp
diff --git a/src/cpp/ripple/Operation.h b/modules/ripple_app/contracts/ripple_Operation.h
similarity index 100%
rename from src/cpp/ripple/Operation.h
rename to modules/ripple_app/contracts/ripple_Operation.h
diff --git a/src/cpp/ripple/ScriptData.cpp b/modules/ripple_app/contracts/ripple_ScriptData.cpp
similarity index 100%
rename from src/cpp/ripple/ScriptData.cpp
rename to modules/ripple_app/contracts/ripple_ScriptData.cpp
diff --git a/src/cpp/ripple/ScriptData.h b/modules/ripple_app/contracts/ripple_ScriptData.h
similarity index 100%
rename from src/cpp/ripple/ScriptData.h
rename to modules/ripple_app/contracts/ripple_ScriptData.h
diff --git a/src/cpp/ripple/ripple_DBInit.cpp b/modules/ripple_app/data/ripple_DBInit.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_DBInit.cpp
rename to modules/ripple_app/data/ripple_DBInit.cpp
diff --git a/src/cpp/ripple/ripple_DBInit.h b/modules/ripple_app/data/ripple_DBInit.h
similarity index 100%
rename from src/cpp/ripple/ripple_DBInit.h
rename to modules/ripple_app/data/ripple_DBInit.h
diff --git a/src/cpp/ripple/ripple_Database.cpp b/modules/ripple_app/data/ripple_Database.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Database.cpp
rename to modules/ripple_app/data/ripple_Database.cpp
diff --git a/src/cpp/ripple/ripple_Database.h b/modules/ripple_app/data/ripple_Database.h
similarity index 100%
rename from src/cpp/ripple/ripple_Database.h
rename to modules/ripple_app/data/ripple_Database.h
diff --git a/src/cpp/ripple/ripple_DatabaseCon.cpp b/modules/ripple_app/data/ripple_DatabaseCon.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_DatabaseCon.cpp
rename to modules/ripple_app/data/ripple_DatabaseCon.cpp
diff --git a/src/cpp/ripple/ripple_DatabaseCon.h b/modules/ripple_app/data/ripple_DatabaseCon.h
similarity index 100%
rename from src/cpp/ripple/ripple_DatabaseCon.h
rename to modules/ripple_app/data/ripple_DatabaseCon.h
diff --git a/src/cpp/ripple/ripple_SqliteDatabase.cpp b/modules/ripple_app/data/ripple_SqliteDatabase.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_SqliteDatabase.cpp
rename to modules/ripple_app/data/ripple_SqliteDatabase.cpp
diff --git a/src/cpp/ripple/ripple_SqliteDatabase.h b/modules/ripple_app/data/ripple_SqliteDatabase.h
similarity index 100%
rename from src/cpp/ripple/ripple_SqliteDatabase.h
rename to modules/ripple_app/data/ripple_SqliteDatabase.h
diff --git a/src/cpp/ripple/Ledger.cpp b/modules/ripple_app/ledger/Ledger.cpp
similarity index 100%
rename from src/cpp/ripple/Ledger.cpp
rename to modules/ripple_app/ledger/Ledger.cpp
diff --git a/src/cpp/ripple/Ledger.h b/modules/ripple_app/ledger/Ledger.h
similarity index 100%
rename from src/cpp/ripple/Ledger.h
rename to modules/ripple_app/ledger/Ledger.h
diff --git a/src/cpp/ripple/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerMaster.cpp
rename to modules/ripple_app/ledger/LedgerMaster.cpp
diff --git a/src/cpp/ripple/LedgerMaster.h b/modules/ripple_app/ledger/LedgerMaster.h
similarity index 100%
rename from src/cpp/ripple/LedgerMaster.h
rename to modules/ripple_app/ledger/LedgerMaster.h
diff --git a/src/cpp/ripple/LedgerProposal.cpp b/modules/ripple_app/ledger/LedgerProposal.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerProposal.cpp
rename to modules/ripple_app/ledger/LedgerProposal.cpp
diff --git a/src/cpp/ripple/LedgerProposal.h b/modules/ripple_app/ledger/LedgerProposal.h
similarity index 100%
rename from src/cpp/ripple/LedgerProposal.h
rename to modules/ripple_app/ledger/LedgerProposal.h
diff --git a/src/cpp/ripple/LedgerTiming.cpp b/modules/ripple_app/ledger/LedgerTiming.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerTiming.cpp
rename to modules/ripple_app/ledger/LedgerTiming.cpp
diff --git a/src/cpp/ripple/LedgerTiming.h b/modules/ripple_app/ledger/LedgerTiming.h
similarity index 100%
rename from src/cpp/ripple/LedgerTiming.h
rename to modules/ripple_app/ledger/LedgerTiming.h
diff --git a/src/cpp/ripple/LedgerUnitTests.cpp b/modules/ripple_app/ledger/LedgerUnitTests.cpp
similarity index 100%
rename from src/cpp/ripple/LedgerUnitTests.cpp
rename to modules/ripple_app/ledger/LedgerUnitTests.cpp
diff --git a/src/cpp/ripple/OrderBookDB.cpp b/modules/ripple_app/ledger/OrderBookDB.cpp
similarity index 100%
rename from src/cpp/ripple/OrderBookDB.cpp
rename to modules/ripple_app/ledger/OrderBookDB.cpp
diff --git a/src/cpp/ripple/OrderBookDB.h b/modules/ripple_app/ledger/OrderBookDB.h
similarity index 100%
rename from src/cpp/ripple/OrderBookDB.h
rename to modules/ripple_app/ledger/OrderBookDB.h
diff --git a/src/cpp/ripple/SerializedValidation.cpp b/modules/ripple_app/ledger/SerializedValidation.cpp
similarity index 100%
rename from src/cpp/ripple/SerializedValidation.cpp
rename to modules/ripple_app/ledger/SerializedValidation.cpp
diff --git a/src/cpp/ripple/SerializedValidation.h b/modules/ripple_app/ledger/SerializedValidation.h
similarity index 100%
rename from src/cpp/ripple/SerializedValidation.h
rename to modules/ripple_app/ledger/SerializedValidation.h
diff --git a/src/cpp/ripple/ripple_AcceptedLedger.cpp b/modules/ripple_app/ledger/ripple_AcceptedLedger.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedger.cpp
rename to modules/ripple_app/ledger/ripple_AcceptedLedger.cpp
diff --git a/src/cpp/ripple/ripple_AcceptedLedger.h b/modules/ripple_app/ledger/ripple_AcceptedLedger.h
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedger.h
rename to modules/ripple_app/ledger/ripple_AcceptedLedger.h
diff --git a/src/cpp/ripple/ripple_AcceptedLedgerTx.cpp b/modules/ripple_app/ledger/ripple_AcceptedLedgerTx.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedgerTx.cpp
rename to modules/ripple_app/ledger/ripple_AcceptedLedgerTx.cpp
diff --git a/src/cpp/ripple/ripple_AcceptedLedgerTx.h b/modules/ripple_app/ledger/ripple_AcceptedLedgerTx.h
similarity index 100%
rename from src/cpp/ripple/ripple_AcceptedLedgerTx.h
rename to modules/ripple_app/ledger/ripple_AcceptedLedgerTx.h
diff --git a/src/cpp/ripple/ripple_InboundLedger.cpp b/modules/ripple_app/ledger/ripple_InboundLedger.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedger.cpp
rename to modules/ripple_app/ledger/ripple_InboundLedger.cpp
diff --git a/src/cpp/ripple/ripple_InboundLedger.h b/modules/ripple_app/ledger/ripple_InboundLedger.h
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedger.h
rename to modules/ripple_app/ledger/ripple_InboundLedger.h
diff --git a/src/cpp/ripple/ripple_InboundLedgers.cpp b/modules/ripple_app/ledger/ripple_InboundLedgers.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedgers.cpp
rename to modules/ripple_app/ledger/ripple_InboundLedgers.cpp
diff --git a/src/cpp/ripple/ripple_InboundLedgers.h b/modules/ripple_app/ledger/ripple_InboundLedgers.h
similarity index 100%
rename from src/cpp/ripple/ripple_InboundLedgers.h
rename to modules/ripple_app/ledger/ripple_InboundLedgers.h
diff --git a/src/cpp/ripple/ripple_LedgerEntrySet.cpp b/modules/ripple_app/ledger/ripple_LedgerEntrySet.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerEntrySet.cpp
rename to modules/ripple_app/ledger/ripple_LedgerEntrySet.cpp
diff --git a/src/cpp/ripple/ripple_LedgerEntrySet.h b/modules/ripple_app/ledger/ripple_LedgerEntrySet.h
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerEntrySet.h
rename to modules/ripple_app/ledger/ripple_LedgerEntrySet.h
diff --git a/src/cpp/ripple/ripple_LedgerHistory.cpp b/modules/ripple_app/ledger/ripple_LedgerHistory.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerHistory.cpp
rename to modules/ripple_app/ledger/ripple_LedgerHistory.cpp
diff --git a/src/cpp/ripple/ripple_LedgerHistory.h b/modules/ripple_app/ledger/ripple_LedgerHistory.h
similarity index 100%
rename from src/cpp/ripple/ripple_LedgerHistory.h
rename to modules/ripple_app/ledger/ripple_LedgerHistory.h
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 5762a6b598..0c32a6181f 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -91,10 +91,10 @@ namespace ripple
 //             linearize the include sequence and view it in one place.
 //
 
-#include "src/cpp/ripple/ripple_Database.h"
-#include "src/cpp/ripple/ripple_DatabaseCon.h"
-#include "src/cpp/ripple/ripple_SqliteDatabase.h"
-#include "src/cpp/ripple/ripple_DBInit.h"
+#include "data/ripple_Database.h"
+#include "data/ripple_DatabaseCon.h"
+#include "data/ripple_SqliteDatabase.h"
+#include "data/ripple_DBInit.h"
 
 #include "node/ripple_NodeObject.h"
 #include "node/ripple_NodeStore.h"
@@ -136,10 +136,6 @@ namespace ripple
 #include "src/cpp/ripple/ripple_PeerSet.h"
 #include "src/cpp/ripple/ripple_InboundLedger.h"
 #include "src/cpp/ripple/ripple_InboundLedgers.h"
-#include "src/cpp/ripple/ScriptData.h"
-#include "src/cpp/ripple/Contract.h"
-#include "src/cpp/ripple/Interpreter.h"
-#include "src/cpp/ripple/Operation.h"
 #include "src/cpp/ripple/ripple_AccountItem.h"
 #include "src/cpp/ripple/ripple_AccountItems.h"
 #include "src/cpp/ripple/ripple_AcceptedLedgerTx.h"
@@ -157,7 +153,6 @@ namespace ripple
 #include "src/cpp/ripple/RPCHandler.h"
 #include "src/cpp/ripple/TransactionQueue.h"
 #include "src/cpp/ripple/OrderBookDB.h"
-#include "src/cpp/ripple/ripple_DatabaseCon.h"
 #include "src/cpp/ripple/ripple_IApplication.h"
 #include "src/cpp/ripple/CallRPC.h"
 #include "src/cpp/ripple/Transactor.h"
@@ -189,6 +184,11 @@ namespace ripple
 #include "src/cpp/ripple/ripple_WSHandler.h"
 #include "src/cpp/ripple/WalletAddTransactor.h"
 
+#include "contracts/ripple_ScriptData.h"
+#include "contracts/ripple_Contract.h"
+#include "contracts/ripple_Interpreter.h"
+#include "contracts/ripple_Operation.h"
+
 #include "basics/ripple_Version.h" // VFALCO TODO Should this be private?
 #include "basics/ripple_BuildVersion.h" // private
 #include "basics/ripple_RPCServerHandler.h"
@@ -252,11 +252,15 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "src/cpp/ripple/ripple_SHAMapNode.cpp"
 #include "src/cpp/ripple/ripple_SHAMapTreeNode.cpp"
 
-#include "src/cpp/ripple/ripple_Database.cpp"
 #include "src/cpp/ripple/ripple_AccountItems.cpp"
 #include "src/cpp/ripple/ripple_AccountState.cpp"
 #include "src/cpp/ripple/ChangeTransactor.cpp"
 
+#include "contracts/ripple_Contract.cpp"
+#include "contracts/ripple_Operation.cpp"
+#include "contracts/ripple_ScriptData.cpp"
+#include "contracts/ripple_Interpreter.cpp"
+
 #endif
 
 //------------------------------------------------------------------------------
@@ -272,13 +276,17 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "src/cpp/ripple/ripple_AccountItem.cpp"
 #include "src/cpp/ripple/AccountSetTransactor.cpp"
 #include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
-#include "src/cpp/ripple/Contract.cpp"
 #include "src/cpp/ripple/LedgerProposal.cpp"
 #include "src/cpp/ripple/ripple_LoadManager.cpp"
 #include "src/cpp/ripple/ripple_NicknameState.cpp"
 #include "src/cpp/ripple/OfferCancelTransactor.cpp"
 #include "src/cpp/ripple/OrderBookDB.cpp"
 
+#include "data/ripple_Database.cpp"
+#include "data/ripple_DatabaseCon.cpp"
+#include "data/ripple_SqliteDatabase.cpp"
+#include "data/ripple_DBInit.cpp"
+
 #endif
 
 //------------------------------------------------------------------------------
@@ -319,13 +327,11 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #include "src/cpp/ripple/ripple_UniqueNodeList.cpp"
 #include "src/cpp/ripple/ripple_InboundLedger.cpp"
-#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
 
 #include "src/cpp/ripple/PaymentTransactor.cpp"
 #include "src/cpp/ripple/RegularKeySetTransactor.cpp"
 #include "src/cpp/ripple/ripple_RippleState.cpp"
 #include "src/cpp/ripple/RPCDoor.cpp"
-#include "src/cpp/ripple/ScriptData.cpp"
 #include "src/cpp/ripple/TransactionCheck.cpp"
 #include "src/cpp/ripple/TransactionMaster.cpp"
 #include "src/cpp/ripple/TransactionQueue.cpp"
@@ -345,10 +351,7 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 
 #include "src/cpp/ripple/WalletAddTransactor.cpp"
 #include "src/cpp/ripple/ripple_AcceptedLedgerTx.cpp"
-#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
 #include "src/cpp/ripple/ripple_FeeVote.cpp"
-#include "src/cpp/ripple/ripple_DBInit.cpp"
-#include "src/cpp/ripple/Interpreter.cpp"
 #include "src/cpp/ripple/LedgerTiming.cpp"
 
 #endif
@@ -382,7 +385,6 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/ripple_PathRequest.cpp"
 #include "src/cpp/ripple/ripple_SerializedLedger.cpp"
 #include "src/cpp/ripple/ripple_TransactionAcquire.cpp"
-#include "src/cpp/ripple/Operation.cpp"
 
 #endif