94 files changed, 203 insertions, 342 deletions

diff --git a/plugins/VersionInfo/AggressiveOptimize.h b/plugins/VersionInfo/AggressiveOptimize.h
deleted file mode 100644
index 1b646c301c..0000000000
--- a/plugins/VersionInfo/AggressiveOptimize.h
+++ /dev/null
@@ -1,58 +0,0 @@
-

-//////////////////////////////

-// Version 1.10

-// Jan 23rd, 2000

-// Version 1.00

-// May 20th, 1999

-// Todd C. Wilson, Fresh Ground Software

-// (todd@nopcode.com)

-// This header file will kick in settings for Visual C++ 5 and 6 that will (usually)

-// result in smaller exe's.

-// The "trick" is to tell the compiler to not pad out the function calls; this is done

-// by not using the /O1 or /O2 option - if you do, you implicitly use /Gy, which pads

-// out each and every function call. In one single 500k dll, I managed to cut out 120k

-// by this alone!

-// The other two "tricks" are telling the Linker to merge all data-type segments together

-// in the exe file. The relocation, read-only (constants) data, and code section (.text)

-// sections can almost always be merged. Each section merged can save 4k in exe space,

-// since each section is padded out to 4k chunks. This is very noticable with smaller

-// exes, since you could have only 700 bytes of data, 300 bytes of code, 94 bytes of

-// strings - padded out, this could be 12k of runtime, for 1094 bytes of stuff!

-// Note that if you're using MFC static or some other 3rd party libs, you may get poor

-// results with merging the readonly (.rdata) section - the exe may grow larger.

-// To use this feature, define _MERGE_DATA_ in your project or before this header is used.

-// With Visual C++ 5, the program uses a file alignement of 512 bytes, which results

-// in a small exe. Under VC6, the program instead uses 4k, which is the same as the

-// section size. The reason (from what I understand) is that 4k is the chunk size of

-// the virtual memory manager, and that WinAlign (an end-user tuning tool for Win98)

-// will re-align the programs on this boundary. The problem with this is that all of

-// Microsoft's system exes and dlls are not tuned like this, and using 4k causes serious

-// exe bloat. Very noticable for smaller programs.

-// The "trick" for this is to use the undocumented FILEALIGN linker parm to change the

-// padding from 4k to 1/2k, which results in a much smaller exe - anywhere from 20%-75%

-// depending on the size. 

-

-

-#ifdef NDEBUG

-// /Og (global optimizations), /Os (favor small code), /Oy (no frame pointers)

-#pragma optimize("gsy",on)

-

-#pragma comment(linker,"/RELEASE")

-

-// Note that merging the .rdata section will result in LARGER exe's if you using

-// MFC (esp. static link). If this is desirable, define _MERGE_RDATA_ in your project.

-#ifdef _MERGE_RDATA_

-#pragma comment(linker,"/merge:.rdata=.data")

-#endif // _MERGE_RDATA_

-

-#pragma comment(linker,"/merge:.text=.data")

-#pragma comment(linker,"/merge:.reloc=.data")

-

-#if _MSC_VER >= 1000

-// Only supported/needed with VC6; VC5 already does 0x200 for release builds.

-// Totally undocumented! And if you set it lower than 512 bytes, the program crashes.

-// Either leave at 0x200 or 0x1000

-#pragma comment(linker,"/FILEALIGN:0x200")

-#endif // _MSC_VER >= 1000

-

-#endif // NDEBUG

diff --git a/plugins/VersionInfo/VersionInfo_10.vcxproj b/plugins/VersionInfo/VersionInfo_10.vcxproj
index 9481a8a3dd..2f758a10f8 100644
--- a/plugins/VersionInfo/VersionInfo_10.vcxproj
+++ b/plugins/VersionInfo/VersionInfo_10.vcxproj
@@ -73,12 +73,11 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -102,12 +101,11 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

@@ -134,7 +132,7 @@
       <Optimization>Disabled</Optimization>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <Link>

@@ -159,7 +157,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;VERSIONINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -181,28 +179,25 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="CPlugin.cpp" />

-    <ClCompile Include="CVersionInfo.cpp" />

-    <ClCompile Include="dlgHandlers.cpp" />

-    <ClCompile Include="hooked_events.cpp" />

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\CPlugin.cpp" />

+    <ClCompile Include="src\CVersionInfo.cpp" />

+    <ClCompile Include="src\dlgHandlers.cpp" />

+    <ClCompile Include="src\hooked_events.cpp" />

+    <ClCompile Include="src\main.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="services.cpp" />

-    <ClCompile Include="utils.cpp" />

+    <ClCompile Include="src\services.cpp" />

+    <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h" />

-    <ClInclude Include="CPlugin.h" />

-    <ClInclude Include="CVersionInfo.h" />

-    <ClInclude Include="hooked_events.h" />

-    <ClInclude Include="utils.h" />

+    <ClInclude Include="src\common.h" />

+    <ClInclude Include="src\CPlugin.h" />

+    <ClInclude Include="src\CVersionInfo.h" />

+    <ClInclude Include="src\hooked_events.h" />

+    <ClInclude Include="src\utils.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="VersionInfo.ico" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/VersionInfo/VersionInfo_10.vcxproj.filters b/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
index e0c4f5db2e..b5f5a05d9b 100644
--- a/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
+++ b/plugins/VersionInfo/VersionInfo_10.vcxproj.filters
@@ -15,53 +15,48 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="CPlugin.cpp">

+    <ClCompile Include="src\CPlugin.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="CVersionInfo.cpp">

+    <ClCompile Include="src\CVersionInfo.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dlgHandlers.cpp">

+    <ClCompile Include="src\dlgHandlers.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="hooked_events.cpp">

