diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 3a318d339c..d504ceb0a9 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -49,7 +49,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\obj;..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\src;..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src\</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -86,93 +86,91 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="database\database.cpp" />
-    <ClCompile Include="database\sqlite3.c" />
-    <ClCompile Include="database\SqliteDatabase.cpp" />
-    <ClCompile Include="database\win\windatabase.cpp" />
-    <ClCompile Include="json\json_reader.cpp" />
-    <ClCompile Include="json\json_value.cpp" />
-    <ClCompile Include="json\json_writer.cpp" />
-    <ClCompile Include="obj\src\ripple.pb.cc" />
-    <ClCompile Include="src\AccountState.cpp" />
-    <ClCompile Include="src\Amount.cpp" />
-    <ClCompile Include="src\Application.cpp" />
-    <ClCompile Include="src\BitcoinUtil.cpp" />
-    <ClCompile Include="src\CallRPC.cpp" />
-    <ClCompile Include="src\CanonicalTXSet.cpp" />
-    <ClCompile Include="src\Config.cpp" />
-    <ClCompile Include="src\ConnectionPool.cpp" />
-    <ClCompile Include="src\Contract.cpp" />
-    <ClCompile Include="src\DBInit.cpp" />
-    <ClCompile Include="src\DeterministicKeys.cpp" />
-    <ClCompile Include="src\ECIES.cpp" />
-    <ClCompile Include="src\FieldNames.cpp" />
-    <ClCompile Include="src\JobQueue.cpp" />
-    <ClCompile Include="src\HashedObject.cpp" />
-    <ClCompile Include="src\HTTPRequest.cpp" />
-    <ClCompile Include="src\HttpsClient.cpp" />
-    <ClCompile Include="src\Interpreter.cpp" />
-    <ClCompile Include="src\InstanceCounter.cpp" />
-    <ClCompile Include="src\Ledger.cpp" />
-    <ClCompile Include="src\LedgerAcquire.cpp" />
-    <ClCompile Include="src\LedgerConsensus.cpp" />
-    <ClCompile Include="src\LedgerEntrySet.cpp" />
-    <ClCompile Include="src\LedgerFormats.cpp" />
-    <ClCompile Include="src\LedgerHistory.cpp" />
-    <ClCompile Include="src\LedgerMaster.cpp" />
-    <ClCompile Include="src\LedgerProposal.cpp" />
-    <ClCompile Include="src\LedgerTiming.cpp" />
-    <ClCompile Include="src\Log.cpp" />
-    <ClCompile Include="src\main.cpp" />
-    <ClCompile Include="src\NetworkOPs.cpp" />
-    <ClCompile Include="src\NicknameState.cpp" />
-    <ClCompile Include="src\Operation.cpp" />
-    <ClCompile Include="src\OrderBook.cpp" />
-    <ClCompile Include="src\OrderBookDB.cpp" />
-    <ClCompile Include="src\PackedMessage.cpp" />
-    <ClCompile Include="src\ParseSection.cpp" />
-    <ClCompile Include="src\Pathfinder.cpp" />
-    <ClCompile Include="src\Peer.cpp" />
-    <ClCompile Include="src\PeerDoor.cpp" />
-    <ClCompile Include="src\PlatRand.cpp" />
-    <ClCompile Include="src\PubKeyCache.cpp" />
-    <ClCompile Include="src\RangeSet.cpp" />
-    <ClCompile Include="src\rfc1751.cpp" />
-    <ClCompile Include="src\RippleAddress.cpp" />
-    <ClCompile Include="src\RippleCalc.cpp" />
-    <ClCompile Include="src\RippleLines.cpp" />
-    <ClCompile Include="src\RippleState.cpp" />
-    <ClCompile Include="src\rpc.cpp" />
-    <ClCompile Include="src\RPCCommands.cpp" />
-    <ClCompile Include="src\RPCDoor.cpp" />
-    <ClCompile Include="src\RPCHandler.cpp" />
-    <ClCompile Include="src\RPCServer.cpp" />
-    <ClCompile Include="src\ScriptData.cpp" />
-    <ClCompile Include="src\SerializedLedger.cpp" />
-    <ClCompile Include="src\SerializedObject.cpp" />
-    <ClCompile Include="src\SerializedTransaction.cpp" />
-    <ClCompile Include="src\SerializedTypes.cpp" />
-    <ClCompile Include="src\SerializedValidation.cpp" />
-    <ClCompile Include="src\Serializer.cpp" />
-    <ClCompile Include="src\SHAMap.cpp" />
-    <ClCompile Include="src\SHAMapDiff.cpp" />
-    <ClCompile Include="src\SHAMapNodes.cpp" />
-    <ClCompile Include="src\SHAMapSync.cpp" />
-    <ClCompile Include="src\SNTPClient.cpp" />
-    <ClCompile Include="src\Suppression.cpp" />
-    <ClCompile Include="src\Transaction.cpp" />
-    <ClCompile Include="src\TransactionAction.cpp" />
-    <ClCompile Include="src\TransactionEngine.cpp" />
-    <ClCompile Include="src\TransactionErr.cpp" />
-    <ClCompile Include="src\TransactionFormats.cpp" />
-    <ClCompile Include="src\TransactionMaster.cpp" />
-    <ClCompile Include="src\TransactionMeta.cpp" />
-    <ClCompile Include="src\UniqueNodeList.cpp" />
-    <ClCompile Include="src\utils.cpp" />
-    <ClCompile Include="src\ValidationCollection.cpp" />
-    <ClCompile Include="src\Wallet.cpp" />
-    <ClCompile Include="src\WSConnection.cpp" />
-    <ClCompile Include="src\WSDoor.cpp" />
+    <ClCompile Include="src\cpp\database\database.cpp" />
+    <ClCompile Include="src\cpp\database\SqliteDatabase.cpp" />
+    <ClCompile Include="src\cpp\database\win\windatabase.cpp" />
+    <ClCompile Include="src\cpp\json\json_reader.cpp" />
+    <ClCompile Include="src\cpp\json\json_value.cpp" />
+    <ClCompile Include="src\cpp\json\json_writer.cpp" />
+    <ClCompile Include="src\cpp\ripple\AccountState.cpp" />
+    <ClCompile Include="src\cpp\ripple\Amount.cpp" />
+    <ClCompile Include="src\cpp\ripple\Application.cpp" />
+    <ClCompile Include="src\cpp\ripple\BitcoinUtil.cpp" />
+    <ClCompile Include="src\cpp\ripple\CallRPC.cpp" />
+    <ClCompile Include="src\cpp\ripple\CanonicalTXSet.cpp" />
+    <ClCompile Include="src\cpp\ripple\Config.cpp" />
+    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp" />
+    <ClCompile Include="src\cpp\ripple\Contract.cpp" />
+    <ClCompile Include="src\cpp\ripple\DBInit.cpp" />
+    <ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp" />
+    <ClCompile Include="src\cpp\ripple\ECIES.cpp" />
+    <ClCompile Include="src\cpp\ripple\FieldNames.cpp" />
+    <ClCompile Include="src\cpp\ripple\HashedObject.cpp" />
+    <ClCompile Include="src\cpp\ripple\HTTPRequest.cpp" />
+    <ClCompile Include="src\cpp\ripple\HttpsClient.cpp" />
+    <ClCompile Include="src\cpp\ripple\InstanceCounter.cpp" />
+    <ClCompile Include="src\cpp\ripple\Interpreter.cpp" />
+    <ClCompile Include="src\cpp\ripple\JobQueue.cpp" />
+    <ClCompile Include="src\cpp\ripple\Ledger.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerHistory.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp" />
+    <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp" />
+    <ClCompile Include="src\cpp\ripple\Log.cpp" />
+    <ClCompile Include="src\cpp\ripple\main.cpp" />
+    <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp" />
+    <ClCompile Include="src\cpp\ripple\NicknameState.cpp" />
+    <ClCompile Include="src\cpp\ripple\Operation.cpp" />
+    <ClCompile Include="src\cpp\ripple\OrderBook.cpp" />
+    <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp" />
+    <ClCompile Include="src\cpp\ripple\PackedMessage.cpp" />
+    <ClCompile Include="src\cpp\ripple\ParseSection.cpp" />
+    <ClCompile Include="src\cpp\ripple\Pathfinder.cpp" />
+    <ClCompile Include="src\cpp\ripple\Peer.cpp" />
+    <ClCompile Include="src\cpp\ripple\PeerDoor.cpp" />
+    <ClCompile Include="src\cpp\ripple\PlatRand.cpp" />
+    <ClCompile Include="src\cpp\ripple\PubKeyCache.cpp" />
+    <ClCompile Include="src\cpp\ripple\RangeSet.cpp" />
+    <ClCompile Include="src\cpp\ripple\rfc1751.cpp" />
+    <ClCompile Include="src\cpp\ripple\RippleAddress.cpp" />
+    <ClCompile Include="src\cpp\ripple\RippleCalc.cpp" />
+    <ClCompile Include="src\cpp\ripple\RippleLines.cpp" />
+    <ClCompile Include="src\cpp\ripple\RippleState.cpp" />
+    <ClCompile Include="src\cpp\ripple\rpc.cpp" />
+    <ClCompile Include="src\cpp\ripple\RPCCommands.cpp" />
+    <ClCompile Include="src\cpp\ripple\RPCDoor.cpp" />
+    <ClCompile Include="src\cpp\ripple\RPCHandler.cpp" />
+    <ClCompile Include="src\cpp\ripple\RPCServer.cpp" />
+    <ClCompile Include="src\cpp\ripple\ScriptData.cpp" />
+    <ClCompile Include="src\cpp\ripple\SerializedLedger.cpp" />
+    <ClCompile Include="src\cpp\ripple\SerializedObject.cpp" />
+    <ClCompile Include="src\cpp\ripple\SerializedTransaction.cpp" />
+    <ClCompile Include="src\cpp\ripple\SerializedTypes.cpp" />
+    <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp" />
+    <ClCompile Include="src\cpp\ripple\Serializer.cpp" />
+    <ClCompile Include="src\cpp\ripple\SHAMap.cpp" />
+    <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp" />
+    <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp" />
+    <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp" />
+    <ClCompile Include="src\cpp\ripple\SNTPClient.cpp" />
+    <ClCompile Include="src\cpp\ripple\Suppression.cpp" />
+    <ClCompile Include="src\cpp\ripple\Transaction.cpp" />
+    <ClCompile Include="src\cpp\ripple\TransactionAction.cpp" />
+    <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp" />
+    <ClCompile Include="src\cpp\ripple\TransactionErr.cpp" />
+    <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp" />
+    <ClCompile Include="src\cpp\ripple\TransactionMaster.cpp" />
+    <ClCompile Include="src\cpp\ripple\TransactionMeta.cpp" />
+    <ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp" />
+    <ClCompile Include="src\cpp\ripple\utils.cpp" />
+    <ClCompile Include="src\cpp\ripple\ValidationCollection.cpp" />
+    <ClCompile Include="src\cpp\ripple\Wallet.cpp" />
+    <ClCompile Include="src\cpp\ripple\WSConnection.cpp" />
+    <ClCompile Include="src\cpp\ripple\WSDoor.cpp" />
     <ClCompile Include="websocketpp\src\base64\base64.cpp" />
     <ClCompile Include="websocketpp\src\md5\md5.c" />
     <ClCompile Include="websocketpp\src\messages\data.cpp" />
