diff --git a/ripple2010.vcxproj b/ripple2010.vcxproj
index c09787f99..a7f8d1599 100644
--- a/ripple2010.vcxproj
+++ b/ripple2010.vcxproj
@@ -57,6 +57,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\OpenSSL\lib\VC;..\boost_1_52_0\stage\lib;..\protobuf\vsprojects\Debug</AdditionalLibraryDirectories>
       <AdditionalDependencies>ssleay32MDd.lib;libeay32MTd.lib;libprotobuf.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)rippled.exe</OutputFile>
     </Link>
     <PreBuildEvent>
       <Command>
@@ -81,18 +82,19 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\OpenSSL\lib\VC;..\boost_1_47_0\stage\lib;..\protobuf-2.4.1\vsprojects\Release</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\OpenSSL\lib\VC;..\boost_1_52_0\stage\lib;..\protobuf\vsprojects\Release</AdditionalLibraryDirectories>
       <AdditionalDependencies>libprotobuf.lib;ssleay32MD.lib;libeay32MD.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)rippled.exe</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\database.cpp" />
     <ClCompile Include="src\cpp\database\sqlite3.c" />
     <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\AccountItems.cpp" />
     <ClCompile Include="src\cpp\ripple\AccountSetTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\AccountState.cpp" />
     <ClCompile Include="src\cpp\ripple\Amount.cpp" />
@@ -122,11 +124,13 @@
     <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\LoadManager.cpp" />
     <ClCompile Include="src\cpp\ripple\LoadMonitor.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\Offer.cpp" />
     <ClCompile Include="src\cpp\ripple\OfferCancelTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\OfferCreateTransactor.cpp" />
     <ClCompile Include="src\cpp\ripple\Operation.cpp" />
@@ -147,13 +151,13 @@
     <ClCompile Include="src\cpp\ripple\ripple.pb.cc" />
     <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\RPCDoor.cpp" />
     <ClCompile Include="src\cpp\ripple\RPCErr.cpp" />
     <ClCompile Include="src\cpp\ripple\RPCHandler.cpp" />
     <ClCompile Include="src\cpp\ripple\RPCServer.cpp" />
+    <ClCompile Include="src\cpp\ripple\RPCSub.cpp" />
     <ClCompile Include="src\cpp\ripple\ScriptData.cpp" />
     <ClCompile Include="src\cpp\ripple\SerializedLedger.cpp" />
     <ClCompile Include="src\cpp\ripple\SerializedObject.cpp" />
@@ -181,7 +185,6 @@
     <ClCompile Include="src\cpp\ripple\ValidationCollection.cpp" />
     <ClCompile Include="src\cpp\ripple\Wallet.cpp" />
     <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp" />
-    <ClCompile Include="src\cpp\ripple\WSConnection.cpp" />
     <ClCompile Include="src\cpp\ripple\WSDoor.cpp" />
     <ClCompile Include="src\cpp\websocketpp\src\base64\base64.cpp" />
     <ClCompile Include="src\cpp\websocketpp\src\md5\md5.c" />
@@ -298,8 +301,8 @@
     <None Include="SConstruct" />
     <CustomBuild Include="src\cpp\ripple\ripple.proto">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/code/protobuf/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>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../protobuf/protoc" -I=..\newcoin --cpp_out=..\newcoin\  ..\newcoin/src/cpp/ripple/ripple.proto</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\newcoin\src\ripple.pb.h</Outputs>
     </CustomBuild>
     <None Include="test\buster.js" />
     <None Include="test\server.js" />
diff --git a/ripple2010.vcxproj.filters b/ripple2010.vcxproj.filters
index 2c8ed95fc..2ac1549e3 100644
--- a/ripple2010.vcxproj.filters
+++ b/ripple2010.vcxproj.filters
@@ -39,9 +39,6 @@
     <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>
@@ -189,9 +186,6 @@
     <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>
@@ -279,9 +273,6 @@
     <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>
@@ -354,6 +345,18 @@
     <ClCompile Include="src\cpp\ripple\RPCErr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\cpp\ripple\LoadManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\AccountItems.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Offer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\RPCSub.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="util\pugiconfig.hpp">