+    <ClCompile Include="src\hooked_events.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\main.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

+    <ClCompile Include="src\services.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

+    <ClCompile Include="src\utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="CPlugin.h">

+    <ClInclude Include="src\CPlugin.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="CVersionInfo.h">

+    <ClInclude Include="src\CVersionInfo.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="hooked_events.h">

+    <ClInclude Include="src\hooked_events.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="common.h">

+    <ClInclude Include="src\common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

+    <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="VersionInfo.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/VersionInfo/VersionInfo.html b/plugins/VersionInfo/docs/VersionInfo.html
index a955874979..a955874979 100644
--- a/plugins/VersionInfo/VersionInfo.html
+++ b/plugins/VersionInfo/docs/VersionInfo.html
diff --git a/plugins/VersionInfo/svc_vi-translation.txt b/plugins/VersionInfo/docs/svc_vi-translation.txt
index 719f0beb2c..719f0beb2c 100644
--- a/plugins/VersionInfo/svc_vi-translation.txt
+++ b/plugins/VersionInfo/docs/svc_vi-translation.txt
diff --git a/plugins/VersionInfo/VersionInfo.ico b/plugins/VersionInfo/res/VersionInfo.ico
index b026d584c2..b026d584c2 100644
--- a/plugins/VersionInfo/VersionInfo.ico
+++ b/plugins/VersionInfo/res/VersionInfo.ico
diff --git a/plugins/VersionInfo/resource.rc b/plugins/VersionInfo/res/resource.rc
index b4a8eb819a..420b122b90 100644
--- a/plugins/VersionInfo/resource.rc
+++ b/plugins/VersionInfo/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -182,7 +182,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/VersionInfo/res/version.rc b/plugins/VersionInfo/res/version.rc
new file mode 100644
index 0000000000..f691628164
--- /dev/null
+++ b/plugins/VersionInfo/res/version.rc
@@ -0,0 +1,46 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "..\src\version.h"

+#include "afxres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __PLUGINVERSION_STRING

+ PRODUCTVERSION __PLUGINVERSION_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 "Author", __AUTHOR

+            VALUE "FileDescription", __DESC

+            VALUE "FileVersion", __VERSION_STRING

+            VALUE "InternalName", __PLUGIN_DISPLAY_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/VersionInfo/CPlugin.cpp b/plugins/VersionInfo/src/CPlugin.cpp
index 54d762064a..54d762064a 100644
--- a/plugins/VersionInfo/CPlugin.cpp
+++ b/plugins/VersionInfo/src/CPlugin.cpp
diff --git a/plugins/VersionInfo/CPlugin.h b/plugins/VersionInfo/src/CPlugin.h
index 5da1b1dc6b..5da1b1dc6b 100644
--- a/plugins/VersionInfo/CPlugin.h
+++ b/plugins/VersionInfo/src/CPlugin.h
diff --git a/plugins/VersionInfo/CVersionInfo.cpp b/plugins/VersionInfo/src/CVersionInfo.cpp
index da10f4b9a9..da10f4b9a9 100644
--- a/plugins/VersionInfo/CVersionInfo.cpp
+++ b/plugins/VersionInfo/src/CVersionInfo.cpp
diff --git a/plugins/VersionInfo/CVersionInfo.h b/plugins/VersionInfo/src/CVersionInfo.h
index eb55b808fc..eb55b808fc 100644
--- a/plugins/VersionInfo/CVersionInfo.h
+++ b/plugins/VersionInfo/src/CVersionInfo.h
diff --git a/plugins/VersionInfo/common.h b/plugins/VersionInfo/src/common.h
index 3182abc660..3182abc660 100644
--- a/plugins/VersionInfo/common.h
+++ b/plugins/VersionInfo/src/common.h
diff --git a/plugins/VersionInfo/dlgHandlers.cpp b/plugins/VersionInfo/src/dlgHandlers.cpp
index a1a81e6a51..a1a81e6a51 100644
--- a/plugins/VersionInfo/dlgHandlers.cpp
+++ b/plugins/VersionInfo/src/dlgHandlers.cpp
diff --git a/plugins/VersionInfo/dlgHandlers.h b/plugins/VersionInfo/src/dlgHandlers.h
index bab1876ea2..bab1876ea2 100644
--- a/plugins/VersionInfo/dlgHandlers.h
+++ b/plugins/VersionInfo/src/dlgHandlers.h
diff --git a/plugins/VersionInfo/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp
index 77d72e6a97..77d72e6a97 100644
--- a/plugins/VersionInfo/hooked_events.cpp
+++ b/plugins/VersionInfo/src/hooked_events.cpp
diff --git a/plugins/VersionInfo/hooked_events.h b/plugins/VersionInfo/src/hooked_events.h
index b75b5e59a8..b75b5e59a8 100644
--- a/plugins/VersionInfo/hooked_events.h
+++ b/plugins/VersionInfo/src/hooked_events.h
diff --git a/plugins/VersionInfo/main.cpp b/plugins/VersionInfo/src/main.cpp
index 53c75be86f..53c75be86f 100644
--- a/plugins/VersionInfo/main.cpp
+++ b/plugins/VersionInfo/src/main.cpp
diff --git a/plugins/VersionInfo/resource.h b/plugins/VersionInfo/src/resource.h
index b282e8bca6..b282e8bca6 100644
--- a/plugins/VersionInfo/resource.h
+++ b/plugins/VersionInfo/src/resource.h
diff --git a/plugins/VersionInfo/services.cpp b/plugins/VersionInfo/src/services.cpp
index 4efa482404..4efa482404 100644
--- a/plugins/VersionInfo/services.cpp
+++ b/plugins/VersionInfo/src/services.cpp
diff --git a/plugins/VersionInfo/services.h b/plugins/VersionInfo/src/services.h
index 38acbc7731..38acbc7731 100644
--- a/plugins/VersionInfo/services.h
+++ b/plugins/VersionInfo/src/services.h
diff --git a/plugins/VersionInfo/utils.cpp b/plugins/VersionInfo/src/utils.cpp
index 9be552c8cc..9be552c8cc 100644
--- a/plugins/VersionInfo/utils.cpp
+++ b/plugins/VersionInfo/src/utils.cpp
diff --git a/plugins/VersionInfo/utils.h b/plugins/VersionInfo/src/utils.h
index 5db4b1a811..5db4b1a811 100644
--- a/plugins/VersionInfo/utils.h
+++ b/plugins/VersionInfo/src/utils.h
diff --git a/plugins/VersionInfo/version.h b/plugins/VersionInfo/src/version.h
index 7c0596e2c9..7c0596e2c9 100644
--- a/plugins/VersionInfo/version.h
+++ b/plugins/VersionInfo/src/version.h
diff --git a/plugins/VersionInfo/version.rc b/plugins/VersionInfo/version.rc
deleted file mode 100644
index cd65db2ee3..0000000000
--- a/plugins/VersionInfo/version.rc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Microsoft Visual C++ generated resource script.

