95 files changed, 205 insertions, 373 deletions
diff --git a/plugins/StopSpamPlus/stopspamplus-translation.txt b/plugins/StopSpamPlus/docs/stopspamplus-translation.txt
index 50b195e9f2..50b195e9f2 100644
--- a/plugins/StopSpamPlus/stopspamplus-translation.txt
+++ b/plugins/StopSpamPlus/docs/stopspamplus-translation.txt
diff --git a/plugins/StopSpamPlus/res/stopspam.rc b/plugins/StopSpamPlus/res/stopspam.rc
index e6f3f1ffc1..4cb4a45a1c 100644
--- a/plugins/StopSpamPlus/res/stopspam.rc
+++ b/plugins/StopSpamPlus/res/stopspam.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -123,7 +123,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/StopSpamPlus/res/version.rc b/plugins/StopSpamPlus/res/version.rc
index ebf0f96c65..75748ead8a 100644
--- a/plugins/StopSpamPlus/res/version.rc
+++ b/plugins/StopSpamPlus/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp
index c4943f8e0f..41f4d9e8eb 100644
--- a/plugins/StopSpamPlus/src/events.cpp
+++ b/plugins/StopSpamPlus/src/events.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 
 MIRANDA_HOOK_EVENT(ME_DB_EVENT_ADDED, wParam, lParam)
diff --git a/plugins/StopSpamPlus/headers.h b/plugins/StopSpamPlus/src/headers.h
index d80060d668..6da161f793 100644
--- a/plugins/StopSpamPlus/headers.h
+++ b/plugins/StopSpamPlus/src/headers.h
@@ -26,9 +26,9 @@
 #include <m_skin.h>
 #include <m_clist.h>
 
-#include "src/eventhooker.h"
-#include "res/version.h"
-#include "res/resource.h"
+#include "eventhooker.h"
+#include "version.h"
+#include "resource.h"
 #include "m_stopspam.h"
 
 #include "m_variables.h"
@@ -50,7 +50,7 @@ extern HINSTANCE hInst;
 	#define PREF_TCHAR2 0
 #endif //_UNICODE
 
-#include "src/settings.h"
+#include "settings.h"
 
 //options
 INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
