diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj
index 66efe7dc2..b4624f962 100644
--- a/windows/LibEthereum.vcxproj
+++ b/windows/LibEthereum.vcxproj
@@ -125,7 +125,6 @@
     <ClCompile Include="..\libethereum\Transaction.cpp" />
     <ClCompile Include="..\libethereum\TransactionQueue.cpp" />
     <ClCompile Include="..\libethereum\Utility.cpp" />
-    <ClCompile Include="..\libethereum\VMFactory.cpp" />
     <ClCompile Include="..\libevmcore\Assembly.cpp" />
     <ClCompile Include="..\libevmcore\Instruction.cpp" />
     <ClCompile Include="..\libevm\ExtVMFace.cpp">
@@ -146,7 +145,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\libevm\VMFace.cpp" />
+    <ClCompile Include="..\libevm\VMFactory.cpp" />
     <ClCompile Include="..\libevm\_libevm.cpp" />
     <ClCompile Include="..\liblll\CodeFragment.cpp" />
     <ClCompile Include="..\liblll\Compiler.cpp" />
@@ -170,6 +169,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\libp2p\Network.cpp" />
     <ClCompile Include="..\libp2p\Session.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -343,7 +343,6 @@
     <ClInclude Include="..\libethereum\Transaction.h" />
     <ClInclude Include="..\libethereum\TransactionQueue.h" />
     <ClInclude Include="..\libethereum\Utility.h" />
-    <ClInclude Include="..\libethereum\VMFactory.h" />
     <ClInclude Include="..\libevmcore\Assembly.h" />
     <ClInclude Include="..\libevmcore\Exceptions.h" />
     <ClInclude Include="..\libevmcore\Instruction.h" />
@@ -372,6 +371,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\libevm\VMFace.h" />
+    <ClInclude Include="..\libevm\VMFactory.h" />
     <ClInclude Include="..\liblll\All.h" />
     <ClInclude Include="..\liblll\CodeFragment.h" />
     <ClInclude Include="..\liblll\Compiler.h" />
@@ -408,6 +408,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\libp2p\Network.h" />
     <ClInclude Include="..\libp2p\Session.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/windows/LibEthereum.vcxproj.filters b/windows/LibEthereum.vcxproj.filters
index 76201d823..e70393706 100644
--- a/windows/LibEthereum.vcxproj.filters
+++ b/windows/LibEthereum.vcxproj.filters
@@ -198,6 +198,12 @@
     </ClCompile>
     <ClCompile Include="..\libdevcrypto\AES.cpp" />
     <ClCompile Include="..\libdevcrypto\ECDHE.cpp" />
+    <ClCompile Include="..\libevm\VMFactory.cpp">
+      <Filter>libevm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libp2p\Network.cpp">
+      <Filter>libp2p</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -437,6 +443,12 @@
     <ClInclude Include="..\libevm\VMFace.h">
       <Filter>libevm</Filter>
     </ClInclude>
+    <ClInclude Include="..\libevm\VMFactory.h">
+      <Filter>libevm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libp2p\Network.h">
+      <Filter>libp2p</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Windows">
diff --git a/windows/LibEvmJit.vcxproj b/windows/LibEvmJit.vcxproj
index 077757aab..c3b1f65a7 100644
--- a/windows/LibEvmJit.vcxproj
+++ b/windows/LibEvmJit.vcxproj
@@ -130,6 +130,7 @@
   <ItemGroup>
     <ClCompile Include="..\evmjit\libevmjit\Arith256.cpp" />
     <ClCompile Include="..\evmjit\libevmjit\BasicBlock.cpp" />
+    <ClCompile Include="..\evmjit\libevmjit\Cache.cpp" />
     <ClCompile Include="..\evmjit\libevmjit\Compiler.cpp" />
     <ClCompile Include="..\evmjit\libevmjit\CompilerHelper.cpp" />
     <ClCompile Include="..\evmjit\libevmjit\Endianness.cpp" />
@@ -147,6 +148,7 @@
   <ItemGroup>
     <ClInclude Include="..\evmjit\libevmjit\Arith256.h" />
     <ClInclude Include="..\evmjit\libevmjit\BasicBlock.h" />
+    <ClInclude Include="..\evmjit\libevmjit\Cache.h" />
     <ClInclude Include="..\evmjit\libevmjit\Common.h" />
     <ClInclude Include="..\evmjit\libevmjit\Compiler.h" />
     <ClInclude Include="..\evmjit\libevmjit\CompilerHelper.h" />
diff --git a/windows/LibEvmJit.vcxproj.filters b/windows/LibEvmJit.vcxproj.filters
index 06f1ed308..88dc8d329 100644
--- a/windows/LibEvmJit.vcxproj.filters
+++ b/windows/LibEvmJit.vcxproj.filters
@@ -16,6 +16,7 @@
     <ClCompile Include="..\evmjit\libevmjit\Stack.cpp" />
     <ClCompile Include="..\evmjit\libevmjit\Type.cpp" />
     <ClCompile Include="..\evmjit\libevmjit\Utils.cpp" />
+    <ClCompile Include="..\evmjit\libevmjit\Cache.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\evmjit\libevmjit\Arith256.h" />
@@ -35,6 +36,7 @@
     <ClInclude Include="..\evmjit\libevmjit\Stack.h" />
     <ClInclude Include="..\evmjit\libevmjit\Type.h" />
     <ClInclude Include="..\evmjit\libevmjit\Utils.h" />
+    <ClInclude Include="..\evmjit\libevmjit\Cache.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\evmjit\libevmjit\CMakeLists.txt" />