-//

-#ifdef APSTUDIO_INVOKED

-#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-#include "resource.h"

-#include "version.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "resource1.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION __PLUGINVERSION_STRING

- PRODUCTVERSION __PLUGINVERSION_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 "Author", __AUTHOR

-            VALUE "FileDescription", __DESC

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", __PLUGIN_DISPLAY_NAME

-            VALUE "LegalCopyright", __COPYRIGHT

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/plugins/W7UI/w7ui-translation.txt b/plugins/W7UI/docs/w7ui-translation.txt
index 30bce1459e..30bce1459e 100644
--- a/plugins/W7UI/w7ui-translation.txt
+++ b/plugins/W7UI/docs/w7ui-translation.txt
diff --git a/plugins/W7UI/clistproxywindow.cpp b/plugins/W7UI/src/clistproxywindow.cpp
index 12e5b476ed..12e5b476ed 100644
--- a/plugins/W7UI/clistproxywindow.cpp
+++ b/plugins/W7UI/src/clistproxywindow.cpp
diff --git a/plugins/W7UI/clistproxywindow.h b/plugins/W7UI/src/clistproxywindow.h
index 153c59089b..153c59089b 100644
--- a/plugins/W7UI/clistproxywindow.h
+++ b/plugins/W7UI/src/clistproxywindow.h
diff --git a/plugins/W7UI/dwmwindow.cpp b/plugins/W7UI/src/dwmwindow.cpp
index 2d8dd6e9e4..2d8dd6e9e4 100644
--- a/plugins/W7UI/dwmwindow.cpp
+++ b/plugins/W7UI/src/dwmwindow.cpp
diff --git a/plugins/W7UI/dwmwindow.h b/plugins/W7UI/src/dwmwindow.h
index e795823247..e795823247 100644
--- a/plugins/W7UI/dwmwindow.h
+++ b/plugins/W7UI/src/dwmwindow.h
diff --git a/plugins/W7UI/headers.h b/plugins/W7UI/src/headers.h
index 7d28902466..7d28902466 100644
--- a/plugins/W7UI/headers.h
+++ b/plugins/W7UI/src/headers.h
diff --git a/plugins/W7UI/jumplist.cpp b/plugins/W7UI/src/jumplist.cpp
index 4fd1a68e9d..4fd1a68e9d 100644
--- a/plugins/W7UI/jumplist.cpp
+++ b/plugins/W7UI/src/jumplist.cpp
diff --git a/plugins/W7UI/jumplist.h b/plugins/W7UI/src/jumplist.h
index de5a6f0548..de5a6f0548 100644
--- a/plugins/W7UI/jumplist.h
+++ b/plugins/W7UI/src/jumplist.h
diff --git a/plugins/W7UI/jumplistarray.cpp b/plugins/W7UI/src/jumplistarray.cpp
index 669a7784ef..669a7784ef 100644
--- a/plugins/W7UI/jumplistarray.cpp
+++ b/plugins/W7UI/src/jumplistarray.cpp
diff --git a/plugins/W7UI/jumplistarray.h b/plugins/W7UI/src/jumplistarray.h
index c9f2a8b979..c9f2a8b979 100644
--- a/plugins/W7UI/jumplistarray.h
+++ b/plugins/W7UI/src/jumplistarray.h
diff --git a/plugins/W7UI/jumplistbuilder.cpp b/plugins/W7UI/src/jumplistbuilder.cpp
index 5e5f1d9f65..5e5f1d9f65 100644
--- a/plugins/W7UI/jumplistbuilder.cpp
+++ b/plugins/W7UI/src/jumplistbuilder.cpp
diff --git a/plugins/W7UI/jumplistbuilder.h b/plugins/W7UI/src/jumplistbuilder.h
index 6a0bde2fd4..6a0bde2fd4 100644
--- a/plugins/W7UI/jumplistbuilder.h
+++ b/plugins/W7UI/src/jumplistbuilder.h
diff --git a/plugins/W7UI/main.cpp b/plugins/W7UI/src/main.cpp
index d9c6898338..d9c6898338 100644
--- a/plugins/W7UI/main.cpp
+++ b/plugins/W7UI/src/main.cpp
diff --git a/plugins/W7UI/srmmproxywindow.cpp b/plugins/W7UI/src/srmmproxywindow.cpp
index a70ca1b672..a70ca1b672 100644
--- a/plugins/W7UI/srmmproxywindow.cpp
+++ b/plugins/W7UI/src/srmmproxywindow.cpp
diff --git a/plugins/W7UI/srmmproxywindow.h b/plugins/W7UI/src/srmmproxywindow.h
index f1c447d4e8..f1c447d4e8 100644
--- a/plugins/W7UI/srmmproxywindow.h
+++ b/plugins/W7UI/src/srmmproxywindow.h
diff --git a/plugins/W7UI/subclassmgr.cpp b/plugins/W7UI/src/subclassmgr.cpp
index e69de29bb2..e69de29bb2 100644
--- a/plugins/W7UI/subclassmgr.cpp
+++ b/plugins/W7UI/src/subclassmgr.cpp
diff --git a/plugins/W7UI/subclassmgr.h b/plugins/W7UI/src/subclassmgr.h
index 1cf2433254..1cf2433254 100644
--- a/plugins/W7UI/subclassmgr.h
+++ b/plugins/W7UI/src/subclassmgr.h
diff --git a/plugins/W7UI/w7ui.cpp b/plugins/W7UI/src/w7ui.cpp
index c94f7b31ca..c94f7b31ca 100644
--- a/plugins/W7UI/w7ui.cpp
+++ b/plugins/W7UI/src/w7ui.cpp
diff --git a/plugins/W7UI/win7api.cpp b/plugins/W7UI/src/win7api.cpp
index dcfb6058ec..dcfb6058ec 100644
--- a/plugins/W7UI/win7api.cpp
+++ b/plugins/W7UI/src/win7api.cpp
diff --git a/plugins/W7UI/win7api.h b/plugins/W7UI/src/win7api.h
index f9fa806335..f9fa806335 100644
--- a/plugins/W7UI/win7api.h
+++ b/plugins/W7UI/src/win7api.h
diff --git a/plugins/W7UI/win7api_ICustomDestinationList.h b/plugins/W7UI/src/win7api_ICustomDestinationList.h
index 6d3f770d29..6d3f770d29 100644
--- a/plugins/W7UI/win7api_ICustomDestinationList.h
+++ b/plugins/W7UI/src/win7api_ICustomDestinationList.h
diff --git a/plugins/W7UI/win7api_IObjectArray.h b/plugins/W7UI/src/win7api_IObjectArray.h
index 2102276989..2102276989 100644
--- a/plugins/W7UI/win7api_IObjectArray.h
+++ b/plugins/W7UI/src/win7api_IObjectArray.h
diff --git a/plugins/W7UI/win7api_IObjectCollection.h b/plugins/W7UI/src/win7api_IObjectCollection.h
index 71b37d0e99..71b37d0e99 100644
--- a/plugins/W7UI/win7api_IObjectCollection.h
+++ b/plugins/W7UI/src/win7api_IObjectCollection.h
diff --git a/plugins/W7UI/win7api_ITaskbarList3.h b/plugins/W7UI/src/win7api_ITaskbarList3.h
index 8c39fb5c41..8c39fb5c41 100644
--- a/plugins/W7UI/win7api_ITaskbarList3.h
+++ b/plugins/W7UI/src/win7api_ITaskbarList3.h
diff --git a/plugins/W7UI/w7ui_10.vcxproj b/plugins/W7UI/w7ui_10.vcxproj
index 84c93d20ec..c7331edc9c 100644
--- a/plugins/W7UI/w7ui_10.vcxproj
+++ b/plugins/W7UI/w7ui_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -93,7 +93,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