diff --git a/plugins/StopSpamPlus/src/opt_proto.cpp b/plugins/StopSpamPlus/src/opt_proto.cpp
index 014a44e7c7..cfdfe0b991 100644
--- a/plugins/StopSpamPlus/src/opt_proto.cpp
+++ b/plugins/StopSpamPlus/src/opt_proto.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 struct ProtocolData
 {
diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp
index 52fab03e8f..221a06f480 100644
--- a/plugins/StopSpamPlus/src/options.cpp
+++ b/plugins/StopSpamPlus/src/options.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 char * pluginDescription = "No more spam! Robots can't go! Only human beings invited!\r\n\r\n"
 "This plugin works pretty simple:\r\n"
diff --git a/plugins/StopSpamPlus/res/resource.h b/plugins/StopSpamPlus/src/resource.h
index 62e603cb2e..62e603cb2e 100644
--- a/plugins/StopSpamPlus/res/resource.h
+++ b/plugins/StopSpamPlus/src/resource.h
diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp
index 1f9097446d..7fe08a9600 100644
--- a/plugins/StopSpamPlus/src/services.cpp
+++ b/plugins/StopSpamPlus/src/services.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 INT_PTR IsContactPassed(WPARAM wParam, LPARAM /*lParam*/)
 {
diff --git a/plugins/StopSpamPlus/src/settings.cpp b/plugins/StopSpamPlus/src/settings.cpp
index 7d74b63919..05a9007d0c 100644
--- a/plugins/StopSpamPlus/src/settings.cpp
+++ b/plugins/StopSpamPlus/src/settings.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 //reading from database-------------
 tstring db_usage::DBGetPluginSetting(std::string const &name, tstring const &defValue)
diff --git a/plugins/StopSpamPlus/src/settings.h b/plugins/StopSpamPlus/src/settings.h
index 99aa9322e8..86219ebf10 100644
--- a/plugins/StopSpamPlus/src/settings.h
+++ b/plugins/StopSpamPlus/src/settings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../headers.h"
+#include "headers.h"
 
 class db_usage
 {
diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp
index 72d5e175c6..e58b8846ff 100644
--- a/plugins/StopSpamPlus/src/stopspam.cpp
+++ b/plugins/StopSpamPlus/src/stopspam.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 HANDLE hFunc, hTempRemove, hLoadHook;
 int hLangpack;
diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp
index 673a858ad2..7d8bc28050 100644
--- a/plugins/StopSpamPlus/src/utils.cpp
+++ b/plugins/StopSpamPlus/src/utils.cpp
@@ -1,4 +1,4 @@
-#include "../headers.h"
+#include "headers.h"
 
 
 tstring &GetDlgItemString(HWND hwnd, int id)
diff --git a/plugins/StopSpamPlus/res/version.h b/plugins/StopSpamPlus/src/version.h
index feb992d6a3..feb992d6a3 100644
--- a/plugins/StopSpamPlus/res/version.h
+++ b/plugins/StopSpamPlus/src/version.h
diff --git a/plugins/StopSpamPlus/stopspam_10.vcxproj b/plugins/StopSpamPlus/stopspam_10.vcxproj
index 5b1d4d75fc..48a8b01d0c 100644
--- a/plugins/StopSpamPlus/stopspam_10.vcxproj
+++ b/plugins/StopSpamPlus/stopspam_10.vcxproj
@@ -74,7 +74,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -100,7 +100,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -125,7 +125,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -148,7 +148,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
@@ -176,11 +176,11 @@
     <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\ExternalAPI\m_stopspam.h" />
     <ClInclude Include="src\eventhooker.h" />
-    <ClInclude Include="res\resource.h" />
+    <ClInclude Include="src\headers.h" />
+    <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\settings.h" />
-    <ClInclude Include="res\version.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\stopspam.rc" />
diff --git a/plugins/StopSpamPlus/stopspam_10.vcxproj.filters b/plugins/StopSpamPlus/stopspam_10.vcxproj.filters
index e997e2959c..51bdd7ab12 100644
--- a/plugins/StopSpamPlus/stopspam_10.vcxproj.filters
+++ b/plugins/StopSpamPlus/stopspam_10.vcxproj.filters
@@ -44,16 +44,16 @@
     <ClInclude Include="src\eventhooker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="res\resource.h">
+    <ClInclude Include="src\headers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\settings.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="res\version.h">
+    <ClInclude Include="src\settings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ExternalAPI\m_stopspam.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/TipperYM/tipperym-translation.txt b/plugins/TipperYM/docs/tipperym-translation.txt
index f13fb40443..f13fb40443 100644
--- a/plugins/TipperYM/tipperym-translation.txt
+++ b/plugins/TipperYM/docs/tipperym-translation.txt
diff --git a/plugins/TipperYM/resource.rc b/plugins/TipperYM/res/resource.rc
index d289b911ba..8c7a166d71 100644
--- a/plugins/TipperYM/resource.rc
+++ b/plugins/TipperYM/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -326,13 +326,13 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ITEM                ICON                    "res\\copy_item.ico"
-IDI_ITEM_ALL            ICON                    "res\\copy_all_items.ico"
-IDI_UP                  ICON                    "res\\arrow_up.ico"
-IDI_DOWN                ICON                    "res\\arrow_down.ico"
-IDI_SEPARATOR           ICON                    "res\\separator.ico"
-IDI_RELOAD              ICON                    "res\\reload.ico"
-IDI_APPLY               ICON                    "res\\apply.ico"
+IDI_ITEM                ICON                    "copy_item.ico"
+IDI_ITEM_ALL            ICON                    "copy_all_items.ico"
+IDI_UP                  ICON                    "arrow_up.ico"
+IDI_DOWN                ICON                    "arrow_down.ico"
+IDI_SEPARATOR           ICON                    "separator.ico"
+IDI_RELOAD              ICON                    "reload.ico"
+IDI_APPLY               ICON                    "apply.ico"
 #endif    // Czech (Czech Republic) resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -352,7 +352,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/TipperYM/version.rc b/plugins/TipperYM/res/version.rc
index cb8ea0cd97..724de5240a 100644
--- a/plugins/TipperYM/version.rc
+++ b/plugins/TipperYM/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
diff --git a/plugins/TipperYM/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp
index 0a33c7b1d8..0a33c7b1d8 100644
--- a/plugins/TipperYM/bitmap_func.cpp
+++ b/plugins/TipperYM/src/bitmap_func.cpp
diff --git a/plugins/TipperYM/bitmap_func.h b/plugins/TipperYM/src/bitmap_func.h
index e6ffbc4880..e6ffbc4880 100644
--- a/plugins/TipperYM/bitmap_func.h
+++ b/plugins/TipperYM/src/bitmap_func.h
diff --git a/plugins/TipperYM/common.h b/plugins/TipperYM/src/common.h
index ab678bac79..9098589d1c 100644
--- a/plugins/TipperYM/common.h
+++ b/plugins/TipperYM/src/common.h
@@ -40,6 +40,8 @@ Boston, MA 02111-1307, USA.
 
 #define MIRANDA_VER		0x0A00
 
+#define _CRT_SECURE_NO_WARNINGS
+
 #include <m_stdhdr.h>
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
diff --git a/plugins/TipperYM/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp
index 7032ad84b2..7032ad84b2 100644
--- a/plugins/TipperYM/message_pump.cpp
+++ b/plugins/TipperYM/src/message_pump.cpp
diff --git a/plugins/TipperYM/message_pump.h b/plugins/TipperYM/src/message_pump.h
index a8858e3865..a8858e3865 100644
--- a/plugins/TipperYM/message_pump.h
+++ b/plugins/TipperYM/src/message_pump.h
diff --git a/plugins/TipperYM/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp
index 5af05c4b22..5af05c4b22 100644
--- a/plugins/TipperYM/mir_smileys.cpp
+++ b/plugins/TipperYM/src/mir_smileys.cpp
diff --git a/plugins/TipperYM/mir_smileys.h b/plugins/TipperYM/src/mir_smileys.h
index 5f78ac8f09..5f78ac8f09 100644
--- a/plugins/TipperYM/mir_smileys.h
+++ b/plugins/TipperYM/src/mir_smileys.h
diff --git a/plugins/TipperYM/options.cpp b/plugins/TipperYM/src/options.cpp
index ceb4a223b5..ceb4a223b5 100644
--- a/plugins/TipperYM/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
diff --git a/plugins/TipperYM/options.h b/plugins/TipperYM/src/options.h
index 52411110fb..52411110fb 100644
--- a/plugins/TipperYM/options.h
+++ b/plugins/TipperYM/src/options.h
diff --git a/plugins/TipperYM/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index 964069ce2d..964069ce2d 100644
--- a/plugins/TipperYM/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
diff --git a/plugins/TipperYM/popwin.h b/plugins/TipperYM/src/popwin.h
index b7ba674b08..b7ba674b08 100644
--- a/plugins/TipperYM/popwin.h
+++ b/plugins/TipperYM/src/popwin.h
diff --git a/plugins/TipperYM/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp
index 629a747a28..629a747a28 100644
--- a/plugins/TipperYM/preset_items.cpp
+++ b/plugins/TipperYM/src/preset_items.cpp
diff --git a/plugins/TipperYM/preset_items.h b/plugins/TipperYM/src/preset_items.h
index 5055db3dee..5055db3dee 100644
--- a/plugins/TipperYM/preset_items.h
+++ b/plugins/TipperYM/src/preset_items.h
diff --git a/plugins/TipperYM/resource.h b/plugins/TipperYM/src/resource.h
index 0e850b25ea..0e850b25ea 100644
--- a/plugins/TipperYM/resource.h
+++ b/plugins/TipperYM/src/resource.h
diff --git a/plugins/TipperYM/skin_parser.cpp b/plugins/TipperYM/src/skin_parser.cpp
index 3c851e0039..3c851e0039 100644
--- a/plugins/TipperYM/skin_parser.cpp
+++ b/plugins/TipperYM/src/skin_parser.cpp
diff --git a/plugins/TipperYM/skin_parser.h b/plugins/TipperYM/src/skin_parser.h
index ca83f47915..ca83f47915 100644
--- a/plugins/TipperYM/skin_parser.h
+++ b/plugins/TipperYM/src/skin_parser.h
diff --git a/plugins/TipperYM/str_utils.cpp b/plugins/TipperYM/src/str_utils.cpp
index 112cc2678b..112cc2678b 100644
--- a/plugins/TipperYM/str_utils.cpp
+++ b/plugins/TipperYM/src/str_utils.cpp
diff --git a/plugins/TipperYM/str_utils.h b/plugins/TipperYM/src/str_utils.h
index 26fbb613fa..26fbb613fa 100644
--- a/plugins/TipperYM/str_utils.h
+++ b/plugins/TipperYM/src/str_utils.h
diff --git a/plugins/TipperYM/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 1d8c8837d9..1d8c8837d9 100644
--- a/plugins/TipperYM/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
diff --git a/plugins/TipperYM/subst.h b/plugins/TipperYM/src/subst.h
index 41f66f871a..41f66f871a 100644
--- a/plugins/TipperYM/subst.h
+++ b/plugins/TipperYM/src/subst.h
diff --git a/plugins/TipperYM/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index 8c0f5575de..8c0f5575de 100644
--- a/plugins/TipperYM/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
diff --git a/plugins/TipperYM/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 1fd6e67c39..1fd6e67c39 100644
--- a/plugins/TipperYM/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
diff --git a/plugins/TipperYM/translations.h b/plugins/TipperYM/src/translations.h
index 985920054e..985920054e 100644
--- a/plugins/TipperYM/translations.h
+++ b/plugins/TipperYM/src/translations.h
diff --git a/plugins/TipperYM/version.h b/plugins/TipperYM/src/version.h
index c71b187bc0..c71b187bc0 100644
--- a/plugins/TipperYM/version.h
+++ b/plugins/TipperYM/src/version.h
diff --git a/plugins/TipperYM/tipper_ym_10.vcxproj b/plugins/TipperYM/tipper_ym_10.vcxproj
index 9f1780e597..4cea23b995 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj
@@ -73,14 +73,13 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
@@ -100,14 +99,13 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -130,11 +128,10 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
@@ -157,12 +154,11 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -180,47 +176,38 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="bitmap_func.cpp" />
-    <ClCompile Include="message_pump.cpp" />
-    <ClCompile Include="mir_smileys.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="popwin.cpp" />
-    <ClCompile Include="preset_items.cpp" />
-    <ClCompile Include="skin_parser.cpp" />
-    <ClCompile Include="str_utils.cpp" />
-    <ClCompile Include="subst.cpp" />
-    <ClCompile Include="tipper.cpp">
+    <ClCompile Include="src\bitmap_func.cpp" />
+    <ClCompile Include="src\message_pump.cpp" />
+    <ClCompile Include="src\mir_smileys.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\popwin.cpp" />
+    <ClCompile Include="src\preset_items.cpp" />
+    <ClCompile Include="src\skin_parser.cpp" />
+    <ClCompile Include="src\str_utils.cpp" />
+    <ClCompile Include="src\subst.cpp" />
+    <ClCompile Include="src\tipper.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="translations.cpp" />
+    <ClCompile Include="src\translations.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="bitmap_func.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="message_pump.h" />
-    <ClInclude Include="mir_smileys.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="popwin.h" />
-    <ClInclude Include="preset_items.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="skin_parser.h" />
-    <ClInclude Include="str_utils.h" />
-    <ClInclude Include="subst.h" />
-    <ClInclude Include="translations.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\bitmap_func.h" />
+    <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\message_pump.h" />
+    <ClInclude Include="src\mir_smileys.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\popwin.h" />
+    <ClInclude Include="src\preset_items.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\skin_parser.h" />
+    <ClInclude Include="src\str_utils.h" />
+    <ClInclude Include="src\subst.h" />
+    <ClInclude Include="src\translations.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\apply.ico" />
-    <None Include="res\arrow_down.ico" />
-    <None Include="res\arrow_up.ico" />
-    <None Include="res\copy_all_items.ico" />
-    <None Include="res\copy_item.ico" />
-    <None Include="res\reload.ico" />
-    <None Include="res\separator.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/TipperYM/tipper_ym_10.vcxproj.filters b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
index 508c94cb08..9cd122d83e 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj.filters
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
@@ -15,109 +15,86 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="bitmap_func.cpp">
+    <ClCompile Include="src\bitmap_func.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="message_pump.cpp">
+    <ClCompile Include="src\message_pump.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mir_smileys.cpp">
+    <ClCompile Include="src\mir_smileys.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="popwin.cpp">
+    <ClCompile Include="src\popwin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="preset_items.cpp">
+    <ClCompile Include="src\preset_items.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="skin_parser.cpp">
+    <ClCompile Include="src\skin_parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="str_utils.cpp">
+    <ClCompile Include="src\str_utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="subst.cpp">
+    <ClCompile Include="src\subst.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="tipper.cpp">
+    <ClCompile Include="src\tipper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="translations.cpp">
+    <ClCompile Include="src\translations.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="bitmap_func.h">
+    <ClInclude Include="src\bitmap_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common.h">
+    <ClInclude Include="src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="message_pump.h">
+    <ClInclude Include="src\message_pump.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="mir_smileys.h">
+    <ClInclude Include="src\mir_smileys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="popwin.h">
+    <ClInclude Include="src\popwin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="preset_items.h">
+    <ClInclude Include="src\preset_items.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="skin_parser.h">
+    <ClInclude Include="src\skin_parser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="str_utils.h">
+    <ClInclude Include="src\str_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="subst.h">
+    <ClInclude Include="src\subst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="translations.h">
+    <ClInclude Include="src\translations.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\apply.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\arrow_down.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\arrow_up.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\copy_all_items.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\copy_item.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\reload.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\separator.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/TooltipNotify/doc/todo.txt b/plugins/TooltipNotify/docs/todo.txt
index e69de29bb2..e69de29bb2 100644
--- a/plugins/TooltipNotify/doc/todo.txt
+++ b/plugins/TooltipNotify/docs/todo.txt
diff --git a/plugins/TooltipNotify/tooltipnotify-translation.txt b/plugins/TooltipNotify/docs/tooltipnotify-translation.txt
index 44862c316f..44862c316f 100644
--- a/plugins/TooltipNotify/tooltipnotify-translation.txt
+++ b/plugins/TooltipNotify/docs/tooltipnotify-translation.txt
diff --git a/plugins/TooltipNotify/doc/tt_wnd_def_style.txt b/plugins/TooltipNotify/docs/tt_wnd_def_style.txt
index c47a6a363f..c47a6a363f 100644
--- a/plugins/TooltipNotify/doc/tt_wnd_def_style.txt
+++ b/plugins/TooltipNotify/docs/tt_wnd_def_style.txt
diff --git a/plugins/TooltipNotify/doc/ttnotify-readme.txt b/plugins/TooltipNotify/docs/ttnotify-readme.txt
index 1d2e816390..1d2e816390 100644
--- a/plugins/TooltipNotify/doc/ttnotify-readme.txt
+++ b/plugins/TooltipNotify/docs/ttnotify-readme.txt
diff --git a/plugins/TooltipNotify/doc/ttnotify_translation.txt b/plugins/TooltipNotify/docs/ttnotify_translation.txt
index 2c7d965d67..2c7d965d67 100644
--- a/plugins/TooltipNotify/doc/ttnotify_translation.txt
+++ b/plugins/TooltipNotify/docs/ttnotify_translation.txt
diff --git a/plugins/TooltipNotify/src/main.rc b/plugins/TooltipNotify/res/main.rc
index fe1fbad85f..74f0c4221b 100644
--- a/plugins/TooltipNotify/src/main.rc
+++ b/plugins/TooltipNotify/res/main.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +31,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -198,7 +198,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-#include "version.rc"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
diff --git a/plugins/TooltipNotify/src/version.rc b/plugins/TooltipNotify/res/version.rc
index da191b4d06..e8bd32c519 100644
--- a/plugins/TooltipNotify/src/version.rc
+++ b/plugins/TooltipNotify/res/version.rc
@@ -12,7 +12,8 @@
 // Version
 //
 
-#include "version.h"
+#include "afxres.h"
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION MAJOR,MINOR,BUILD,REVISION
diff --git a/plugins/TooltipNotify/ttnotify_10.vcxproj b/plugins/TooltipNotify/ttnotify_10.vcxproj
index 462b200e03..87907f9dca 100644
--- a/plugins/TooltipNotify/ttnotify_10.vcxproj
+++ b/plugins/TooltipNotify/ttnotify_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -119,7 +119,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <WarningLevel>Level3</WarningLevel>
       <StringPooling>true</StringPooling>
@@ -144,7 +144,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <WarningLevel>Level3</WarningLevel>
       <StringPooling>true</StringPooling>
@@ -181,13 +181,8 @@
     <ClInclude Include="src\Utils.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\main.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doc\todo.txt" />
-    <None Include="doc\tt_wnd_def_style.txt" />
-    <None Include="doc\ttnotify-readme.txt" />
-    <None Include="doc\ttnotify_translation.txt" />
+    <ResourceCompile Include="res\main.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/TooltipNotify/ttnotify_10.vcxproj.filters b/plugins/TooltipNotify/ttnotify_10.vcxproj.filters
index d35110bfa0..dbbaafbbf1 100644
--- a/plugins/TooltipNotify/ttnotify_10.vcxproj.filters
+++ b/plugins/TooltipNotify/ttnotify_10.vcxproj.filters
@@ -1,73 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{c12316ee-1d9e-470b-a9d4-2f96e30ea10d}</UniqueIdentifier>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="doc">
-      <UniqueIdentifier>{9fe30d32-97fa-41fc-8586-9f52a8580112}</UniqueIdentifier>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\DbHelpers.cpp">
-      <Filter>src</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\main.cpp">
-      <Filter>src</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\stdafx.cpp">
-      <Filter>src</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Tooltip.cpp">
-      <Filter>src</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\TooltipNotify.cpp">
-      <Filter>src</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Utils.cpp">
-      <Filter>src</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\DbHelpers.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\resource.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\Settings.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\stdafx.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\Tooltip.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\TooltipNotify.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\Utils.h">
-      <Filter>src</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\main.rc">
-      <Filter>src</Filter>
+    <ResourceCompile Include="res\main.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="res\version.rc">
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doc\todo.txt">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="doc\tt_wnd_def_style.txt">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="doc\ttnotify-readme.txt">
-      <Filter>doc</Filter>
-    </None>
-    <None Include="doc\ttnotify_translation.txt">
-      <Filter>doc</Filter>
-    </None>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/plugins/TopToolBar/TopToolBar.vcxproj b/plugins/TopToolBar/TopToolBar.vcxproj
index 312bf92d2c..72061381ba 100644
--- a/plugins/TopToolBar/TopToolBar.vcxproj
+++ b/plugins/TopToolBar/TopToolBar.vcxproj
@@ -76,22 +76,13 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/TopToolBar.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -99,37 +90,22 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x1b200000</BaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/TopToolBar.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -137,39 +113,24 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x1b200000</BaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/TopToolBar.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -177,41 +138,26 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <BaseAddress>0x1b200000</BaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/TopToolBar.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;TOPTOOLBAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -219,12 +165,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <BaseAddress>0x1b200000</BaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,48 +176,26 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\ExternalAPI\m_toptoolbar.h" />
-    <ClInclude Include="BkgrCfg.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="bmp\sep.bmp" />
-    <None Include="icos\Find_Add Contacts_UP.ico" />
-    <None Include="icos\Groups On_Off_DN.ico" />
-    <None Include="icos\Groups On_Off_UP.ico" />
-    <None Include="icos\Minimize Button_UP.ico" />
-    <None Include="icos\Run.ico" />
-    <None Include="icos\Show Main Menu_UP.ico" />
-    <None Include="icos\Show only Online Users_DN.ico" />
-    <None Include="icos\Show only Online Users_UP.ico" />
-    <None Include="icos\Show Options Page_UP.ico" />
-    <None Include="icos\Sounds Enable_Disable_DN.ico" />
-    <None Include="icos\Sounds Enable_Disable_UP.ico" />
+    <ClInclude Include="src\BkgrCfg.h" />
+    <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="main.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <ResourceCompile Include="version.rc" />
+    <ResourceCompile Include="res\main.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="InternalButtons.cpp" />
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\InternalButtons.cpp" />
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="toolbar.cpp" />
-    <ClCompile Include="toolbarwnd.cpp" />
-    <ClCompile Include="topbutton.cpp" />
-    <ClCompile Include="ttbopt.cpp" />
+    <ClCompile Include="src\toolbar.cpp" />
+    <ClCompile Include="src\toolbarwnd.cpp" />
+    <ClCompile Include="src\topbutton.cpp" />
+    <ClCompile Include="src\ttbopt.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/TopToolBar/TopToolBar.vcxproj.filters b/plugins/TopToolBar/TopToolBar.vcxproj.filters
index 500784079b..bd1465a04d 100644
--- a/plugins/TopToolBar/TopToolBar.vcxproj.filters
+++ b/plugins/TopToolBar/TopToolBar.vcxproj.filters
@@ -15,82 +15,44 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BkgrCfg.h">
+    <ClInclude Include="src\BkgrCfg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common.h">
+    <ClInclude Include="src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ExternalAPI\m_toptoolbar.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="icos\Find_Add Contacts_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Groups On_Off_DN.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Groups On_Off_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Minimize Button_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Run.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Show Main Menu_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Show only Online Users_DN.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Show only Online Users_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Show Options Page_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Sounds Enable_Disable_DN.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icos\Sounds Enable_Disable_UP.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="bmp\sep.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="main.rc">
+    <ResourceCompile Include="res\main.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="version.rc">
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="InternalButtons.cpp">
+    <ClCompile Include="src\InternalButtons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ttbopt.cpp">
+    <ClCompile Include="src\ttbopt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="toolbar.cpp">
+    <ClCompile Include="src\toolbar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="topbutton.cpp">
+    <ClCompile Include="src\topbutton.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="toolbarwnd.cpp">
+    <ClCompile Include="src\toolbarwnd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/plugins/TopToolBar/toptoolbar-translation.txt b/plugins/TopToolBar/docs/toptoolbar-translation.txt
index fcc295b539..fcc295b539 100644
--- a/plugins/TopToolBar/toptoolbar-translation.txt
+++ b/plugins/TopToolBar/docs/toptoolbar-translation.txt
diff --git a/plugins/TopToolBar/ttb-readme.txt b/plugins/TopToolBar/docs/ttb-readme.txt
index 9c127d5c71..9c127d5c71 100644
--- a/plugins/TopToolBar/ttb-readme.txt
+++ b/plugins/TopToolBar/docs/ttb-readme.txt
diff --git a/plugins/TopToolBar/icos/Find_Add Contacts_UP.ico b/plugins/TopToolBar/res/Find_Add Contacts_UP.ico
index 452f2efc98..452f2efc98 100644
--- a/plugins/TopToolBar/icos/Find_Add Contacts_UP.ico
+++ b/plugins/TopToolBar/res/Find_Add Contacts_UP.ico
diff --git a/plugins/TopToolBar/icos/Groups On_Off_DN.ico b/plugins/TopToolBar/res/Groups On_Off_DN.ico
index 99b7dddd38..99b7dddd38 100644
--- a/plugins/TopToolBar/icos/Groups On_Off_DN.ico
+++ b/plugins/TopToolBar/res/Groups On_Off_DN.ico
diff --git a/plugins/TopToolBar/icos/Groups On_Off_UP.ico b/plugins/TopToolBar/res/Groups On_Off_UP.ico
index fffe8e32c4..fffe8e32c4 100644
--- a/plugins/TopToolBar/icos/Groups On_Off_UP.ico
+++ b/plugins/TopToolBar/res/Groups On_Off_UP.ico
diff --git a/plugins/TopToolBar/icos/Minimize Button_UP.ico b/plugins/TopToolBar/res/Minimize Button_UP.ico
index dd9a8451d7..dd9a8451d7 100644
--- a/plugins/TopToolBar/icos/Minimize Button_UP.ico
+++ b/plugins/TopToolBar/res/Minimize Button_UP.ico
diff --git a/plugins/TopToolBar/icos/Run.ico b/plugins/TopToolBar/res/Run.ico
index 7a87fadc82..7a87fadc82 100644
--- a/plugins/TopToolBar/icos/Run.ico
+++ b/plugins/TopToolBar/res/Run.ico
diff --git a/plugins/TopToolBar/icos/Show Main Menu_UP.ico b/plugins/TopToolBar/res/Show Main Menu_UP.ico
index 8602e4cf3e..8602e4cf3e 100644
--- a/plugins/TopToolBar/icos/Show Main Menu_UP.ico
+++ b/plugins/TopToolBar/res/Show Main Menu_UP.ico
diff --git a/plugins/TopToolBar/icos/Show Options Page_UP.ico b/plugins/TopToolBar/res/Show Options Page_UP.ico
index d6945d94f5..d6945d94f5 100644
--- a/plugins/TopToolBar/icos/Show Options Page_UP.ico
+++ b/plugins/TopToolBar/res/Show Options Page_UP.ico
diff --git a/plugins/TopToolBar/icos/Show only Online Users_DN.ico b/plugins/TopToolBar/res/Show only Online Users_DN.ico
index 87ef1abbb5..87ef1abbb5 100644
--- a/plugins/TopToolBar/icos/Show only Online Users_DN.ico
+++ b/plugins/TopToolBar/res/Show only Online Users_DN.ico
diff --git a/plugins/TopToolBar/icos/Show only Online Users_UP.ico b/plugins/TopToolBar/res/Show only Online Users_UP.ico
index e35e015123..e35e015123 100644
--- a/plugins/TopToolBar/icos/Show only Online Users_UP.ico
+++ b/plugins/TopToolBar/res/Show only Online Users_UP.ico
diff --git a/plugins/TopToolBar/icos/Sounds Enable_Disable_DN.ico b/plugins/TopToolBar/res/Sounds Enable_Disable_DN.ico
index a52dd8a8fe..a52dd8a8fe 100644
--- a/plugins/TopToolBar/icos/Sounds Enable_Disable_DN.ico
+++ b/plugins/TopToolBar/res/Sounds Enable_Disable_DN.ico
diff --git a/plugins/TopToolBar/icos/Sounds Enable_Disable_UP.ico b/plugins/TopToolBar/res/Sounds Enable_Disable_UP.ico
index 31342f4ef5..31342f4ef5 100644
--- a/plugins/TopToolBar/icos/Sounds Enable_Disable_UP.ico
+++ b/plugins/TopToolBar/res/Sounds Enable_Disable_UP.ico
diff --git a/plugins/TopToolBar/main.rc b/plugins/TopToolBar/res/main.rc
index f6efd9369b..025246ebfc 100644
--- a/plugins/TopToolBar/main.rc
+++ b/plugins/TopToolBar/res/main.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ END
 // Bitmap
 //
 
-IDB_SEP                 BITMAP                  "bmp\\sep.bmp"
+IDB_SEP                 BITMAP                  "sep.bmp"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ IDB_SEP                 BITMAP                  "bmp\\sep.bmp"
 
 1 TEXTINCLUDE
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE
@@ -120,17 +120,17 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_SHOWONLINEUP        ICON                    "icos\\Show only Online Users_UP.ico"
-IDI_RUN                 ICON                    "icos\\run.ico"
-IDI_SHOWONLINEDN        ICON                    "icos\\Show only Online Users_DN.ico"
-IDI_GROUPSUP            ICON                    "icos\\Groups On_Off_UP.ico"
-IDI_GROUPSDN            ICON                    "icos\\Groups On_Off_DN.ico"
-IDI_SOUNDDN             ICON                    "icos\\Sounds Enable_Disable_DN.ico"
-IDI_SOUNDUP             ICON                    "icos\\Sounds Enable_Disable_UP.ico"
-IDI_OPTIONSUP           ICON                    "icos\\Show Options Page_UP.ico"
-IDI_MINIMIZEUP          ICON                    "icos\\Minimize Button_UP.ico"
-IDI_FINDADDUP           ICON                    "icos\\Find_Add Contacts_UP.ico"
-IDI_MIRANDAUP           ICON                    "icos\\Show Main Menu_UP.ico"
+IDI_SHOWONLINEUP        ICON                    "Show only Online Users_UP.ico"
+IDI_RUN                 ICON                    "run.ico"
+IDI_SHOWONLINEDN        ICON                    "Show only Online Users_DN.ico"
+IDI_GROUPSUP            ICON                    "Groups On_Off_UP.ico"
+IDI_GROUPSDN            ICON                    "Groups On_Off_DN.ico"
+IDI_SOUNDDN             ICON                    "Sounds Enable_Disable_DN.ico"
+IDI_SOUNDUP             ICON                    "Sounds Enable_Disable_UP.ico"
+IDI_OPTIONSUP           ICON                    "Show Options Page_UP.ico"
+IDI_MINIMIZEUP          ICON                    "Minimize Button_UP.ico"
+IDI_FINDADDUP           ICON                    "Find_Add Contacts_UP.ico"
+IDI_MIRANDAUP           ICON                    "Show Main Menu_UP.ico"
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/TopToolBar/bmp/sep.bmp b/plugins/TopToolBar/res/sep.bmp
index 1665285275..1665285275 100644
--- a/plugins/TopToolBar/bmp/sep.bmp
+++ b/plugins/TopToolBar/res/sep.bmp
diff --git a/plugins/TopToolBar/version.rc b/plugins/TopToolBar/res/version.rc
index 9981077b9f..2c82256ade 100644
--- a/plugins/TopToolBar/version.rc
+++ b/plugins/TopToolBar/res/version.rc
@@ -4,7 +4,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "resource.h"
+#include "..\src\version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,6 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <winres.h>
-#include <version.h>
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
diff --git a/plugins/TopToolBar/BkgrCfg.h b/plugins/TopToolBar/src/BkgrCfg.h
index 4533267fcb..4533267fcb 100644
--- a/plugins/TopToolBar/BkgrCfg.h
+++ b/plugins/TopToolBar/src/BkgrCfg.h
diff --git a/plugins/TopToolBar/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp
index 7fcdc1cef8..7fcdc1cef8 100644
--- a/plugins/TopToolBar/InternalButtons.cpp
+++ b/plugins/TopToolBar/src/InternalButtons.cpp
diff --git a/plugins/TopToolBar/common.h b/plugins/TopToolBar/src/common.h
index 0840111f2f..0840111f2f 100644
--- a/plugins/TopToolBar/common.h
+++ b/plugins/TopToolBar/src/common.h
diff --git a/plugins/TopToolBar/main.cpp b/plugins/TopToolBar/src/main.cpp
index 601de36408..601de36408 100644
--- a/plugins/TopToolBar/main.cpp
+++ b/plugins/TopToolBar/src/main.cpp
diff --git a/plugins/TopToolBar/resource.h b/plugins/TopToolBar/src/resource.h
index 498762de51..498762de51 100644
--- a/plugins/TopToolBar/resource.h
+++ b/plugins/TopToolBar/src/resource.h
diff --git a/plugins/TopToolBar/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp
index 156b83dbb7..156b83dbb7 100644
--- a/plugins/TopToolBar/toolbar.cpp
+++ b/plugins/TopToolBar/src/toolbar.cpp
diff --git a/plugins/TopToolBar/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp
index e3f19f693b..e3f19f693b 100644
--- a/plugins/TopToolBar/toolbarwnd.cpp
+++ b/plugins/TopToolBar/src/toolbarwnd.cpp
diff --git a/plugins/TopToolBar/topbutton.cpp b/plugins/TopToolBar/src/topbutton.cpp
index 8e2f8a1cfd..8e2f8a1cfd 100644
--- a/plugins/TopToolBar/topbutton.cpp
+++ b/plugins/TopToolBar/src/topbutton.cpp
diff --git a/plugins/TopToolBar/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp
index db7d78dcb5..db7d78dcb5 100644
--- a/plugins/TopToolBar/ttbopt.cpp
+++ b/plugins/TopToolBar/src/ttbopt.cpp
diff --git a/plugins/TopToolBar/version.h b/plugins/TopToolBar/src/version.h
index 9a489eebee..9a489eebee 100644
--- a/plugins/TopToolBar/version.h
+++ b/plugins/TopToolBar/src/version.h
diff --git a/plugins/TranslitSwitcher/translitswitcher-translation.txt b/plugins/TranslitSwitcher/Docs/translitswitcher-translation.txt
index a505626cde..a505626cde 100644
--- a/plugins/TranslitSwitcher/translitswitcher-translation.txt
+++ b/plugins/TranslitSwitcher/Docs/translitswitcher-translation.txt
diff --git a/plugins/TranslitSwitcher/Resource.rc b/plugins/TranslitSwitcher/Res/Resource.rc
index b405fa8e86..3019bbb1f4 100644
--- a/plugins/TranslitSwitcher/Resource.rc
+++ b/plugins/TranslitSwitcher/Res/Resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -26,9 +26,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_SWITCHSEND          ICON                    "res/SwitchSend.ico"
-IDI_TRANSLITSEND        ICON                    "res/TranslitSend.ico"
-IDI_INVERTSEND          ICON                    "res/InvertSend.ico"
+IDI_SWITCHSEND          ICON                    "SwitchSend.ico"
+IDI_TRANSLITSEND        ICON                    "TranslitSend.ico"
+IDI_INVERTSEND          ICON                    "InvertSend.ico"
 
 
 #endif    // ������� (������) resources
diff --git a/plugins/TranslitSwitcher/Version.rc b/plugins/TranslitSwitcher/Res/Version.rc
index f331bd1100..472bfbfe38 100644
--- a/plugins/TranslitSwitcher/Version.rc
+++ b/plugins/TranslitSwitcher/Res/Version.rc
@@ -5,7 +5,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/TranslitSwitcher/Resource.h b/plugins/TranslitSwitcher/Src/Resource.h
index b98a6590c2..b98a6590c2 100644
--- a/plugins/TranslitSwitcher/Resource.h
+++ b/plugins/TranslitSwitcher/Src/Resource.h
diff --git a/plugins/TranslitSwitcher/Src/TranslitSwitcher.h b/plugins/TranslitSwitcher/Src/TranslitSwitcher.h
index 540a0cd1bd..ea29c2c7bf 100644
--- a/plugins/TranslitSwitcher/Src/TranslitSwitcher.h
+++ b/plugins/TranslitSwitcher/Src/TranslitSwitcher.h
@@ -38,8 +38,8 @@ Boston, MA 02111-1307, USA.
 #include "m_msg_buttonsbar.h"
 #include "m_popup.h"
 
-#include "..\version.h"
-#include "..\resource.h"
+#include "version.h"
+#include "resource.h"
 #include "m_smileyadd.h"
 #include "m_ieview.h"
 #include "m_popup2.h"
diff --git a/plugins/TranslitSwitcher/Version.h b/plugins/TranslitSwitcher/Src/Version.h
index c186a42101..c186a42101 100644
--- a/plugins/TranslitSwitcher/Version.h
+++ b/plugins/TranslitSwitcher/Src/Version.h
diff --git a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj
index 3a775cda5c..905ac38d84 100644
--- a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj
+++ b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj
@@ -73,13 +73,12 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TRANSLITSWIITCHER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -97,11 +96,10 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TRANSLITSWIITCHER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -121,13 +119,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TRANSLITSWIITCHER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <FloatingPointModel>Fast</FloatingPointModel>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -149,13 +146,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;TRANSLITSWIITCHER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <FloatingPointModel>Fast</FloatingPointModel>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -172,17 +168,17 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Resource.h" />
+    <ClInclude Include="Src\Resource.h" />
     <ClInclude Include="Src\TranslitSwitcher.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="Src\Version.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\Layoutproc.cpp" />
     <ClCompile Include="Src\TranslitSwitcher.cpp" />
   </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/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters
index 409eda7983..4b7b7aa2a6 100644
--- a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters
+++ b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters
@@ -15,13 +15,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Version.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Src\TranslitSwitcher.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Resource.h">
+    <ClInclude Include="src\Resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -34,10 +34,10 @@
     </ClCompile>
   </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/UserGuide/UserGuide_10.vcxproj b/plugins/UserGuide/UserGuide_10.vcxproj
index a04c09b0e4..375843b925 100644
--- a/plugins/UserGuide/UserGuide_10.vcxproj
+++ b/plugins/UserGuide/UserGuide_10.vcxproj
@@ -75,7 +75,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UserGuide_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -96,7 +96,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;UserGuide_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -115,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UserGuide_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -134,7 +134,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;UserGuide_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -148,10 +148,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h" />
+    <ClInclude Include="src\commonheaders.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserGuide/UserGuide_10.vcxproj.filters b/plugins/UserGuide/UserGuide_10.vcxproj.filters
index 711c4c9dc2..c40fe0a474 100644
--- a/plugins/UserGuide/UserGuide_10.vcxproj.filters
+++ b/plugins/UserGuide/UserGuide_10.vcxproj.filters
@@ -9,18 +9,14 @@
       <UniqueIdentifier>{72da96a4-67f9-49cc-94d3-6730544c949f}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{34beb523-18cd-4f3d-85db-ec309fbf1d1a}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h">
+    <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/UserGuide/userguide-translation.txt b/plugins/UserGuide/docs/userguide-translation.txt
index 73bd66f0ac..73bd66f0ac 100644
--- a/plugins/UserGuide/userguide-translation.txt
+++ b/plugins/UserGuide/docs/userguide-translation.txt
diff --git a/plugins/UserGuide/commonheaders.h b/plugins/UserGuide/src/commonheaders.h
index 498dbb5b13..498dbb5b13 100644
--- a/plugins/UserGuide/commonheaders.h
+++ b/plugins/UserGuide/src/commonheaders.h
diff --git a/plugins/UserGuide/main.cpp b/plugins/UserGuide/src/main.cpp
index 2f0f53f02f..2f0f53f02f 100644
--- a/plugins/UserGuide/main.cpp
+++ b/plugins/UserGuide/src/main.cpp