@@ -295,10 +293,10 @@
     <None Include="newcoind.cfg" />
     <None Include="README" />
     <None Include="SConstruct" />
-    <CustomBuild Include="src\ripple.proto">
+    <CustomBuild Include="src\cpp\ripple\ripple.proto">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/code/protoc-2.4.1-win32/protoc -I=..\newcoin --cpp_out=\code\newcoin\obj\ ..\newcoin/src/ripple.proto</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\code\newcoin\obj\src\ripple.pb.h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/code/protoc-2.4.1-win32/protoc -I=..\newcoin --cpp_out=\code\newcoin\  ..\newcoin/src/cpp/ripple/ripple.proto</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\code\newcoin\src\ripple.pb.h</Outputs>
     </CustomBuild>
     <None Include="test\buster.js" />
     <None Include="test\server.js" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 090e299712..00a633269a 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -33,195 +33,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="database\sqlite3.c">
-      <Filter>Header Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="json\json_reader.cpp">
-      <Filter>Source Files\json</Filter>
-    </ClCompile>
-    <ClCompile Include="json\json_value.cpp">
-      <Filter>Source Files\json</Filter>
-    </ClCompile>
-    <ClCompile Include="json\json_writer.cpp">
-      <Filter>Source Files\json</Filter>
-    </ClCompile>
-    <ClCompile Include="src\AccountState.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Amount.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Application.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CallRPC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ConnectionPool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DBInit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DeterministicKeys.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECIES.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HashedObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HttpsClient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Ledger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LedgerAcquire.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LedgerFormats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LedgerHistory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LedgerMaster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NetworkOPs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PackedMessage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ParseSection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Peer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PeerDoor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PlatRand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PubKeyCache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\rfc1751.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\rpc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RPCCommands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RPCDoor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RPCServer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SerializedLedger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SerializedObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SerializedTransaction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SerializedTypes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SerializedValidation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Serializer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SHAMap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SHAMapDiff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SHAMapNodes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SHAMapSync.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Transaction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TransactionEngine.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TransactionFormats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TransactionMaster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UniqueNodeList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Wallet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\BitcoinUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="database\database.cpp">
-      <Filter>Source Files\database</Filter>
-    </ClCompile>
-    <ClCompile Include="database\SqliteDatabase.cpp">
-      <Filter>Source Files\database</Filter>
-    </ClCompile>
-    <ClCompile Include="database\win\windatabase.cpp">
-      <Filter>Source Files\database</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RippleState.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LedgerConsensus.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LedgerProposal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NicknameState.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CanonicalTXSet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ValidationCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Suppression.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\WSDoor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="websocketpp\src\base64\base64.cpp">
       <Filter>Source Files\websocketpp</Filter>
     </ClCompile>