@@ -112,7 +112,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

@@ -133,7 +133,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

@@ -150,31 +150,31 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="clistproxywindow.cpp" />

-    <ClCompile Include="dwmwindow.cpp" />

-    <ClCompile Include="jumplist.cpp" />

-    <ClCompile Include="jumplistarray.cpp" />

-    <ClCompile Include="jumplistbuilder.cpp" />

-    <ClCompile Include="main.cpp" />

-    <ClCompile Include="srmmproxywindow.cpp" />

-    <ClCompile Include="subclassmgr.cpp" />

-    <ClCompile Include="w7ui.cpp" />

-    <ClCompile Include="win7api.cpp" />

+    <ClCompile Include="src\clistproxywindow.cpp" />

+    <ClCompile Include="src\dwmwindow.cpp" />

+    <ClCompile Include="src\jumplist.cpp" />

+    <ClCompile Include="src\jumplistarray.cpp" />

+    <ClCompile Include="src\jumplistbuilder.cpp" />

+    <ClCompile Include="src\main.cpp" />

+    <ClCompile Include="src\srmmproxywindow.cpp" />

+    <ClCompile Include="src\subclassmgr.cpp" />

+    <ClCompile Include="src\w7ui.cpp" />

+    <ClCompile Include="src\win7api.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="clistproxywindow.h" />

-    <ClInclude Include="dwmwindow.h" />

-    <ClInclude Include="headers.h" />

-    <ClInclude Include="jumplist.h" />

-    <ClInclude Include="jumplistarray.h" />

-    <ClInclude Include="jumplistbuilder.h" />

-    <ClInclude Include="srmmproxywindow.h" />

-    <ClInclude Include="subclassmgr.h" />

-    <ClInclude Include="win7api.h" />

-    <ClInclude Include="win7api_ICustomDestinationList.h" />

-    <ClInclude Include="win7api_IObjectArray.h" />

-    <ClInclude Include="win7api_IObjectCollection.h" />

-    <ClInclude Include="win7api_ITaskbarList3.h" />

+    <ClInclude Include="src\clistproxywindow.h" />

+    <ClInclude Include="src\dwmwindow.h" />

+    <ClInclude Include="src\headers.h" />

+    <ClInclude Include="src\jumplist.h" />

