55 files changed, 121 insertions, 137 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
diff --git a/plugins/CountryFlags/countryflags-translation.txt b/plugins/CountryFlags/docs/countryflags-translation.txt
index 6643235c2a..6643235c2a 100644
--- a/plugins/CountryFlags/countryflags-translation.txt
+++ b/plugins/CountryFlags/docs/countryflags-translation.txt
diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj
index 62dd7df548..ef1c334390 100644
--- a/plugins/CountryFlags/flags.vcxproj
+++ b/plugins/CountryFlags/flags.vcxproj
@@ -82,7 +82,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -107,7 +107,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -133,7 +133,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -161,7 +161,7 @@
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -177,18 +177,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="countrylistext.cpp" />
-    <ClCompile Include="extraimg.cpp" />
-    <ClCompile Include="huffman.cpp" />
-    <ClCompile Include="icons.cpp" />
-    <ClCompile Include="ip2country.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\countrylistext.cpp" />
+    <ClCompile Include="src\extraimg.cpp" />
+    <ClCompile Include="src\huffman.cpp" />
+    <ClCompile Include="src\icons.cpp" />
+    <ClCompile Include="src\ip2country.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="flags.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\flags.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="res\flags.bmp" />
@@ -203,7 +203,8 @@
     <CustomBuild Include="docs\License_Appendix.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.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/CountryFlags/flags.vcxproj.filters b/plugins/CountryFlags/flags.vcxproj.filters
index 1d3dd91efb..9d5d5b9f0f 100644
--- a/plugins/CountryFlags/flags.vcxproj.filters
+++ b/plugins/CountryFlags/flags.vcxproj.filters
@@ -19,41 +19,44 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="countrylistext.cpp">
+    <ClCompile Include="src\countrylistext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="extraimg.cpp">
+    <ClCompile Include="src\extraimg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="huffman.cpp">
+    <ClCompile Include="src\huffman.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="icons.cpp">
+    <ClCompile Include="src\icons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ip2country.cpp">
+    <ClCompile Include="src\ip2country.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="flags.h">
+    <ClInclude Include="src\flags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/CountryFlags/resource.rc b/plugins/CountryFlags/res/resource.rc
index eba35cb8e3..55e9f5e20d 100644
--- a/plugins/CountryFlags/resource.rc
+++ b/plugins/CountryFlags/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -38,12 +38,6 @@ BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
-    "#include ""version.rc""\r\n"
-    "\0"
-END
-
 #endif    // APSTUDIO_INVOKED
 
 
@@ -52,14 +46,14 @@ END
 // Bitmap
 //
 
-IDB_FLAGS               BITMAP  DISCARDABLE     "res/flags.bmp"
+IDB_FLAGS               BITMAP     "flags.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // BIN
 //
 
-IDR_IPTOCOUNTRY         BIN     DISCARDABLE     "res/ip-to-country.bin"
+IDR_IPTOCOUNTRY         BIN     "ip-to-country.bin"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -117,11 +111,6 @@ END
 
 
 #ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "version.rc"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
diff --git a/plugins/CountryFlags/version.rc b/plugins/CountryFlags/res/version.rc
index a381dfefd2..73ff5ab9ea 100644
--- a/plugins/CountryFlags/version.rc
+++ b/plugins/CountryFlags/res/version.rc
@@ -2,9 +2,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#ifndef _MAC 
-
-#include <version.h>
+#include <..\src\version.h>
 
 ///////////////////////////////////////////////////////////////////////////// 
 //                                                                            
@@ -43,9 +41,3 @@ BEGIN
         VALUE "Translation", 0x0, 1200
     END
 END