@@ -246,76 +57,259 @@
     <ClCompile Include="websocketpp\src\sha1\sha1.cpp">
       <Filter>Source Files\websocketpp</Filter>
     </ClCompile>
-    <ClCompile Include="src\LedgerTiming.cpp">
+    <ClCompile Include="src\cpp\database\database.cpp">
+      <Filter>Source Files\database</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\database\SqliteDatabase.cpp">
+      <Filter>Source Files\database</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\database\win\windatabase.cpp">
+      <Filter>Source Files\database</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\json\json_reader.cpp">
+      <Filter>Source Files\json</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\json\json_value.cpp">
+      <Filter>Source Files\json</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\json\json_writer.cpp">
+      <Filter>Source Files\json</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\AccountState.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\LedgerEntrySet.cpp">
+    <ClCompile Include="src\cpp\ripple\Amount.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\TransactionMeta.cpp">
+    <ClCompile Include="src\cpp\ripple\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\SNTPClient.cpp">
+    <ClCompile Include="src\cpp\ripple\BitcoinUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Pathfinder.cpp">
+    <ClCompile Include="src\cpp\ripple\CallRPC.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\RippleLines.cpp">
+    <ClCompile Include="src\cpp\ripple\CanonicalTXSet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\OrderBookDB.cpp">
+    <ClCompile Include="src\cpp\ripple\Config.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\OrderBook.cpp">
+    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Contract.cpp">
+    <ClCompile Include="src\cpp\ripple\Contract.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Interpreter.cpp">
+    <ClCompile Include="src\cpp\ripple\DBInit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ScriptData.cpp">
+    <ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Operation.cpp">
+    <ClCompile Include="src\cpp\ripple\ECIES.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FieldNames.cpp">
+    <ClCompile Include="src\cpp\ripple\FieldNames.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\TransactionAction.cpp">
+    <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\RippleCalc.cpp">
+    <ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\TransactionErr.cpp">
+    <ClCompile Include="src\cpp\ripple\HttpsClient.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="obj\src\ripple.pb.cc">
+    <ClCompile Include="src\cpp\ripple\InstanceCounter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\HTTPRequest.cpp">
+    <ClCompile Include="src\cpp\ripple\Interpreter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\RPCHandler.cpp">
+    <ClCompile Include="src\cpp\ripple\JobQueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\RippleAddress.cpp">
+    <ClCompile Include="src\cpp\ripple\Ledger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\RangeSet.cpp">
+    <ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\JobQueue.cpp">
+    <ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\InstanceCounter.cpp">
+    <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\WSConnection.cpp">
+    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Operation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\OrderBook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PackedMessage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ParseSection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Peer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PlatRand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PubKeyCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RangeSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\rfc1751.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RippleLines.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RippleState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\rpc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RPCCommands.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RPCDoor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RPCHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RPCServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ScriptData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SerializedLedger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SerializedObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SerializedTransaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SerializedTypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Serializer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Suppression.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Transaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TransactionAction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TransactionErr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TransactionMaster.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\TransactionMeta.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ValidationCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Wallet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WSConnection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -648,6 +642,6 @@
     <None Include="test\utils.js" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="src\ripple.proto" />
+    <CustomBuild Include="src\cpp\ripple\ripple.proto" />
   </ItemGroup>
 </Project>
\ No newline at end of file