+    <ClInclude Include="src\jumplistarray.h" />

+    <ClInclude Include="src\jumplistbuilder.h" />

+    <ClInclude Include="src\srmmproxywindow.h" />

+    <ClInclude Include="src\subclassmgr.h" />

+    <ClInclude Include="src\win7api.h" />

+    <ClInclude Include="src\win7api_ICustomDestinationList.h" />

+    <ClInclude Include="src\win7api_IObjectArray.h" />

+    <ClInclude Include="src\win7api_IObjectCollection.h" />

+    <ClInclude Include="src\win7api_ITaskbarList3.h" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/WhoUsesMyFiles/res/wumf.readme.txt b/plugins/WhoUsesMyFiles/docs/wumf.readme.txt
index f07d9c2275..f07d9c2275 100644
--- a/plugins/WhoUsesMyFiles/res/wumf.readme.txt
+++ b/plugins/WhoUsesMyFiles/docs/wumf.readme.txt
diff --git a/plugins/WhoUsesMyFiles/res/drive.bmp b/plugins/WhoUsesMyFiles/res/drive.bmp
deleted file mode 100644
index 767aef2997..0000000000
--- a/plugins/WhoUsesMyFiles/res/drive.bmp
+++ /dev/null
diff --git a/plugins/WhoUsesMyFiles/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc
index 1bf8f41511..a0333d96ef 100644
--- a/plugins/WhoUsesMyFiles/resource.rc
+++ b/plugins/WhoUsesMyFiles/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -59,12 +59,6 @@ END
 #endif    // APSTUDIO_INVOKED

 

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_DRIVE               BITMAP  DISCARDABLE     "res\\drive.bmp"

 #endif    // Russian resources

 /////////////////////////////////////////////////////////////////////////////

 

@@ -146,7 +140,7 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

+GUIDELINES DESIGNINFO 

 BEGIN

     IDD_OPTIONS, DIALOG

     BEGIN

@@ -162,18 +156,18 @@ END
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE DISCARDABLE 

+1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE DISCARDABLE 

+2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE DISCARDABLE 

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

@@ -189,9 +183,9 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_POPUP               ICON    DISCARDABLE     "res\\popup.ico"

-IDI_NOPOPUP             ICON    DISCARDABLE     "res\\popup_no.ico"

-IDI_DRIVE               ICON    DISCARDABLE     "res\\drive.ico"

+IDI_POPUP               ICON     "popup.ico"

+IDI_NOPOPUP             ICON     "popup_no.ico"

+IDI_DRIVE               ICON     "drive.ico"

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/WhoUsesMyFiles/list.c b/plugins/WhoUsesMyFiles/src/list.c
index 1e52e12e4d..1e52e12e4d 100644
--- a/plugins/WhoUsesMyFiles/list.c
+++ b/plugins/WhoUsesMyFiles/src/list.c
diff --git a/plugins/WhoUsesMyFiles/resizer.c b/plugins/WhoUsesMyFiles/src/resizer.c
index e45d10a453..e45d10a453 100644
--- a/plugins/WhoUsesMyFiles/resizer.c
+++ b/plugins/WhoUsesMyFiles/src/resizer.c
diff --git a/plugins/WhoUsesMyFiles/resource.h b/plugins/WhoUsesMyFiles/src/resource.h
index 3fb3c7e09e..6e4cd69615 100644
--- a/plugins/WhoUsesMyFiles/resource.h
+++ b/plugins/WhoUsesMyFiles/src/resource.h
@@ -7,7 +7,6 @@
 #define IDI_NOPOPUP                     103

 #define IDI_DRIVE                       106

 #define IDD_CONNLIST                    107

-#define IDB_DRIVE                       108

 #define IDC_COLOR_SET                   1000

 #define IDC_COLOR_WIN                   1001

 #define IDC_COLOR_DEF                   1002

diff --git a/plugins/WhoUsesMyFiles/wumf.c b/plugins/WhoUsesMyFiles/src/wumf.c
index 03aa576d38..03aa576d38 100644
--- a/plugins/WhoUsesMyFiles/wumf.c
+++ b/plugins/WhoUsesMyFiles/src/wumf.c
diff --git a/plugins/WhoUsesMyFiles/wumf.h b/plugins/WhoUsesMyFiles/src/wumf.h
index 5535ae0c5f..5535ae0c5f 100644
--- a/plugins/WhoUsesMyFiles/wumf.h
+++ b/plugins/WhoUsesMyFiles/src/wumf.h
diff --git a/plugins/WhoUsesMyFiles/wumfplug.c b/plugins/WhoUsesMyFiles/src/wumfplug.c
index 0af8d6e817..2493de584b 100644
--- a/plugins/WhoUsesMyFiles/wumfplug.c
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.c
@@ -552,7 +552,7 @@ int InitTopToolbar(WPARAM wparam,LPARAM lparam)
 {

 	TTBButton ttb = { 0 };

 	ttb.cbSize = sizeof(ttb);

-	ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDB_DRIVE));

+	ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDI_DRIVE));

 	ttb.pszService = MS_WUMF_CONNECTIONSSHOW;

 	ttb.dwFlags = TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP;

 	ttb.name = ttb.pszTooltipUp = LPGEN("Show connections list");

diff --git a/plugins/WhoUsesMyFiles/wumf.vcxproj b/plugins/WhoUsesMyFiles/wumf.vcxproj
index c6044637fa..d798b606b5 100644
--- a/plugins/WhoUsesMyFiles/wumf.vcxproj
+++ b/plugins/WhoUsesMyFiles/wumf.vcxproj
@@ -155,8 +155,6 @@
       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <EntryPointSymbol>

-      </EntryPointSymbol>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