-                                                                             
-#endif    // !_MAC                 
-                                   
-                                                                        
-                               
-                                                                              
diff --git a/plugins/CountryFlags/countrylistext.cpp b/plugins/CountryFlags/src/countrylistext.cpp
index 95f692b30b..95f692b30b 100644
--- a/plugins/CountryFlags/countrylistext.cpp
+++ b/plugins/CountryFlags/src/countrylistext.cpp
diff --git a/plugins/CountryFlags/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index f019827e21..f019827e21 100644
--- a/plugins/CountryFlags/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
diff --git a/plugins/CountryFlags/flags.h b/plugins/CountryFlags/src/flags.h
index c91876bd97..c91876bd97 100644
--- a/plugins/CountryFlags/flags.h
+++ b/plugins/CountryFlags/src/flags.h
diff --git a/plugins/CountryFlags/huffman.cpp b/plugins/CountryFlags/src/huffman.cpp
index c460e9a66e..c460e9a66e 100644
--- a/plugins/CountryFlags/huffman.cpp
+++ b/plugins/CountryFlags/src/huffman.cpp
diff --git a/plugins/CountryFlags/icons.cpp b/plugins/CountryFlags/src/icons.cpp
index 3b456a4d11..3b456a4d11 100644
--- a/plugins/CountryFlags/icons.cpp
+++ b/plugins/CountryFlags/src/icons.cpp
diff --git a/plugins/CountryFlags/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp
index 12f3406a11..12f3406a11 100644
--- a/plugins/CountryFlags/ip2country.cpp
+++ b/plugins/CountryFlags/src/ip2country.cpp
diff --git a/plugins/CountryFlags/main.cpp b/plugins/CountryFlags/src/main.cpp
index 462672292a..462672292a 100644
--- a/plugins/CountryFlags/main.cpp
+++ b/plugins/CountryFlags/src/main.cpp
diff --git a/plugins/CountryFlags/resource.h b/plugins/CountryFlags/src/resource.h
index a2cd0496d8..a2cd0496d8 100644
--- a/plugins/CountryFlags/resource.h
+++ b/plugins/CountryFlags/src/resource.h
diff --git a/plugins/CountryFlags/utils.cpp b/plugins/CountryFlags/src/utils.cpp
index b55e52e5cf..b55e52e5cf 100644
--- a/plugins/CountryFlags/utils.cpp
+++ b/plugins/CountryFlags/src/utils.cpp
diff --git a/plugins/CountryFlags/version.h b/plugins/CountryFlags/src/version.h
index a778ed0026..a778ed0026 100644
--- a/plugins/CountryFlags/version.h
+++ b/plugins/CountryFlags/src/version.h
diff --git a/plugins/CrashDumper/crshdmp_10.vcxproj b/plugins/CrashDumper/crshdmp_10.vcxproj
index b074fccf24..6ab4a005c3 100644
--- a/plugins/CrashDumper/crshdmp_10.vcxproj
+++ b/plugins/CrashDumper/crshdmp_10.vcxproj
@@ -187,32 +187,25 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="bkstring.cpp" />
-    <ClCompile Include="crshdmp.cpp" />
-    <ClCompile Include="crshdmp_icons.cpp" />
-    <ClCompile Include="dumper.cpp" />
-    <ClCompile Include="exhndlr.cpp" />
-    <ClCompile Include="ui.cpp" />
-    <ClCompile Include="upload.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\bkstring.cpp" />
+    <ClCompile Include="src\crshdmp.cpp" />
+    <ClCompile Include="src\crshdmp_icons.cpp" />
+    <ClCompile Include="src\dumper.cpp" />
+    <ClCompile Include="src\exhndlr.cpp" />
+    <ClCompile Include="src\ui.cpp" />
+    <ClCompile Include="src\upload.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="bkstring.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="sdkstuff.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\bkstring.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\sdkstuff.h" />
+    <ClInclude Include="src\utils.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="crshdmp.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Vi show.ico" />
-    <None Include="Vi to clipboard.ico" />
-    <None Include="Vi to file.ico" />
-    <None Include="Vi upload.ico" />
-    <None Include="Vi.ico" />
-    <None Include="crshdmp_readme.txt" />
+    <ResourceCompile Include="res\crshdmp.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/CrashDumper/crshdmp_readme.txt b/plugins/CrashDumper/docs/crshdmp_readme.txt
index f4e1ff92ac..f4e1ff92ac 100644
--- a/plugins/CrashDumper/crshdmp_readme.txt
+++ b/plugins/CrashDumper/docs/crshdmp_readme.txt
diff --git a/plugins/CrashDumper/svc_crshdmp-translation.txt b/plugins/CrashDumper/docs/svc_crshdmp-translation.txt
index 18d251f699..18d251f699 100644
--- a/plugins/CrashDumper/svc_crshdmp-translation.txt
+++ b/plugins/CrashDumper/docs/svc_crshdmp-translation.txt
diff --git a/plugins/CrashDumper/res/Version.rc b/plugins/CrashDumper/res/Version.rc
new file mode 100644
index 0000000000..c3c4f27aa3
--- /dev/null
+++ b/plugins/CrashDumper/res/Version.rc
@@ -0,0 +1,45 @@
+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "afxres.h"
+#include "..\src\version.h"
+
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#endif //_WIN32
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Boris Krasnovskiy"
+            VALUE "FileDescription", "Crash Dumper plugin for Miranda IM."
+            VALUE "FileVersion", __VERSION_STRING
+            VALUE "InternalName", "svc_crshdmp"
+            VALUE "LegalCopyright", "Copyright� 2008 - 2012 Boris Krasnovskiy All Rights Reserved"
+            VALUE "OriginalFilename", "svc_crshdmp.dll"
+            VALUE "ProductName", "Crash Dumper"
+            VALUE "ProductVersion", __VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/plugins/CrashDumper/Vi show.ico b/plugins/CrashDumper/res/Vi show.ico
index 55556862f3..55556862f3 100644
--- a/plugins/CrashDumper/Vi show.ico
+++ b/plugins/CrashDumper/res/Vi show.ico
diff --git a/plugins/CrashDumper/Vi to clipboard.ico b/plugins/CrashDumper/res/Vi to clipboard.ico
index 6f095b59b1..6f095b59b1 100644
--- a/plugins/CrashDumper/Vi to clipboard.ico
+++ b/plugins/CrashDumper/res/Vi to clipboard.ico
diff --git a/plugins/CrashDumper/Vi to file.ico b/plugins/CrashDumper/res/Vi to file.ico
index abfc196437..abfc196437 100644
--- a/plugins/CrashDumper/Vi to file.ico
+++ b/plugins/CrashDumper/res/Vi to file.ico
diff --git a/plugins/CrashDumper/Vi upload.ico b/plugins/CrashDumper/res/Vi upload.ico
index 4c562b02b8..4c562b02b8 100644
--- a/plugins/CrashDumper/Vi upload.ico
+++ b/plugins/CrashDumper/res/Vi upload.ico
diff --git a/plugins/CrashDumper/Vi.ico b/plugins/CrashDumper/res/Vi.ico
index 371aeb345e..371aeb345e 100644
--- a/plugins/CrashDumper/Vi.ico
+++ b/plugins/CrashDumper/res/Vi.ico
diff --git a/plugins/CrashDumper/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc
index ca4c05bbb3..5b5e024260 100644
--- a/plugins/CrashDumper/crshdmp.rc
+++ b/plugins/CrashDumper/res/crshdmp.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -9,7 +9,6 @@
 //
 #include "afxres.h"
 #include "richedit.h"
