        <Filter>src\cpp\common</Filter>
      </ClCompile>
 -    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\async_generic_service.cc">
--      <Filter>src\cpp\server</Filter>
--    </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\async_generic_service.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\create_default_thread_pool.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\insecure_server_credentials.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\dynamic_thread_pool.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\insecure_server_credentials.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\insecure_server_credentials.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_context.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_builder.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_credentials.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_context.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_context.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
--    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_posix.cc">
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_credentials.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_credentials.cc">
        <Filter>src\cpp\server</Filter>
      </ClCompile>
+-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_posix.cc">
+-      <Filter>src\cpp\server</Filter>
+-    </ClCompile>
 -    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\byte_buffer.cc">
 +    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\byte_buffer.cc">
        <Filter>src\cpp\util</Filter>

-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_no_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_stream.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\time.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer_reader.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\compression_types.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\grpc_types.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\propagation_bits.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\status.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\alarm.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\channel.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\client_context.h" />

+</Project>
\ No newline at end of file
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index 51f2107..d95a974
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -1,6 +1,6 @@
