14 files changed, 29 insertions, 29 deletions
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
index c5690ca2b9..c1e90d0cc9 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
@@ -77,7 +77,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -99,7 +99,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -124,7 +124,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
@@ -152,7 +152,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\Common.h</PrecompiledHeaderFile>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
@@ -170,33 +170,33 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="ClientChangeNotify.cpp">
+    <ClCompile Include="src\ClientChangeNotify.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\CommonLibs\CString.cpp" />
-    <ClCompile Include="OptDlg.cpp" />
+    <ClCompile Include="src\OptDlg.cpp" />
     <ClCompile Include="..\CommonLibs\Options.cpp" />
     <ClCompile Include="..\CommonLibs\pcre.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Common.h" />
+    <ClInclude Include="src\Common.h" />
     <ClInclude Include="..\CommonLibs\CString.h" />
-    <ClInclude Include="Misc.h" />
+    <ClInclude Include="src\Misc.h" />
     <ClInclude Include="..\CommonLibs\Options.h" />
     <ClInclude Include="..\CommonLibs\pcre.h" />
     <ClInclude Include="..\CommonLibs\pcre_main.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\resource.h" />
     <ClInclude Include="..\CommonLibs\TMyArray.h" />
-    <ClInclude Include="VersionNo.h" />
+    <ClInclude Include="src\VersionNo.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resources.rc" />
+    <ResourceCompile Include="res\Resources.rc" />
+    <ResourceCompile Include="res\Resources.rc2" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources.rc2" />
-    <None Include="ccn_readme.txt" />
-    <None Include="ccn_translation.txt" />
-    <None Include="copying.txt" />
+    <None Include="docs\ccn_readme.txt" />
+    <None Include="docs\ccn_translation.txt" />
+    <None Include="docs\copying.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
index b711c6c5e0..8fc754f832 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
@@ -18,13 +18,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ClientChangeNotify.cpp">
+    <ClCompile Include="src\ClientChangeNotify.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\CommonLibs\CString.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OptDlg.cpp">
+    <ClCompile Include="src\OptDlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\CommonLibs\Options.cpp">
@@ -35,13 +35,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Common.h">
+    <ClInclude Include="src\Common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\CommonLibs\CString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Misc.h">
+    <ClInclude Include="src\Misc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\CommonLibs\Options.h">
@@ -53,32 +53,32 @@
     <ClInclude Include="..\CommonLibs\pcre_main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\CommonLibs\TMyArray.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="VersionNo.h">
+    <ClInclude Include="src\VersionNo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resources.rc">
+    <ResourceCompile Include="res\Resources.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources.rc2">
+    <None Include="res\Resources.rc2">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="ccn_readme.txt">
+    <None Include="docs\ccn_readme.txt">
       <Filter>Documentation</Filter>
     </None>
-    <None Include="ccn_translation.txt">
+    <None Include="docs\ccn_translation.txt">
       <Filter>Documentation</Filter>
     </None>
-    <None Include="copying.txt">
+    <None Include="docs\copying.txt">
       <Filter>Documentation</Filter>
     </None>
   </ItemGroup>
diff --git a/plugins/ClientChangeNotify/ccn_readme.txt b/plugins/ClientChangeNotify/docs/ccn_readme.txt
index a365ce067c..a365ce067c 100644
--- a/plugins/ClientChangeNotify/ccn_readme.txt
+++ b/plugins/ClientChangeNotify/docs/ccn_readme.txt
diff --git a/plugins/ClientChangeNotify/ccn_translation.txt b/plugins/ClientChangeNotify/docs/ccn_translation.txt
index b58634963d..b58634963d 100644
--- a/plugins/ClientChangeNotify/ccn_translation.txt
+++ b/plugins/ClientChangeNotify/docs/ccn_translation.txt
diff --git a/plugins/ClientChangeNotify/clientchangenotify-translation.txt b/plugins/ClientChangeNotify/docs/clientchangenotify-translation.txt
index 10d2bee431..10d2bee431 100644
--- a/plugins/ClientChangeNotify/clientchangenotify-translation.txt
+++ b/plugins/ClientChangeNotify/docs/clientchangenotify-translation.txt
diff --git a/plugins/ClientChangeNotify/copying.txt b/plugins/ClientChangeNotify/docs/copying.txt
index 45645b4b53..45645b4b53 100644
--- a/plugins/ClientChangeNotify/copying.txt
+++ b/plugins/ClientChangeNotify/docs/copying.txt
diff --git a/plugins/ClientChangeNotify/Resources.rc b/plugins/ClientChangeNotify/res/Resources.rc
index f1f5ebd0a1..2f76a307d9 100644
--- a/plugins/ClientChangeNotify/Resources.rc
+++ b/plugins/ClientChangeNotify/res/Resources.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\src\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/ClientChangeNotify/Resources.rc2 b/plugins/ClientChangeNotify/res/Resources.rc2
index 7a6a4c4a18..ecb7a2de3a 100644
--- a/plugins/ClientChangeNotify/Resources.rc2
+++ b/plugins/ClientChangeNotify/res/Resources.rc2
@@ -15,7 +15,7 @@
 //
 // Version
 //
-#include "VersionNo.h"
+#include "..\src\VersionNo.h"
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
  PRODUCTVERSION __FILEVERSION_STRING
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 3318c3ec92..3318c3ec92 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
diff --git a/plugins/ClientChangeNotify/Common.h b/plugins/ClientChangeNotify/src/Common.h
index 62d41732a7..62d41732a7 100644
--- a/plugins/ClientChangeNotify/Common.h
+++ b/plugins/ClientChangeNotify/src/Common.h
diff --git a/plugins/ClientChangeNotify/Misc.h b/plugins/ClientChangeNotify/src/Misc.h
index 262193dc26..262193dc26 100644
--- a/plugins/ClientChangeNotify/Misc.h
+++ b/plugins/ClientChangeNotify/src/Misc.h
diff --git a/plugins/ClientChangeNotify/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp
index 164e51e795..164e51e795 100644
--- a/plugins/ClientChangeNotify/OptDlg.cpp
+++ b/plugins/ClientChangeNotify/src/OptDlg.cpp
diff --git a/plugins/ClientChangeNotify/VersionNo.h b/plugins/ClientChangeNotify/src/VersionNo.h
index 13ba7afb9f..13ba7afb9f 100644
--- a/plugins/ClientChangeNotify/VersionNo.h
+++ b/plugins/ClientChangeNotify/src/VersionNo.h
diff --git a/plugins/ClientChangeNotify/resource.h b/plugins/ClientChangeNotify/src/resource.h
index e9a86ee449..e9a86ee449 100644
--- a/plugins/ClientChangeNotify/resource.h
+++ b/plugins/ClientChangeNotify/src/resource.h