-#include "version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -38,7 +37,6 @@ END
 BEGIN
     "#include ""afxres.h""\r\n"
     "#include ""richedit.h""\r\n"
-    "#include ""version.h""\r\0"
 END
 
 3 TEXTINCLUDE 
@@ -128,45 +126,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Boris Krasnovskiy"
-            VALUE "FileDescription", "Crash Dumper plugin for Miranda IM "
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "InternalName", "svc_crshdmp"
-            VALUE "LegalCopyright", "Copyright� 2008 - 2012 Boris Krasnovskiy All Rights Reserved"
-            VALUE "OriginalFilename", "svc_crshdmp.dll"
-            VALUE "ProductName", "Crash Dumper"
-            VALUE "ProductVersion", __VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Icon
 //
 
diff --git a/plugins/CrashDumper/bkstring.cpp b/plugins/CrashDumper/src/bkstring.cpp
index 418cb0bd83..418cb0bd83 100644
--- a/plugins/CrashDumper/bkstring.cpp
+++ b/plugins/CrashDumper/src/bkstring.cpp
diff --git a/plugins/CrashDumper/bkstring.h b/plugins/CrashDumper/src/bkstring.h
index a546bb8bc8..88cb3bdfc4 100644
--- a/plugins/CrashDumper/bkstring.h
+++ b/plugins/CrashDumper/src/bkstring.h
@@ -16,6 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define _CRT_SECURE_NO_WARNINGS
+
 #ifndef _BKSTRING_H_
 #define _BKSTRING_H_
 
