diff --git a/newcoin.sln b/newcoin.sln
index 579a2d6ab1..5d5a10582c 100644
--- a/newcoin.sln
+++ b/newcoin.sln
@@ -8,8 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newcoin", "newcoin.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "application", "..\kc\mm2\application\application.vcxproj", "{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utillib", "..\kc\utillib\utillib.vcxproj", "{6E621803-BD7C-4322-A24B-021AC361F923}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "..\protobuf-2.4.1\vsprojects\libprotobuf.vcxproj", "{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}"
 EndProject
 Global
@@ -36,14 +34,6 @@ Global
 		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.Release|Win32.Build.0 = Release|Win32
 		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.ReleaseD|Win32.ActiveCfg = ReleaseD|Win32
 		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.ReleaseD|Win32.Build.0 = ReleaseD|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.Debug|Win32.Build.0 = Debug|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.FlashDebug|Win32.ActiveCfg = FlashDebug|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.FlashDebug|Win32.Build.0 = FlashDebug|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.Release|Win32.ActiveCfg = Release|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.Release|Win32.Build.0 = Release|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.ReleaseD|Win32.ActiveCfg = ReleaseD|Win32
-		{6E621803-BD7C-4322-A24B-021AC361F923}.ReleaseD|Win32.Build.0 = ReleaseD|Win32
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.Build.0 = Debug|Win32
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.FlashDebug|Win32.ActiveCfg = Debug|Win32
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index c9038335bb..ed03f0ce12 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -84,9 +84,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="AccountState.cpp" />
     <ClCompile Include="Application.cpp" />
     <ClCompile Include="BitcoinUtil.cpp" />
-    <ClCompile Include="CallRPC.cpp" />
     <ClCompile Include="Config.cpp" />
     <ClCompile Include="ConnectionPool.cpp" />
     <ClCompile Include="Conversion.cpp" />
@@ -95,11 +95,10 @@
     <ClCompile Include="database\database.cpp" />
     <ClCompile Include="database\sqlite3.c" />
     <ClCompile Include="database\SqliteDatabase.cpp" />
-    <ClCompile Include="HttpReply.cpp" />
+    <ClCompile Include="DeterministicKeys.cpp" />
     <ClCompile Include="json\json_spirit_reader.cpp" />
     <ClCompile Include="json\json_spirit_value.cpp" />
     <ClCompile Include="json\json_spirit_writer.cpp" />
-    <ClCompile Include="keystore.cpp" />
     <ClCompile Include="KnownNodeList.cpp" />
     <ClCompile Include="Ledger.cpp" />
     <ClCompile Include="LedgerHistory.cpp" />
@@ -108,20 +107,18 @@
     <ClCompile Include="NewcoinAddress.cpp" />
     <ClCompile Include="PackedMessage.cpp" />
     <ClCompile Include="PeerDoor.cpp" />
-    <ClCompile Include="main.cpp" />
     <ClCompile Include="Peer.cpp" />
     <ClCompile Include="RequestParser.cpp" />
     <ClCompile Include="rpc.cpp" />
     <ClCompile Include="RPCServer.cpp" />
-    <ClCompile Include="RPCCommands.cpp" />
     <ClCompile Include="RPCDoor.cpp" />
-    <ClCompile Include="tests.cpp" />
+    <ClCompile Include="SHAMap.cpp" />
+    <ClCompile Include="SHAMapDiff.cpp" />
+    <ClCompile Include="SHAMapNodes.cpp" />
+    <ClCompile Include="test.cpp" />
     <ClCompile Include="TimingService.cpp" />
-    <ClCompile Include="Transaction.cpp" />
-    <ClCompile Include="TransactionBundle.cpp" />
     <ClCompile Include="UniqueNodeList.cpp" />
     <ClCompile Include="util\pugixml.cpp" />
-    <ClCompile Include="ValidationCollection.cpp" />
     <ClCompile Include="Wallet.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -202,6 +199,7 @@
     <None Include="html\newcoin.html">
       <SubType>Designer</SubType>
     </None>
+    <None Include="Makefile" />
     <None Include="nodes.xml" />
     <None Include="notes.txt" />
     <None Include="todo.txt" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 49604b9907..3887bd00a7 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -30,9 +30,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -87,36 +84,21 @@
     <ClCompile Include="json\json_spirit_writer.cpp">
       <Filter>Source Files\json</Filter>
     </ClCompile>
-    <ClCompile Include="CallRPC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="BitcoinUtil.cpp">
       <Filter>Header Files\util</Filter>
     </ClCompile>
     <ClCompile Include="RequestParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="HttpReply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RPCCommands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="RPCServer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TransactionBundle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TimingService.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="LedgerMaster.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="keystore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="NewcoinAddress.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -126,12 +108,6 @@
     <ClCompile Include="cryptopp\sha.cpp">
       <Filter>Source Files\cryptopp</Filter>
     </ClCompile>
-    <ClCompile Include="ValidationCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Transaction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="database\database.cpp">
       <Filter>Header Files\util</Filter>
     </ClCompile>
@@ -141,10 +117,25 @@
     <ClCompile Include="database\sqlite3.c">
       <Filter>Header Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="tests.cpp">
+    <ClCompile Include="Conversion.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Conversion.cpp">
+    <ClCompile Include="AccountState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DeterministicKeys.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SHAMap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SHAMapDiff.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SHAMapNodes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -269,9 +260,6 @@
     <ClInclude Include="key.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SecureAllocator.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="cryptopp\config.h">
       <Filter>Source Files\cryptopp</Filter>
     </ClInclude>
@@ -344,6 +332,9 @@
     <ClInclude Include="Conversion.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SecureAllocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="nodes.xml" />
@@ -356,6 +347,7 @@
     </None>
     <None Include="db layout.txt" />
     <None Include="todo.txt" />
+    <None Include="Makefile" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="newcoin.proto" />