15 files changed, 24 insertions, 24 deletions
diff --git a/plugins/ContactsPlus/contacts.vcxproj b/plugins/ContactsPlus/contacts.vcxproj
index 57d0cfbacb..1ebfa955a2 100644
--- a/plugins/ContactsPlus/contacts.vcxproj
+++ b/plugins/ContactsPlus/contacts.vcxproj
@@ -173,23 +173,23 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="contacts.cpp" />
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\contacts.cpp" />
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="receive.cpp" />
-    <ClCompile Include="send.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\receive.cpp" />
+    <ClCompile Include="src\send.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contacts.h" />
-    <ClInclude Include="receive.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="send.h" />
-    <ClInclude Include="utils.h" />
+    <ClInclude Include="src\contacts.h" />
+    <ClInclude Include="src\receive.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\send.h" />
+    <ClInclude Include="src\utils.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="contacts.rc" />
+    <ResourceCompile Include="res\contacts.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/ContactsPlus/contacts.vcxproj.filters b/plugins/ContactsPlus/contacts.vcxproj.filters
index 8270d92a72..f0fb5d4da0 100644
--- a/plugins/ContactsPlus/contacts.vcxproj.filters
+++ b/plugins/ContactsPlus/contacts.vcxproj.filters
@@ -15,41 +15,41 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="contacts.cpp">
+    <ClCompile Include="src\contacts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="receive.cpp">
+    <ClCompile Include="src\receive.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="send.cpp">
+    <ClCompile Include="src\send.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contacts.h">
+    <ClInclude Include="src\contacts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="receive.h">
+    <ClInclude Include="src\receive.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="send.h">
+    <ClInclude Include="src\send.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
+    <ClInclude Include="src\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="contacts.rc">
+    <ResourceCompile Include="res\contacts.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/ContactsPlus/contactsplus-translation.txt b/plugins/ContactsPlus/docs/contactsplus-translation.txt
index 373fe04d50..373fe04d50 100644
--- a/plugins/ContactsPlus/contactsplus-translation.txt
+++ b/plugins/ContactsPlus/docs/contactsplus-translation.txt
diff --git a/plugins/ContactsPlus/readme_contacts.txt b/plugins/ContactsPlus/docs/readme_contacts.txt
index f3ae933be3..f3ae933be3 100644
--- a/plugins/ContactsPlus/readme_contacts.txt
+++ b/plugins/ContactsPlus/docs/readme_contacts.txt
diff --git a/plugins/ContactsPlus/contacts.rc b/plugins/ContactsPlus/res/contacts.rc
index 3edfca49c4..b4c974d043 100644
--- a/plugins/ContactsPlus/contacts.rc
+++ b/plugins/ContactsPlus/res/contacts.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 #include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -186,6 +186,6 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_CONTACTS            ICON    DISCARDABLE     "res\\SendContacts.ico"
+IDI_CONTACTS            ICON     "SendContacts.ico"
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ContactsPlus/contacts.cpp b/plugins/ContactsPlus/src/contacts.cpp
index a7ba2cdfbb..a7ba2cdfbb 100644
--- a/plugins/ContactsPlus/contacts.cpp
+++ b/plugins/ContactsPlus/src/contacts.cpp
diff --git a/plugins/ContactsPlus/contacts.h b/plugins/ContactsPlus/src/contacts.h
index 742f577924..742f577924 100644
--- a/plugins/ContactsPlus/contacts.h
+++ b/plugins/ContactsPlus/src/contacts.h
diff --git a/plugins/ContactsPlus/main.cpp b/plugins/ContactsPlus/src/main.cpp
index da43554c29..da43554c29 100644
--- a/plugins/ContactsPlus/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
diff --git a/plugins/ContactsPlus/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 3d3fb2f773..3d3fb2f773 100644
--- a/plugins/ContactsPlus/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
diff --git a/plugins/ContactsPlus/receive.h b/plugins/ContactsPlus/src/receive.h
index fe35d94be6..fe35d94be6 100644
--- a/plugins/ContactsPlus/receive.h
+++ b/plugins/ContactsPlus/src/receive.h
diff --git a/plugins/ContactsPlus/resource.h b/plugins/ContactsPlus/src/resource.h
index e4ed78f866..e4ed78f866 100644
--- a/plugins/ContactsPlus/resource.h
+++ b/plugins/ContactsPlus/src/resource.h
diff --git a/plugins/ContactsPlus/send.cpp b/plugins/ContactsPlus/src/send.cpp
index ac042fa63e..ac042fa63e 100644
--- a/plugins/ContactsPlus/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
diff --git a/plugins/ContactsPlus/send.h b/plugins/ContactsPlus/src/send.h
index c8580a4eb1..c8580a4eb1 100644
--- a/plugins/ContactsPlus/send.h
+++ b/plugins/ContactsPlus/src/send.h
diff --git a/plugins/ContactsPlus/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index 1838b3bea8..1838b3bea8 100644
--- a/plugins/ContactsPlus/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
diff --git a/plugins/ContactsPlus/utils.h b/plugins/ContactsPlus/src/utils.h
index 3bc2d8e00d..3bc2d8e00d 100644
--- a/plugins/ContactsPlus/utils.h
+++ b/plugins/ContactsPlus/src/utils.h