diff --git a/plugins/CrashDumper/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index 72ffac7f44..72ffac7f44 100644
--- a/plugins/CrashDumper/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
diff --git a/plugins/CrashDumper/crshdmp_icons.cpp b/plugins/CrashDumper/src/crshdmp_icons.cpp
index 1f7106303f..1f7106303f 100644
--- a/plugins/CrashDumper/crshdmp_icons.cpp
+++ b/plugins/CrashDumper/src/crshdmp_icons.cpp
diff --git a/plugins/CrashDumper/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp
index bae091a023..bae091a023 100644
--- a/plugins/CrashDumper/dumper.cpp
+++ b/plugins/CrashDumper/src/dumper.cpp
diff --git a/plugins/CrashDumper/exhndlr.cpp b/plugins/CrashDumper/src/exhndlr.cpp
index 93406efaa8..93406efaa8 100644
--- a/plugins/CrashDumper/exhndlr.cpp
+++ b/plugins/CrashDumper/src/exhndlr.cpp
diff --git a/plugins/CrashDumper/resource.h b/plugins/CrashDumper/src/resource.h
index 83d8a491e4..83d8a491e4 100644
--- a/plugins/CrashDumper/resource.h
+++ b/plugins/CrashDumper/src/resource.h
diff --git a/plugins/CrashDumper/sdkstuff.h b/plugins/CrashDumper/src/sdkstuff.h
index 536a00bc40..536a00bc40 100644
--- a/plugins/CrashDumper/sdkstuff.h
+++ b/plugins/CrashDumper/src/sdkstuff.h
diff --git a/plugins/CrashDumper/ui.cpp b/plugins/CrashDumper/src/ui.cpp
index 00cf9c26cd..00cf9c26cd 100644
--- a/plugins/CrashDumper/ui.cpp
+++ b/plugins/CrashDumper/src/ui.cpp
diff --git a/plugins/CrashDumper/upload.cpp b/plugins/CrashDumper/src/upload.cpp
index 498b5cb2f6..498b5cb2f6 100644
--- a/plugins/CrashDumper/upload.cpp
+++ b/plugins/CrashDumper/src/upload.cpp
diff --git a/plugins/CrashDumper/utils.cpp b/plugins/CrashDumper/src/utils.cpp
index d4dced7d70..d4dced7d70 100644
--- a/plugins/CrashDumper/utils.cpp
+++ b/plugins/CrashDumper/src/utils.cpp
diff --git a/plugins/CrashDumper/utils.h b/plugins/CrashDumper/src/utils.h
index 9089f57571..9089f57571 100644
--- a/plugins/CrashDumper/utils.h
+++ b/plugins/CrashDumper/src/utils.h
diff --git a/plugins/CrashDumper/vc6/dbghelp.h b/plugins/CrashDumper/src/vc6/dbghelp.h
index d8a713060b..d8a713060b 100644
--- a/plugins/CrashDumper/vc6/dbghelp.h
+++ b/plugins/CrashDumper/src/vc6/dbghelp.h
diff --git a/plugins/CrashDumper/vc6/dbghelp.lib b/plugins/CrashDumper/src/vc6/dbghelp.lib
index 5d50c3f74d..5d50c3f74d 100644
--- a/plugins/CrashDumper/vc6/dbghelp.lib
+++ b/plugins/CrashDumper/src/vc6/dbghelp.lib
diff --git a/plugins/CrashDumper/version.h b/plugins/CrashDumper/src/version.h
index 776e30e404..776e30e404 100644
--- a/plugins/CrashDumper/version.h
+++ b/plugins/CrashDumper/src/version.h