diff --git a/build-windows/libpEpAdapter.vcxproj b/build-windows/libpEpAdapter.vcxproj
index eabd4a5..0471158 100644
--- a/build-windows/libpEpAdapter.vcxproj
+++ b/build-windows/libpEpAdapter.vcxproj
@@ -86,30 +86,31 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Adapter.cc" />
-    <ClCompile Include="..\callback_dispatcher.cc" />
-    <ClCompile Include="..\call_with_lock.cc" />
-    <ClCompile Include="..\constant_time_algo.cc" />
-    <ClCompile Include="..\message_cache.cc" />
-    <ClCompile Include="..\passphrase_cache.cc" />
-    <ClCompile Include="..\pEpLog.cc" />
-    <ClCompile Include="..\slurp.cc" />
-    <ClCompile Include="..\status_to_string.cc" />
+    <ClCompile Include="..\src\Adapter.cc" />
+    <ClCompile Include="..\src\callback_dispatcher.cc" />
+    <ClCompile Include="..\src\call_with_lock.cc" />
+    <ClCompile Include="..\src\constant_time_algo.cc" />
+    <ClCompile Include="..\src\message_cache.cc" />
+    <ClCompile Include="..\src\passphrase_cache.cc" />
+    <ClCompile Include="..\src\pEpLog.cc" />
+    <ClCompile Include="..\src\slurp.cc" />
+    <ClCompile Include="..\src\status_to_string.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Adapter.hh" />
-    <ClInclude Include="..\Adapter.hxx" />
-    <ClInclude Include="..\callback_dispatcher.hh" />
-    <ClInclude Include="..\constant_time_algo.hh" />
-    <ClInclude Include="..\locked_queue.hh" />
-    <ClInclude Include="..\message_cache.hh" />
-    <ClInclude Include="..\passphrase_cache.hh" />
-    <ClInclude Include="..\passphrase_cache.hxx" />
-    <ClInclude Include="..\pc_container.hh" />
-    <ClInclude Include="..\pEpLog.hh" />
-    <ClInclude Include="..\Semaphore.hh" />
-    <ClInclude Include="..\slurp.hh" />
-    <ClInclude Include="..\status_to_string.hh" />
+    <ClInclude Include="..\src\Adapter.hh" />
+    <ClInclude Include="..\src\Adapter.hxx" />
+    <ClInclude Include="..\src\callback_dispatcher.hh" />
+    <ClInclude Include="..\src\call_with_lock.hh" />
+    <ClInclude Include="..\src\constant_time_algo.hh" />
+    <ClInclude Include="..\src\locked_queue.hh" />
+    <ClInclude Include="..\src\message_cache.hh" />
+    <ClInclude Include="..\src\passphrase_cache.hh" />
+    <ClInclude Include="..\src\passphrase_cache.hxx" />
+    <ClInclude Include="..\src\pc_container.hh" />
+    <ClInclude Include="..\src\pEpLog.hh" />
+    <ClInclude Include="..\src\Semaphore.hh" />
+    <ClInclude Include="..\src\slurp.hh" />
+    <ClInclude Include="..\src\status_to_string.hh" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\pEpEngine\build-windows\pEpEngine.vcxproj">
diff --git a/build-windows/libpEpAdapter.vcxproj.filters b/build-windows/libpEpAdapter.vcxproj.filters
index ccbd6b4..1b95d5f 100644
--- a/build-windows/libpEpAdapter.vcxproj.filters
+++ b/build-windows/libpEpAdapter.vcxproj.filters
@@ -18,72 +18,75 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Adapter.cc">
+    <ClCompile Include="..\src\Adapter.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\status_to_string.cc">
+    <ClCompile Include="..\src\call_with_lock.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\call_with_lock.cc">
+    <ClCompile Include="..\src\callback_dispatcher.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\slurp.cc">
+    <ClCompile Include="..\src\constant_time_algo.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\passphrase_cache.cc">
+    <ClCompile Include="..\src\message_cache.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\callback_dispatcher.cc">
+    <ClCompile Include="..\src\passphrase_cache.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\message_cache.cc">
+    <ClCompile Include="..\src\pEpLog.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\constant_time_algo.cc">
+    <ClCompile Include="..\src\slurp.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\pEpLog.cc">
+    <ClCompile Include="..\src\status_to_string.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Adapter.hh">
+    <ClInclude Include="..\src\call_with_lock.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\locked_queue.hh">
+    <ClInclude Include="..\src\Adapter.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\pc_container.hh">
+    <ClInclude Include="..\src\Adapter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Adapter.hxx">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\src\callback_dispatcher.hh">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\constant_time_algo.hh">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\status_to_string.hh">
+    <ClInclude Include="..\src\locked_queue.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\slurp.hh">
+    <ClInclude Include="..\src\message_cache.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\passphrase_cache.hh">
+    <ClInclude Include="..\src\passphrase_cache.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\passphrase_cache.hxx">
+    <ClInclude Include="..\src\passphrase_cache.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\callback_dispatcher.hh">
+    <ClInclude Include="..\src\pc_container.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Semaphore.hh">
+    <ClInclude Include="..\src\pEpLog.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\message_cache.hh">
+    <ClInclude Include="..\src\Semaphore.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\constant_time_algo.hh">
+    <ClInclude Include="..\src\slurp.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\pEpLog.hh">
+    <ClInclude Include="..\src\status_to_string.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>