@@ -167,17 +165,17 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="wumf.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\wumf.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="list.c" />

-    <ClCompile Include="resizer.c" />

-    <ClCompile Include="wumf.c" />

-    <ClCompile Include="wumfplug.c" />

+    <ClCompile Include="src\list.c" />

+    <ClCompile Include="src\resizer.c" />

+    <ClCompile Include="src\wumf.c" />

+    <ClCompile Include="src\wumfplug.c" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/WhoUsesMyFiles/wumf.vcxproj.filters b/plugins/WhoUsesMyFiles/wumf.vcxproj.filters
index 923fdf838f..0715f41ff1 100644
--- a/plugins/WhoUsesMyFiles/wumf.vcxproj.filters
+++ b/plugins/WhoUsesMyFiles/wumf.vcxproj.filters
@@ -15,29 +15,29 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="wumf.h">

+    <ClInclude Include="src\wumf.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="list.c">

+    <ClCompile Include="src\list.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="resizer.c">

+    <ClCompile Include="src\resizer.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="wumf.c">

+    <ClCompile Include="src\wumf.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="wumfplug.c">

+    <ClCompile Include="src\wumfplug.c">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/YAPP/yapp-translation.txt b/plugins/YAPP/docs/yapp-translation.txt
index 82c150e612..82c150e612 100644
--- a/plugins/YAPP/yapp-translation.txt
+++ b/plugins/YAPP/docs/yapp-translation.txt
diff --git a/plugins/YAPP/PPh2.ico b/plugins/YAPP/res/PPh2.ico
index f8aa63abf2..f8aa63abf2 100644
--- a/plugins/YAPP/PPh2.ico
+++ b/plugins/YAPP/res/PPh2.ico
diff --git a/plugins/YAPP/version.rc b/plugins/YAPP/res/version.rc
index c962918f07..3ad9c3a4b3 100644
--- a/plugins/YAPP/version.rc
+++ b/plugins/YAPP/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/YAPP/popups2.rc b/plugins/YAPP/res/yapp.rc
index c59e253ff2..d4a7243199 100644
--- a/plugins/YAPP/popups2.rc
+++ b/plugins/YAPP/res/yapp.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/YAPP/common.h b/plugins/YAPP/src/common.h
index 1b2a52b74b..1b2a52b74b 100644
--- a/plugins/YAPP/common.h
+++ b/plugins/YAPP/src/common.h
diff --git a/plugins/YAPP/docs/m_popup2.h b/plugins/YAPP/src/m_yapp.h
index b23aecf7fb..26d9be0e2e 100644
--- a/plugins/YAPP/docs/m_popup2.h
+++ b/plugins/YAPP/src/m_yapp.h
@@ -1,5 +1,5 @@
-#ifndef __m_popup2_h__

-#define __m_popup2_h__

+#ifndef __m_yapp_h__

+#define __m_yapp_h__

 

 #define NFOPT_POPUP2_BACKCOLOR    "Popup2/BackColor"

 #define NFOPT_POPUP2_TEXTCOLOR    "Popup2/TextColor"

@@ -26,4 +26,4 @@
 	#define MPopup2Remove(a) (CallService(MS_POPUP2_REMOVE, 0, (LPARAM)(a)))

 #endif

 

-#endif // __m_popup2_h__

+#endif // __m_yapp_h__

diff --git a/plugins/YAPP/message_pump.cpp b/plugins/YAPP/src/message_pump.cpp
index 7e2cea5f0c..7e2cea5f0c 100644
--- a/plugins/YAPP/message_pump.cpp
+++ b/plugins/YAPP/src/message_pump.cpp
diff --git a/plugins/YAPP/message_pump.h b/plugins/YAPP/src/message_pump.h
index 70671b157a..70671b157a 100644
--- a/plugins/YAPP/message_pump.h
+++ b/plugins/YAPP/src/message_pump.h
diff --git a/plugins/YAPP/notify.h b/plugins/YAPP/src/notify.h
index 7f39eb6d65..7f39eb6d65 100644
--- a/plugins/YAPP/notify.h
+++ b/plugins/YAPP/src/notify.h
diff --git a/plugins/YAPP/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp
index 2f2ca9967b..061c30f1a2 100644
--- a/plugins/YAPP/notify_imp.cpp
+++ b/plugins/YAPP/src/notify_imp.cpp
@@ -2,7 +2,7 @@
 #include "resource.h"

 #include "notify.h"

 #include "message_pump.h"

-#include "docs/m_popup2.h"

+#include "m_yapp.h"

 

 HANDLE hhkShow=0, hhkUpdate=0, hhkRemove=0;

 

diff --git a/plugins/YAPP/options.cpp b/plugins/YAPP/src/options.cpp
index 7ba798e5fa..7ba798e5fa 100644
--- a/plugins/YAPP/options.cpp
+++ b/plugins/YAPP/src/options.cpp
diff --git a/plugins/YAPP/options.h b/plugins/YAPP/src/options.h
index 55b94d17db..55b94d17db 100644
--- a/plugins/YAPP/options.h
+++ b/plugins/YAPP/src/options.h
diff --git a/plugins/YAPP/popwin.cpp b/plugins/YAPP/src/popwin.cpp
index 682a3f7b05..682a3f7b05 100644
--- a/plugins/YAPP/popwin.cpp
+++ b/plugins/YAPP/src/popwin.cpp
diff --git a/plugins/YAPP/popwin.h b/plugins/YAPP/src/popwin.h
index 4d826ceade..4d826ceade 100644
--- a/plugins/YAPP/popwin.h
+++ b/plugins/YAPP/src/popwin.h
diff --git a/plugins/YAPP/resource.h b/plugins/YAPP/src/resource.h
index d7db4cda2e..d7db4cda2e 100644
--- a/plugins/YAPP/resource.h
+++ b/plugins/YAPP/src/resource.h
diff --git a/plugins/YAPP/services.cpp b/plugins/YAPP/src/services.cpp
index 84e4330151..4dd00fcd38 100644
--- a/plugins/YAPP/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -3,7 +3,7 @@
 #include "popwin.h"

 #include "message_pump.h"

 #include "resource.h"

