diff --git a/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj b/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj
index 66b69cb4..f046316f 100644
--- a/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj
+++ b/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj
@@ -6,7 +6,7 @@
   <ToolFiles />
   <Configurations>
     <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
@@ -24,7 +24,7 @@
       <Tool Name="VCPostBuildEventTool" />
     </Configuration>
     <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
diff --git a/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj b/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj
index 38db6a49..74eab659 100644
--- a/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj
+++ b/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj
@@ -6,7 +6,7 @@
   <ToolFiles />
   <Configurations>
     <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
@@ -24,7 +24,7 @@
       <Tool Name="VCPostBuildEventTool" />
     </Configuration>
     <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
@@ -49,4 +49,4 @@
     </Filter>
   </Files>
   <Globals />
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>
diff --git a/builds/msvc/vs2008/local_thr/local_thr.vcproj b/builds/msvc/vs2008/local_thr/local_thr.vcproj
index a71f4000..b0e2b049 100644
--- a/builds/msvc/vs2008/local_thr/local_thr.vcproj
+++ b/builds/msvc/vs2008/local_thr/local_thr.vcproj
@@ -6,7 +6,7 @@
   <ToolFiles />
   <Configurations>
     <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
@@ -24,7 +24,7 @@
       <Tool Name="VCPostBuildEventTool" />
     </Configuration>
     <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
@@ -49,4 +49,4 @@
     </Filter>
   </Files>
   <Globals />
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>
diff --git a/builds/msvc/vs2008/remote_thr/remote_thr.vcproj b/builds/msvc/vs2008/remote_thr/remote_thr.vcproj
index 932fbbbf..f51fcfae 100644
--- a/builds/msvc/vs2008/remote_thr/remote_thr.vcproj
+++ b/builds/msvc/vs2008/remote_thr/remote_thr.vcproj
@@ -6,7 +6,7 @@
   <ToolFiles />
   <Configurations>
     <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
@@ -24,7 +24,7 @@
       <Tool Name="VCPostBuildEventTool" />
     </Configuration>
     <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\perf" />
+      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
       <Tool Name="VCCustomBuildTool" />
       <Tool Name="VCXMLDataGeneratorTool" />
       <Tool Name="VCMIDLTool" />
diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.props b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
index ab5eec3e..5272d1fe 100644
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
index e8009e7d..e0021d0f 100644
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.props b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
index 5f3e9edb..fe6eff71 100644
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
index 44d2c3bf..4c220b3c 100644
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/local_lat/local_lat.props b/builds/msvc/vs2010/local_lat/local_lat.props
index 50622cbd..bc65ea29 100644
--- a/builds/msvc/vs2010/local_lat/local_lat.props
+++ b/builds/msvc/vs2010/local_lat/local_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/local_lat/local_lat.vcxproj b/builds/msvc/vs2010/local_lat/local_lat.vcxproj
index 6cf6fbcd..4d7bbe26 100644
--- a/builds/msvc/vs2010/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2010/local_lat/local_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/local_thr/local_thr.props b/builds/msvc/vs2010/local_thr/local_thr.props
index b0d0bcf7..1d184517 100644
--- a/builds/msvc/vs2010/local_thr/local_thr.props
+++ b/builds/msvc/vs2010/local_thr/local_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/local_thr/local_thr.vcxproj b/builds/msvc/vs2010/local_thr/local_thr.vcxproj
index 0ecb58dc..fc2c8b9e 100644
--- a/builds/msvc/vs2010/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2010/local_thr/local_thr.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
@@ -80,4 +80,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.props b/builds/msvc/vs2010/remote_lat/remote_lat.props
index 92e71811..fbbd5aab 100644
--- a/builds/msvc/vs2010/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2010/remote_lat/remote_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
index 136e337d..e335d8d1 100644
--- a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
@@ -80,4 +80,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.props b/builds/msvc/vs2010/remote_thr/remote_thr.props
index 9b0325a7..5c4a3820 100644
--- a/builds/msvc/vs2010/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
index 4bf315a4..e52a43d8 100644
--- a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.props b/builds/msvc/vs2012/inproc_lat/inproc_lat.props
index ab5eec3e..5272d1fe 100644
--- a/builds/msvc/vs2012/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
index 42344ea8..87a160fe 100644
--- a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.props b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
index 5f3e9edb..fe6eff71 100644
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
index bf5f324d..1ef629db 100644
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/local_lat/local_lat.props b/builds/msvc/vs2012/local_lat/local_lat.props
index 50622cbd..bc65ea29 100644
--- a/builds/msvc/vs2012/local_lat/local_lat.props
+++ b/builds/msvc/vs2012/local_lat/local_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/local_lat/local_lat.vcxproj b/builds/msvc/vs2012/local_lat/local_lat.vcxproj
index 61d1c65c..401db37b 100644
--- a/builds/msvc/vs2012/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2012/local_lat/local_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/local_thr/local_thr.props b/builds/msvc/vs2012/local_thr/local_thr.props
index b0d0bcf7..1d184517 100644
--- a/builds/msvc/vs2012/local_thr/local_thr.props
+++ b/builds/msvc/vs2012/local_thr/local_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/local_thr/local_thr.vcxproj b/builds/msvc/vs2012/local_thr/local_thr.vcxproj
index 3ca5b209..817bcef6 100644
--- a/builds/msvc/vs2012/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2012/local_thr/local_thr.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
@@ -80,4 +80,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.props b/builds/msvc/vs2012/remote_lat/remote_lat.props
index 92e71811..fbbd5aab 100644
--- a/builds/msvc/vs2012/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
index e8c00158..5eb16655 100644
--- a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
@@ -80,4 +80,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.props b/builds/msvc/vs2012/remote_thr/remote_thr.props
index 9b0325a7..5c4a3820 100644
--- a/builds/msvc/vs2012/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
index 069c734e..01ac293f 100644
--- a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/inproc_lat/inproc_lat.props b/builds/msvc/vs2013/inproc_lat/inproc_lat.props
index ab5eec3e..5272d1fe 100644
--- a/builds/msvc/vs2013/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
index 764df8cb..a6a1c61b 100644
--- a/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/inproc_thr/inproc_thr.props b/builds/msvc/vs2013/inproc_thr/inproc_thr.props
index 5f3e9edb..fe6eff71 100644
--- a/builds/msvc/vs2013/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
index 49a91271..3e8f0db7 100644
--- a/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/local_lat/local_lat.props b/builds/msvc/vs2013/local_lat/local_lat.props
index 50622cbd..bc65ea29 100644
--- a/builds/msvc/vs2013/local_lat/local_lat.props
+++ b/builds/msvc/vs2013/local_lat/local_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/local_lat/local_lat.vcxproj b/builds/msvc/vs2013/local_lat/local_lat.vcxproj
index 0ad60f73..af5f1643 100644
--- a/builds/msvc/vs2013/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2013/local_lat/local_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/local_thr/local_thr.props b/builds/msvc/vs2013/local_thr/local_thr.props
index b0d0bcf7..1d184517 100644
--- a/builds/msvc/vs2013/local_thr/local_thr.props
+++ b/builds/msvc/vs2013/local_thr/local_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/local_thr/local_thr.vcxproj b/builds/msvc/vs2013/local_thr/local_thr.vcxproj
index a44968f9..66e53131 100644
--- a/builds/msvc/vs2013/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2013/local_thr/local_thr.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
@@ -80,4 +80,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/remote_lat/remote_lat.props b/builds/msvc/vs2013/remote_lat/remote_lat.props
index 92e71811..fbbd5aab 100644
--- a/builds/msvc/vs2013/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2013/remote_lat/remote_lat.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
index fd049e67..2d7834ba 100644
--- a/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
@@ -80,4 +80,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.props b/builds/msvc/vs2013/remote_thr/remote_thr.props
index 9b0325a7..5c4a3820 100644
--- a/builds/msvc/vs2013/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2013/remote_thr/remote_thr.props
@@ -11,7 +11,7 @@
 
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)perf\</Command>
+      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
     </PreBuildEvent>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@
   <!-- Messages -->
 
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)perf\platform.hpp" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
   </Target>
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
@@ -49,4 +49,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
index 7e54e6fe..e7fac4e8 100644
--- a/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\perf\platform.hpp" />
+    <ClInclude Include="..\..\..\..\src\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
@@ -76,4 +76,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
index 5c221f15..b0d6a86f 100644
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "platform.hpp"
+#include "../src/platform.hpp"
 
 #if defined ZMQ_HAVE_WINDOWS
 #include <windows.h>
diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp
index 22116fc1..f5bd8a25 100644
--- a/perf/inproc_thr.cpp
+++ b/perf/inproc_thr.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "platform.hpp"
+#include "../src/platform.hpp"
 
 #if defined ZMQ_HAVE_WINDOWS
 #include <windows.h>