11 files changed, 21 insertions, 21 deletions
diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj b/plugins/AddContactPlus/addcontactplus_10.vcxproj
index cd1cbd5430..e443dc3069 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj
@@ -75,7 +75,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -103,7 +103,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -133,7 +133,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;UNICODE;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -161,7 +161,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;UNICODE;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -185,19 +185,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="addcontact.cpp" />
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="src\addcontact.cpp" />
+    <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="addcontactplus.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="res\addcontactplus.h" />
+    <ClInclude Include="res\Version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="contact_add.ico" />
+    <None Include="res\contact_add.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-    <ResourceCompile Include="Version.rc" />
+    <ResourceCompile Include="res\resource.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters b/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
index b87d889578..2dacf09fed 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj.filters
@@ -15,31 +15,31 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="addcontact.cpp">
+    <ClCompile Include="src\addcontact.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="addcontactplus.h">
+    <ClInclude Include="src\addcontactplus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Version.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="contact_add.ico">
+    <None Include="rs\contact_add.ico">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="Version.rc">
+    <ResourceCompile Include="res\Version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/AddContactPlus/addcontactplus-translation.txt b/plugins/AddContactPlus/docs/addcontactplus-translation.txt
index 38432dbe43..38432dbe43 100644
--- a/plugins/AddContactPlus/addcontactplus-translation.txt
+++ b/plugins/AddContactPlus/docs/addcontactplus-translation.txt
diff --git a/plugins/AddContactPlus/Version.rc b/plugins/AddContactPlus/res/Version.rc
index e637f0cb33..700fecb1fc 100644
--- a/plugins/AddContactPlus/Version.rc
+++ b/plugins/AddContactPlus/res/Version.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/AddContactPlus/contact_add.ico b/plugins/AddContactPlus/res/contact_add.ico
index 53788e9990..53788e9990 100644
--- a/plugins/AddContactPlus/contact_add.ico
+++ b/plugins/AddContactPlus/res/contact_add.ico
diff --git a/plugins/AddContactPlus/resource.rc b/plugins/AddContactPlus/res/resource.rc
index 932df05741..098ea223a5 100644
--- a/plugins/AddContactPlus/resource.rc
+++ b/plugins/AddContactPlus/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 1 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "resource.h\0"
+    "..\src\resource.h\0"
 END
 
 2 TEXTINCLUDE DISCARDABLE 
diff --git a/plugins/AddContactPlus/Version.h b/plugins/AddContactPlus/src/Version.h
index fa45898d07..fa45898d07 100644
--- a/plugins/AddContactPlus/Version.h
+++ b/plugins/AddContactPlus/src/Version.h
diff --git a/plugins/AddContactPlus/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp
index a2feb5c449..a2feb5c449 100644
--- a/plugins/AddContactPlus/addcontact.cpp
+++ b/plugins/AddContactPlus/src/addcontact.cpp
diff --git a/plugins/AddContactPlus/addcontactplus.h b/plugins/AddContactPlus/src/addcontactplus.h
index 6e9d90e9fd..6e9d90e9fd 100644
--- a/plugins/AddContactPlus/addcontactplus.h
+++ b/plugins/AddContactPlus/src/addcontactplus.h
diff --git a/plugins/AddContactPlus/main.cpp b/plugins/AddContactPlus/src/main.cpp
index 56d8b0ad1b..56d8b0ad1b 100644
--- a/plugins/AddContactPlus/main.cpp
+++ b/plugins/AddContactPlus/src/main.cpp
diff --git a/plugins/AddContactPlus/resource.h b/plugins/AddContactPlus/src/resource.h
index b796c401d0..b796c401d0 100644
--- a/plugins/AddContactPlus/resource.h
+++ b/plugins/AddContactPlus/src/resource.h