-#include "popup_history.h"

+#include "yapp_history.h"

 

 #define NUM_SERVICES		20

 HANDLE hService[NUM_SERVICES];

diff --git a/plugins/YAPP/services.h b/plugins/YAPP/src/services.h
index 8243b0ba8b..8243b0ba8b 100644
--- a/plugins/YAPP/services.h
+++ b/plugins/YAPP/src/services.h
diff --git a/plugins/YAPP/version.h b/plugins/YAPP/src/version.h
index 4118cc9091..4118cc9091 100644
--- a/plugins/YAPP/version.h
+++ b/plugins/YAPP/src/version.h
diff --git a/plugins/YAPP/popups2.cpp b/plugins/YAPP/src/yapp.cpp
index 5c6fd9261f..11067040b2 100644
--- a/plugins/YAPP/popups2.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -2,14 +2,14 @@
 //

 

 #include "common.h"

-#include "popups2.h"

+#include "yapp.h"

 #include "version.h"

 #include "message_pump.h"

 #include "options.h"

 #include "popwin.h"

 #include "notify.h"

 

-#include "popup_history.h" //to be able to update the renderer

+#include "yapp_history.h" //to be able to update the renderer

 

 HMODULE hInst = 0;

 

@@ -52,7 +52,7 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LP
     return TRUE;

 }

 

-extern "C" POPUPS2_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" YAPP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfo;

 }

@@ -199,7 +199,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam) {
 

 HANDLE hEventPreShutdown, hEventModulesLoaded;

 

-extern "C" int POPUPS2_API Load(void) {

+extern "C" int YAPP_API Load(void) {

 

 	mir_getLP(&pluginInfo);

 

@@ -227,7 +227,7 @@ extern "C" int POPUPS2_API Load(void) {
 	return 0;

 }

 

-extern "C" int POPUPS2_API Unload()

+extern "C" int YAPP_API Unload()

 {

 	if(hEventReloadFont)

 		UnhookEvent(hEventReloadFont);

diff --git a/plugins/YAPP/popups2.h b/plugins/YAPP/src/yapp.h
index 59e4f89baf..de86e26295 100644
--- a/plugins/YAPP/popups2.h
+++ b/plugins/YAPP/src/yapp.h
@@ -4,9 +4,9 @@
 // that uses this DLL. This way any other project whose source files include this file see 

 // POPUPS2_API functions as being imported from a DLL, whereas this DLL sees symbols

 // defined with this macro as being exported.

-#ifdef POPUPS2_EXPORTS

-#define POPUPS2_API __declspec(dllexport)

+#ifdef YAPP_EXPORTS

+#define YAPP_API __declspec(dllexport)

 #else

-#define POPUPS2_API __declspec(dllimport)

+#define YAPP_API __declspec(dllimport)

 #endif

 

diff --git a/plugins/YAPP/popup_history.cpp b/plugins/YAPP/src/yapp_history.cpp
index db0c53fa3a..d6b0c4b114 100644
--- a/plugins/YAPP/popup_history.cpp
+++ b/plugins/YAPP/src/yapp_history.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "popup_history.h"
+#include "yapp_history.h"
 
 PopupHistoryList::PopupHistoryList(int renderer)
 {
diff --git a/plugins/YAPP/popup_history.h b/plugins/YAPP/src/yapp_history.h
index f79b6ee7af..d527bc47f4 100644
--- a/plugins/YAPP/popup_history.h
+++ b/plugins/YAPP/src/yapp_history.h
@@ -1,5 +1,5 @@
-#ifndef __popup_history_h__
-#define __popup_history_h__
+#ifndef __yapp_history_h__
+#define __yapp_history_h__
 
 #include "m_ieview.h" //need this for special renderers
 
diff --git a/plugins/YAPP/popup_history_dlg.cpp b/plugins/YAPP/src/yapp_history_dlg.cpp
index e192139c8a..534af1fe0c 100644
--- a/plugins/YAPP/popup_history_dlg.cpp
+++ b/plugins/YAPP/src/yapp_history_dlg.cpp
@@ -1,6 +1,6 @@
 #include "common.h"

 #include "resource.h"

-#include "popup_history.h"

+#include "yapp_history.h"

 

 //************ Some helper resize stuff ******************

 

diff --git a/plugins/YAPP/popups2_10.vcxproj b/plugins/YAPP/yapp_10.vcxproj
index 0d65a05078..3761ad68d5 100644
--- a/plugins/YAPP/popups2_10.vcxproj
+++ b/plugins/YAPP/yapp_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -101,7 +101,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -130,7 +130,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -155,7 +155,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Optimization>Disabled</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -174,32 +174,32 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="message_pump.cpp" />

-    <ClCompile Include="notify_imp.cpp" />

-    <ClCompile Include="options.cpp" />

-    <ClCompile Include="popup_history.cpp" />

-    <ClCompile Include="popup_history_dlg.cpp" />

-    <ClCompile Include="popups2.cpp">

+    <ClCompile Include="src\message_pump.cpp" />

+    <ClCompile Include="src\notify_imp.cpp" />

+    <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\yapp_history.cpp" />

+    <ClCompile Include="src\yapp_history_dlg.cpp" />

+    <ClCompile Include="src\yapp.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="popwin.cpp" />

-    <ClCompile Include="services.cpp" />

+    <ClCompile Include="src\popwin.cpp" />

+    <ClCompile Include="src\services.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h" />

-    <ClInclude Include="message_pump.h" />

-    <ClInclude Include="notify.h" />

-    <ClInclude Include="options.h" />

-    <ClInclude Include="popup_history.h" />

-    <ClInclude Include="popups2.h" />

-    <ClInclude Include="popwin.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="services.h" />

-    <ClInclude Include="version.h" />

+    <ClInclude Include="src\common.h" />

+    <ClInclude Include="src\message_pump.h" />

+    <ClInclude Include="src\notify.h" />

+    <ClInclude Include="src\options.h" />

+    <ClInclude Include="src\yapp_history.h" />

+    <ClInclude Include="src\yapp.h" />

+    <ClInclude Include="src\popwin.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\services.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="popups2.rc" />

-    <ResourceCompile Include="version.rc" />

+    <ResourceCompile Include="res\yapp.rc" />

+    <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/YAPP/popups2_10.vcxproj.filters b/plugins/YAPP/yapp_10.vcxproj.filters
index a3fc3c5946..cb0d887b30 100644
--- a/plugins/YAPP/popups2_10.vcxproj.filters
+++ b/plugins/YAPP/yapp_10.vcxproj.filters
@@ -15,68 +15,68 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="message_pump.cpp">

+    <ClCompile Include="src\message_pump.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="notify_imp.cpp">

+    <ClCompile Include="src\notify_imp.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

+    <ClCompile Include="src\options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popup_history.cpp">

+    <ClCompile Include="src\yapp_history.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popup_history_dlg.cpp">

+    <ClCompile Include="src\yapp_history_dlg.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popups2.cpp">

+    <ClCompile Include="src\yapp.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popwin.cpp">

+    <ClCompile Include="src\popwin.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

+    <ClCompile Include="src\services.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <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="notify.h">

+    <ClInclude Include="src\notify.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

+    <ClInclude Include="src\options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="popup_history.h">

+    <ClInclude Include="src\yapp_history.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="popups2.h">

+    <ClInclude Include="src\yapp.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="popwin.h">

+    <ClInclude Include="src\popwin.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="services.h">

+    <ClInclude Include="src\services.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="popups2.rc">

+    <ResourceCompile Include="res\yapp.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/ZeroNotification/Zero Notification_10.vcxproj b/plugins/ZeroNotification/Zero Notification_10.vcxproj
index 852858b5dd..f43ffb0799 100644
--- a/plugins/ZeroNotification/Zero Notification_10.vcxproj
+++ b/plugins/ZeroNotification/Zero Notification_10.vcxproj
@@ -82,7 +82,6 @@
       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -108,7 +107,6 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -136,7 +134,6 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <MinimalRebuild>true</MinimalRebuild>

     </ClCompile>

     <ResourceCompile>

@@ -167,7 +164,6 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -185,12 +181,12 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp" />

+    <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h" />

-    <ClInclude Include="res\resource.h" />

-    <ClInclude Include="version.h" />

+    <ClInclude Include="src\common.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\ZeroNotifyW.rc" />

diff --git a/plugins/ZeroNotification/Zero Notification_10.vcxproj.filters b/plugins/ZeroNotification/Zero Notification_10.vcxproj.filters
index 693662db9f..95f544a875 100644
--- a/plugins/ZeroNotification/Zero Notification_10.vcxproj.filters
+++ b/plugins/ZeroNotification/Zero Notification_10.vcxproj.filters
@@ -15,18 +15,18 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

+    <ClCompile Include="src\main.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h">

+    <ClInclude Include="src\common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="res\resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/ZeroNotification/zeronotification-translation.txt b/plugins/ZeroNotification/docs/zeronotification-translation.txt
index e62104e8f8..e62104e8f8 100644
--- a/plugins/ZeroNotification/zeronotification-translation.txt
+++ b/plugins/ZeroNotification/docs/zeronotification-translation.txt
diff --git a/plugins/ZeroNotification/res/ZeroNotifyW.rc b/plugins/ZeroNotification/res/ZeroNotifyW.rc
index 5d0ab0dcc7..5488ba0257 100644
--- a/plugins/ZeroNotification/res/ZeroNotifyW.rc
+++ b/plugins/ZeroNotification/res/ZeroNotifyW.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -79,7 +79,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.\0"

+    "..\\src\\resource.\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/ZeroNotification/common.h b/plugins/ZeroNotification/src/common.h
index d0efafec1b..d0efafec1b 100644
--- a/plugins/ZeroNotification/common.h
+++ b/plugins/ZeroNotification/src/common.h
diff --git a/plugins/ZeroNotification/main.cpp b/plugins/ZeroNotification/src/main.cpp
index ff4aa20e93..2f2221fbf4 100644
--- a/plugins/ZeroNotification/main.cpp
+++ b/plugins/ZeroNotification/src/main.cpp
@@ -11,7 +11,7 @@ http://nightly.miranda.im/
 

 #include "version.h"

 #include "common.h"

-#include "res\resource.h"

+#include "resource.h"

 

 HINSTANCE hInst;

 

diff --git a/plugins/ZeroNotification/res/resource.h b/plugins/ZeroNotification/src/resource.h
index ac11d8b30b..ac11d8b30b 100644
--- a/plugins/ZeroNotification/res/resource.h
+++ b/plugins/ZeroNotification/src/resource.h
diff --git a/plugins/ZeroNotification/version.h b/plugins/ZeroNotification/src/version.h
index a334eec318..a334eec318 100644
--- a/plugins/ZeroNotification/version.h
+++ b/plugins/ZeroNotification/src/version.h