145 files changed, 271 insertions, 566 deletions
diff --git a/plugins/SecureIM/!whatsnew.txt b/plugins/SecureIM/docs/!whatsnew.txt
index eeb792d864..eeb792d864 100644
--- a/plugins/SecureIM/!whatsnew.txt
+++ b/plugins/SecureIM/docs/!whatsnew.txt
diff --git a/plugins/SecureIM/secureim-translation.txt b/plugins/SecureIM/docs/secureim-translation.txt
index 1242476fc9..1242476fc9 100644
--- a/plugins/SecureIM/secureim-translation.txt
+++ b/plugins/SecureIM/docs/secureim-translation.txt
diff --git a/plugins/SecureIM/icons/cl_dis.ico b/plugins/SecureIM/res/cl_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/cl_dis.ico
+++ b/plugins/SecureIM/res/cl_dis.ico
diff --git a/plugins/SecureIM/icons/cl_est.ico b/plugins/SecureIM/res/cl_est.ico
index 8b42e2cb44..8b42e2cb44 100644
--- a/plugins/SecureIM/icons/cl_est.ico
+++ b/plugins/SecureIM/res/cl_est.ico
diff --git a/plugins/SecureIM/icons/cm_dis.ico b/plugins/SecureIM/res/cm_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/cm_dis.ico
+++ b/plugins/SecureIM/res/cm_dis.ico
diff --git a/plugins/SecureIM/icons/cm_est.ico b/plugins/SecureIM/res/cm_est.ico
index dd6f805868..dd6f805868 100644
--- a/plugins/SecureIM/icons/cm_est.ico
+++ b/plugins/SecureIM/res/cm_est.ico
diff --git a/plugins/SecureIM/icons/mw_dis.ico b/plugins/SecureIM/res/mw_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/mw_dis.ico
+++ b/plugins/SecureIM/res/mw_dis.ico
diff --git a/plugins/SecureIM/icons/mw_est.ico b/plugins/SecureIM/res/mw_est.ico
index 8b42e2cb44..8b42e2cb44 100644
--- a/plugins/SecureIM/icons/mw_est.ico
+++ b/plugins/SecureIM/res/mw_est.ico
diff --git a/plugins/SecureIM/icons/ov_gpg.ico b/plugins/SecureIM/res/ov_gpg.ico
index d823cf83b6..d823cf83b6 100644
--- a/plugins/SecureIM/icons/ov_gpg.ico
+++ b/plugins/SecureIM/res/ov_gpg.ico
diff --git a/plugins/SecureIM/icons/ov_nat.ico b/plugins/SecureIM/res/ov_nat.ico
index 37000bd69b..37000bd69b 100644
--- a/plugins/SecureIM/icons/ov_nat.ico
+++ b/plugins/SecureIM/res/ov_nat.ico
diff --git a/plugins/SecureIM/icons/ov_pgp.ico b/plugins/SecureIM/res/ov_pgp.ico
index c365c48cde..c365c48cde 100644
--- a/plugins/SecureIM/icons/ov_pgp.ico
+++ b/plugins/SecureIM/res/ov_pgp.ico
diff --git a/plugins/SecureIM/icons/ov_rsa.ico b/plugins/SecureIM/res/ov_rsa.ico
index a659463475..a659463475 100644
--- a/plugins/SecureIM/icons/ov_rsa.ico
+++ b/plugins/SecureIM/res/ov_rsa.ico
diff --git a/plugins/SecureIM/icons/pu_dis.ico b/plugins/SecureIM/res/pu_dis.ico
index 53209bc652..53209bc652 100644
--- a/plugins/SecureIM/icons/pu_dis.ico
+++ b/plugins/SecureIM/res/pu_dis.ico
diff --git a/plugins/SecureIM/icons/pu_est.ico b/plugins/SecureIM/res/pu_est.ico
index 8b42e2cb44..8b42e2cb44 100644
--- a/plugins/SecureIM/icons/pu_est.ico
+++ b/plugins/SecureIM/res/pu_est.ico
diff --git a/plugins/SecureIM/icons/pu_msg.ico b/plugins/SecureIM/res/pu_msg.ico
index 5964ead2e1..5964ead2e1 100644
--- a/plugins/SecureIM/icons/pu_msg.ico
+++ b/plugins/SecureIM/res/pu_msg.ico
diff --git a/plugins/SecureIM/icons/pu_prc.ico b/plugins/SecureIM/res/pu_prc.ico
index 822c55aeb7..822c55aeb7 100644
--- a/plugins/SecureIM/icons/pu_prc.ico
+++ b/plugins/SecureIM/res/pu_prc.ico
diff --git a/plugins/SecureIM/resource.rc b/plugins/SecureIM/res/resource.rc
index 929f4a413f..9ff15ed681 100644
--- a/plugins/SecureIM/resource.rc
+++ b/plugins/SecureIM/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -22,8 +22,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 #pragma code_page(1251)
 #endif //_WIN32
 
-#include "version.rc"
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -323,9 +321,8 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
     "afxres.h\0"
-    "version.rc\0"
 END
 
 #endif    // APSTUDIO_INVOKED
diff --git a/plugins/SecureIM/resource_icons.rc b/plugins/SecureIM/res/resource_icons.rc
index db48cece57..8f9e8edf85 100644
--- a/plugins/SecureIM/resource_icons.rc
+++ b/plugins/SecureIM/res/resource_icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -20,8 +20,6 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 #pragma code_page(1251)
 
-#include "version_icons.rc"
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -29,23 +27,23 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_CL_DIS ICON "icons\\cl_dis.ico"
-IDI_CL_EST ICON "icons\\cl_est.ico"
-IDI_CM_DIS ICON "icons\\cm_dis.ico"
-IDI_CM_EST ICON "icons\\cm_est.ico"
-IDI_MW_DIS ICON "icons\\mw_dis.ico"
-IDI_MW_EST ICON "icons\\mw_est.ico"
-IDI_PU_DIS ICON "icons\\pu_dis.ico"
-IDI_PU_EST ICON "icons\\pu_est.ico"
-IDI_PU_PRC ICON "icons\\pu_prc.ico"
-IDI_PU_MSG ICON "icons\\pu_msg.ico"
-IDI_ST_DIS ICON "icons\\st_dis.ico"
-IDI_ST_ENA ICON "icons\\st_ena.ico"
-IDI_ST_TRY ICON "icons\\st_try.ico"
-IDI_OV_NAT ICON "icons\\ov_nat.ico"
-IDI_OV_PGP ICON "icons\\ov_pgp.ico"
-IDI_OV_GPG ICON "icons\\ov_gpg.ico"
-IDI_OV_RSA ICON "icons\\ov_rsa.ico"
+IDI_CL_DIS ICON "cl_dis.ico"
+IDI_CL_EST ICON "cl_est.ico"
+IDI_CM_DIS ICON "cm_dis.ico"
+IDI_CM_EST ICON "cm_est.ico"
+IDI_MW_DIS ICON "mw_dis.ico"
+IDI_MW_EST ICON "mw_est.ico"
+IDI_PU_DIS ICON "pu_dis.ico"
+IDI_PU_EST ICON "pu_est.ico"
+IDI_PU_PRC ICON "pu_prc.ico"
+IDI_PU_MSG ICON "pu_msg.ico"
+IDI_ST_DIS ICON "st_dis.ico"
+IDI_ST_ENA ICON "st_ena.ico"
+IDI_ST_TRY ICON "st_try.ico"
+IDI_OV_NAT ICON "ov_nat.ico"
+IDI_OV_PGP ICON "ov_pgp.ico"
+IDI_OV_GPG ICON "ov_gpg.ico"
+IDI_OV_RSA ICON "ov_rsa.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -55,9 +53,8 @@ IDI_OV_RSA ICON "icons\\ov_rsa.ico"
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
     "afxres.h\0"
-    "version.rc\0"
 END
 
 #endif    // APSTUDIO_INVOKED
diff --git a/plugins/SecureIM/icons/st_dis.ico b/plugins/SecureIM/res/st_dis.ico
index 16c5bcfa90..16c5bcfa90 100644
--- a/plugins/SecureIM/icons/st_dis.ico
+++ b/plugins/SecureIM/res/st_dis.ico
diff --git a/plugins/SecureIM/icons/st_ena.ico b/plugins/SecureIM/res/st_ena.ico
index fa67cbd015..fa67cbd015 100644
--- a/plugins/SecureIM/icons/st_ena.ico
+++ b/plugins/SecureIM/res/st_ena.ico
diff --git a/plugins/SecureIM/icons/st_try.ico b/plugins/SecureIM/res/st_try.ico
index 9f4c6855aa..9f4c6855aa 100644
--- a/plugins/SecureIM/icons/st_try.ico
+++ b/plugins/SecureIM/res/st_try.ico
diff --git a/plugins/SecureIM/version.rc b/plugins/SecureIM/res/version.rc
index cd57f59d78..1dbe2d8238 100644
--- a/plugins/SecureIM/version.rc
+++ b/plugins/SecureIM/res/version.rc
@@ -2,7 +2,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "version.h"
+#include "..\src\version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/SecureIM/version_icons.rc b/plugins/SecureIM/res/version_icons.rc
index ca622fe360..194ee4bc79 100644
--- a/plugins/SecureIM/version_icons.rc
+++ b/plugins/SecureIM/res/version_icons.rc
@@ -2,7 +2,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "version.h"
+#include "..\src\version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/SecureIM/secureim.msp b/plugins/SecureIM/secureim.msp
deleted file mode 100644
index 3d02d076d0..0000000000
--- a/plugins/SecureIM/secureim.msp
+++ /dev/null
@@ -1,136 +0,0 @@
-[Project]
-name=secureim
-type=2
-defaultConfig=1
-
-
-[Debug]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Debug
-outputFilesDirectory=Debug
-compilerPreprocessor=BUILDING_DLL
-extraCompilerOptions=
-compilerIncludeDirectory=\mingw\local\include,\mingw\local\include\libotr,\source\include
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningsAsErrors=0
-debugType=1
-debugLevel=3
-exceptionEnabled=0
-runtimeTypeEnabled=0
-optimizeLevel=0
-
-// linker
-libraryPath=
-outputFilename=Debug\secureim.dll
-libraries=comctl32,comdlg32,msimg32,gdi32
-extraLinkerOptions=-shared
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=0
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Release]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Release
-outputFilesDirectory=Release
-compilerPreprocessor=BUILDING_DLL
-extraCompilerOptions=
-compilerIncludeDirectory=\mingw\local\include,\mingw\local\include\libotr,\source\include
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningAsErrors=0
-debugType=0
-debugLevel=1
-exceptionEnabled=0
-runtimeTypeEnabled=0
-optimizeLevel=4
-
-// linker
-libraryPath=
-outputFilename=Release\secureim.dll
-libraries=comctl32,comdlg32,msimg32,gdi32
-extraLinkerOptions=-shared
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=1
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Source]
-1=commonheaders.cpp
-2=crypt_check.cpp
-3=crypt_dll.cpp
-4=crypt_lists.cpp
-5=crypt_misc.cpp
-6=crypt_popups.cpp
-7=gettime.cpp
-8=language.cpp
-9=loadicons.cpp
-10=loadlib.cpp
-11=main.cpp
-12=mmi.cpp
-13=options.cpp
-14=popupOptions.cpp
-15=rtfconv.cpp
-16=crypt_metacontacts.cpp
-17=crypt_icons.cpp
-18=images.cpp
-19=dbevent.cpp
-20=svcs_clist.cpp
-21=svcs_menu.cpp
-22=svcs_srmm.cpp
-23=svcs_rsa.cpp
-24=svcs_proto.cpp
-25=splitmsg.cpp
-[Header]
-1=commonheaders.h
-2=crypt.h
-3=cryptopp.h
-4=forkthread.h
-5=gettime.h
-6=language.h
-7=loadicons.h
-8=loadlib.h
-9=mmi.h
-10=options.h
-11=popupOptions.h
-12=resource.h
-13=rtfconv.h
-14=secureim.h
-15=version.h
-16=dbevent.h
-17=images.h
-18=svcs_clist.h
-19=svcs_menu.h
-20=svcs_proto.h
-21=svcs_rsa.h
-22=svcs_srmm.h
-23=splitmsg.h
-[Resource]
-1=resource.rc
-[Other]
-[History]
diff --git a/plugins/SecureIM/secureim_10.vcxproj b/plugins/SecureIM/secureim_10.vcxproj
index 9e6ced746a..d413c80bdc 100644
--- a/plugins/SecureIM/secureim_10.vcxproj
+++ b/plugins/SecureIM/secureim_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -99,7 +99,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -126,7 +126,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,7 +156,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -181,60 +181,61 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
+    <ResourceCompile Include="res\resource.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="crypt.h" />
-    <ClInclude Include="cryptopp.h" />
-    <ClInclude Include="dbevent.h" />
-    <ClInclude Include="gettime.h" />
-    <ClInclude Include="images.h" />
-    <ClInclude Include="language.h" />
-    <ClInclude Include="loadicons.h" />
-    <ClInclude Include="loadlib.h" />
-    <ClInclude Include="mmi.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="popupOptions.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="rtfconv.h" />
-    <ClInclude Include="secureim.h" />
-    <ClInclude Include="splitmsg.h" />
-    <ClInclude Include="svcs_clist.h" />
-    <ClInclude Include="svcs_menu.h" />
-    <ClInclude Include="svcs_proto.h" />
-    <ClInclude Include="svcs_rsa.h" />
-    <ClInclude Include="svcs_srmm.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\commonheaders.h" />
+    <ClInclude Include="src\crypt.h" />
+    <ClInclude Include="src\cryptopp.h" />
+    <ClInclude Include="src\dbevent.h" />
+    <ClInclude Include="src\gettime.h" />
+    <ClInclude Include="src\images.h" />
+    <ClInclude Include="src\language.h" />
+    <ClInclude Include="src\loadicons.h" />
+    <ClInclude Include="src\loadlib.h" />
+    <ClInclude Include="src\mmi.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\popupOptions.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\rtfconv.h" />
+    <ClInclude Include="src\secureim.h" />
+    <ClInclude Include="src\splitmsg.h" />
+    <ClInclude Include="src\svcs_clist.h" />
+    <ClInclude Include="src\svcs_menu.h" />
+    <ClInclude Include="src\svcs_proto.h" />
+    <ClInclude Include="src\svcs_rsa.h" />
+    <ClInclude Include="src\svcs_srmm.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\commonheaders.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="crypt_check.cpp" />
-    <ClCompile Include="crypt_dll.cpp" />
-    <ClCompile Include="crypt_icons.cpp" />
-    <ClCompile Include="crypt_lists.cpp" />
-    <ClCompile Include="crypt_metacontacts.cpp" />
-    <ClCompile Include="crypt_misc.cpp" />
-    <ClCompile Include="crypt_popups.cpp" />
-    <ClCompile Include="dbevent.cpp" />
-    <ClCompile Include="gettime.cpp" />
-    <ClCompile Include="images.cpp" />
-    <ClCompile Include="language.cpp" />
-    <ClCompile Include="loadicons.cpp" />
-    <ClCompile Include="loadlib.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="mmi.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="popupOptions.cpp" />
-    <ClCompile Include="rtfconv.cpp" />
-    <ClCompile Include="splitmsg.cpp" />
-    <ClCompile Include="svcs_clist.cpp" />
-    <ClCompile Include="svcs_menu.cpp" />
-    <ClCompile Include="svcs_proto.cpp" />
-    <ClCompile Include="svcs_rsa.cpp" />
-    <ClCompile Include="svcs_srmm.cpp" />
+    <ClCompile Include="src\crypt_check.cpp" />
+    <ClCompile Include="src\crypt_dll.cpp" />
+    <ClCompile Include="src\crypt_icons.cpp" />
+    <ClCompile Include="src\crypt_lists.cpp" />
+    <ClCompile Include="src\crypt_metacontacts.cpp" />
+    <ClCompile Include="src\crypt_misc.cpp" />
+    <ClCompile Include="src\crypt_popups.cpp" />
+    <ClCompile Include="src\dbevent.cpp" />
+    <ClCompile Include="src\gettime.cpp" />
+    <ClCompile Include="src\images.cpp" />
+    <ClCompile Include="src\language.cpp" />
+    <ClCompile Include="src\loadicons.cpp" />
+    <ClCompile Include="src\loadlib.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\mmi.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\popupOptions.cpp" />
+    <ClCompile Include="src\rtfconv.cpp" />
+    <ClCompile Include="src\splitmsg.cpp" />
+    <ClCompile Include="src\svcs_clist.cpp" />
+    <ClCompile Include="src\svcs_menu.cpp" />
+    <ClCompile Include="src\svcs_proto.cpp" />
+    <ClCompile Include="src\svcs_rsa.cpp" />
+    <ClCompile Include="src\svcs_srmm.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/SecureIM/secureim_10.vcxproj.filters b/plugins/SecureIM/secureim_10.vcxproj.filters
index 3a30f21882..737f043152 100644
--- a/plugins/SecureIM/secureim_10.vcxproj.filters
+++ b/plugins/SecureIM/secureim_10.vcxproj.filters
@@ -15,152 +15,155 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h">
+    <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="crypt.h">
+    <ClInclude Include="src\crypt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cryptopp.h">
+    <ClInclude Include="src\cryptopp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dbevent.h">
+    <ClInclude Include="src\dbevent.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="gettime.h">
+    <ClInclude Include="src\gettime.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="images.h">
+    <ClInclude Include="src\images.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="language.h">
+    <ClInclude Include="src\language.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="loadicons.h">
+    <ClInclude Include="src\loadicons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="loadlib.h">
+    <ClInclude Include="src\loadlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="mmi.h">
+    <ClInclude Include="src\mmi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="popupOptions.h">
+    <ClInclude Include="src\popupOptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="rtfconv.h">
+    <ClInclude Include="src\rtfconv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="secureim.h">
+    <ClInclude Include="src\secureim.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="splitmsg.h">
+    <ClInclude Include="src\splitmsg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_clist.h">
+    <ClInclude Include="src\svcs_clist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_menu.h">
+    <ClInclude Include="src\svcs_menu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_proto.h">
+    <ClInclude Include="src\svcs_proto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_rsa.h">
+    <ClInclude Include="src\svcs_rsa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_srmm.h">
+    <ClInclude Include="src\svcs_srmm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\commonheaders.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_check.cpp">
+    <ClCompile Include="src\crypt_check.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_dll.cpp">
+    <ClCompile Include="src\crypt_dll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_icons.cpp">
+    <ClCompile Include="src\crypt_icons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_lists.cpp">
+    <ClCompile Include="src\crypt_lists.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_metacontacts.cpp">
+    <ClCompile Include="src\crypt_metacontacts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_misc.cpp">
+    <ClCompile Include="src\crypt_misc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crypt_popups.cpp">
+    <ClCompile Include="src\crypt_popups.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dbevent.cpp">
+    <ClCompile Include="src\dbevent.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gettime.cpp">
+    <ClCompile Include="src\gettime.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="images.cpp">
+    <ClCompile Include="src\images.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="language.cpp">
+    <ClCompile Include="src\language.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="loadicons.cpp">
+    <ClCompile Include="src\loadicons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="loadlib.cpp">
+    <ClCompile Include="src\loadlib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mmi.cpp">
+    <ClCompile Include="src\mmi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="popupOptions.cpp">
+    <ClCompile Include="src\popupOptions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="rtfconv.cpp">
+    <ClCompile Include="src\rtfconv.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="splitmsg.cpp">
+    <ClCompile Include="src\splitmsg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_clist.cpp">
+    <ClCompile Include="src\svcs_clist.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_menu.cpp">
+    <ClCompile Include="src\svcs_menu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_proto.cpp">
+    <ClCompile Include="src\svcs_proto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_rsa.cpp">
+    <ClCompile Include="src\svcs_rsa.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_srmm.cpp">
+    <ClCompile Include="src\svcs_srmm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj b/plugins/SecureIM/secureim_icons_10.vcxproj
index be629d525d..aff7599b79 100644
--- a/plugins/SecureIM/secureim_icons_10.vcxproj
+++ b/plugins/SecureIM/secureim_icons_10.vcxproj
@@ -122,7 +122,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource_icons.rc" />
+    <ResourceCompile Include="res\resource_icons.rc" />
+    <ResourceCompile Include="res\version_icons.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj.filters b/plugins/SecureIM/secureim_icons_10.vcxproj.filters
index c5b09773a5..62b3db57fd 100644
--- a/plugins/SecureIM/secureim_icons_10.vcxproj.filters
+++ b/plugins/SecureIM/secureim_icons_10.vcxproj.filters
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{309a0365-ebce-450d-8b06-98d3d2d5e2ba}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{d6176538-1c22-41e7-b82c-e4c9344fd47f}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{abff76b4-ff7b-41c3-bfd2-40efdda4e3d5}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource_icons.rc">
+    <ResourceCompile Include="res\resource_icons.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="res\version_icons.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/SecureIM/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp
index 3697abea6e..3697abea6e 100644
--- a/plugins/SecureIM/commonheaders.cpp
+++ b/plugins/SecureIM/src/commonheaders.cpp
diff --git a/plugins/SecureIM/commonheaders.h b/plugins/SecureIM/src/commonheaders.h
index c848d43484..c848d43484 100644
--- a/plugins/SecureIM/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
diff --git a/plugins/SecureIM/crypt.h b/plugins/SecureIM/src/crypt.h
index e626570f9e..e626570f9e 100644
--- a/plugins/SecureIM/crypt.h
+++ b/plugins/SecureIM/src/crypt.h
diff --git a/plugins/SecureIM/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp
index 3a4a0e0c30..3a4a0e0c30 100644
--- a/plugins/SecureIM/crypt_check.cpp
+++ b/plugins/SecureIM/src/crypt_check.cpp
diff --git a/plugins/SecureIM/crypt_dll.cpp b/plugins/SecureIM/src/crypt_dll.cpp
index 6a97021886..6a97021886 100644
--- a/plugins/SecureIM/crypt_dll.cpp
+++ b/plugins/SecureIM/src/crypt_dll.cpp
diff --git a/plugins/SecureIM/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp
index 6c5984c345..6c5984c345 100644
--- a/plugins/SecureIM/crypt_icons.cpp
+++ b/plugins/SecureIM/src/crypt_icons.cpp
diff --git a/plugins/SecureIM/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp
index 7b68fbd250..7b68fbd250 100644
--- a/plugins/SecureIM/crypt_lists.cpp
+++ b/plugins/SecureIM/src/crypt_lists.cpp
diff --git a/plugins/SecureIM/crypt_metacontacts.cpp b/plugins/SecureIM/src/crypt_metacontacts.cpp
index f36c7e4dd3..f36c7e4dd3 100644
--- a/plugins/SecureIM/crypt_metacontacts.cpp
+++ b/plugins/SecureIM/src/crypt_metacontacts.cpp
diff --git a/plugins/SecureIM/crypt_misc.cpp b/plugins/SecureIM/src/crypt_misc.cpp
index 7e0055913d..7e0055913d 100644
--- a/plugins/SecureIM/crypt_misc.cpp
+++ b/plugins/SecureIM/src/crypt_misc.cpp
diff --git a/plugins/SecureIM/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp
index 836a68efc1..836a68efc1 100644
--- a/plugins/SecureIM/crypt_popups.cpp
+++ b/plugins/SecureIM/src/crypt_popups.cpp
diff --git a/plugins/SecureIM/cryptopp.h b/plugins/SecureIM/src/cryptopp.h
index bfa4e097b3..bfa4e097b3 100644
--- a/plugins/SecureIM/cryptopp.h
+++ b/plugins/SecureIM/src/cryptopp.h
diff --git a/plugins/SecureIM/dbevent.cpp b/plugins/SecureIM/src/dbevent.cpp
index 9b7d8f10c0..9b7d8f10c0 100644
--- a/plugins/SecureIM/dbevent.cpp
+++ b/plugins/SecureIM/src/dbevent.cpp
diff --git a/plugins/SecureIM/dbevent.h b/plugins/SecureIM/src/dbevent.h
index 68719c21c0..68719c21c0 100644
--- a/plugins/SecureIM/dbevent.h
+++ b/plugins/SecureIM/src/dbevent.h
diff --git a/plugins/SecureIM/gettime.cpp b/plugins/SecureIM/src/gettime.cpp
index 529a8e0c8e..529a8e0c8e 100644
--- a/plugins/SecureIM/gettime.cpp
+++ b/plugins/SecureIM/src/gettime.cpp
diff --git a/plugins/SecureIM/gettime.h b/plugins/SecureIM/src/gettime.h
index e84276c609..e84276c609 100644
--- a/plugins/SecureIM/gettime.h
+++ b/plugins/SecureIM/src/gettime.h
diff --git a/plugins/SecureIM/images.cpp b/plugins/SecureIM/src/images.cpp
index eb4c87dea1..eb4c87dea1 100644
--- a/plugins/SecureIM/images.cpp
+++ b/plugins/SecureIM/src/images.cpp
diff --git a/plugins/SecureIM/images.h b/plugins/SecureIM/src/images.h
index ea65b09893..ea65b09893 100644
--- a/plugins/SecureIM/images.h
+++ b/plugins/SecureIM/src/images.h
diff --git a/plugins/SecureIM/language.cpp b/plugins/SecureIM/src/language.cpp
index 9bdf620cea..9bdf620cea 100644
--- a/plugins/SecureIM/language.cpp
+++ b/plugins/SecureIM/src/language.cpp
diff --git a/plugins/SecureIM/language.h b/plugins/SecureIM/src/language.h
index 154e306814..154e306814 100644
--- a/plugins/SecureIM/language.h
+++ b/plugins/SecureIM/src/language.h
diff --git a/plugins/SecureIM/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp
index 3303424626..3303424626 100644
--- a/plugins/SecureIM/loadicons.cpp
+++ b/plugins/SecureIM/src/loadicons.cpp
diff --git a/plugins/SecureIM/loadicons.h b/plugins/SecureIM/src/loadicons.h
index f5258a41a0..f5258a41a0 100644
--- a/plugins/SecureIM/loadicons.h
+++ b/plugins/SecureIM/src/loadicons.h
diff --git a/plugins/SecureIM/loadlib.cpp b/plugins/SecureIM/src/loadlib.cpp
index ac0d2f9272..ac0d2f9272 100644
--- a/plugins/SecureIM/loadlib.cpp
+++ b/plugins/SecureIM/src/loadlib.cpp
diff --git a/plugins/SecureIM/loadlib.h b/plugins/SecureIM/src/loadlib.h
index 105f441dc9..105f441dc9 100644
--- a/plugins/SecureIM/loadlib.h
+++ b/plugins/SecureIM/src/loadlib.h
diff --git a/plugins/SecureIM/main.cpp b/plugins/SecureIM/src/main.cpp
index 205a025ffe..205a025ffe 100644
--- a/plugins/SecureIM/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
diff --git a/plugins/SecureIM/mmi.cpp b/plugins/SecureIM/src/mmi.cpp
index 2269d76a51..2269d76a51 100644
--- a/plugins/SecureIM/mmi.cpp
+++ b/plugins/SecureIM/src/mmi.cpp
diff --git a/plugins/SecureIM/mmi.h b/plugins/SecureIM/src/mmi.h
index 7b3027e232..7b3027e232 100644
--- a/plugins/SecureIM/mmi.h
+++ b/plugins/SecureIM/src/mmi.h
diff --git a/plugins/SecureIM/options.cpp b/plugins/SecureIM/src/options.cpp
index d6cc1a70d6..d6cc1a70d6 100644
--- a/plugins/SecureIM/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
diff --git a/plugins/SecureIM/options.h b/plugins/SecureIM/src/options.h
index c87a0de34d..c87a0de34d 100644
--- a/plugins/SecureIM/options.h
+++ b/plugins/SecureIM/src/options.h
diff --git a/plugins/SecureIM/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp
index 6e08cd81fc..6e08cd81fc 100644
--- a/plugins/SecureIM/popupOptions.cpp
+++ b/plugins/SecureIM/src/popupOptions.cpp
diff --git a/plugins/SecureIM/popupOptions.h b/plugins/SecureIM/src/popupOptions.h
index 22d3453adc..22d3453adc 100644
--- a/plugins/SecureIM/popupOptions.h
+++ b/plugins/SecureIM/src/popupOptions.h
diff --git a/plugins/SecureIM/resource.h b/plugins/SecureIM/src/resource.h
index f8a753773d..f8a753773d 100644
--- a/plugins/SecureIM/resource.h
+++ b/plugins/SecureIM/src/resource.h
diff --git a/plugins/SecureIM/rtfconv.cpp b/plugins/SecureIM/src/rtfconv.cpp
index 994f541373..994f541373 100644
--- a/plugins/SecureIM/rtfconv.cpp
+++ b/plugins/SecureIM/src/rtfconv.cpp
diff --git a/plugins/SecureIM/rtfconv.h b/plugins/SecureIM/src/rtfconv.h
index 2a3e75089b..2a3e75089b 100644
--- a/plugins/SecureIM/rtfconv.h
+++ b/plugins/SecureIM/src/rtfconv.h
diff --git a/plugins/SecureIM/secureim.h b/plugins/SecureIM/src/secureim.h
index a307d1e5a2..a307d1e5a2 100644
--- a/plugins/SecureIM/secureim.h
+++ b/plugins/SecureIM/src/secureim.h
diff --git a/plugins/SecureIM/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp
index ca4f0635cf..ca4f0635cf 100644
--- a/plugins/SecureIM/splitmsg.cpp
+++ b/plugins/SecureIM/src/splitmsg.cpp
diff --git a/plugins/SecureIM/splitmsg.h b/plugins/SecureIM/src/splitmsg.h
index 9f55c2784e..9f55c2784e 100644
--- a/plugins/SecureIM/splitmsg.h
+++ b/plugins/SecureIM/src/splitmsg.h
diff --git a/plugins/SecureIM/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp
index 12402a58be..12402a58be 100644
--- a/plugins/SecureIM/svcs_clist.cpp
+++ b/plugins/SecureIM/src/svcs_clist.cpp
diff --git a/plugins/SecureIM/svcs_clist.h b/plugins/SecureIM/src/svcs_clist.h
index 8c2dd192b6..8c2dd192b6 100644
--- a/plugins/SecureIM/svcs_clist.h
+++ b/plugins/SecureIM/src/svcs_clist.h
diff --git a/plugins/SecureIM/svcs_menu.cpp b/plugins/SecureIM/src/svcs_menu.cpp
index 310d367e1b..310d367e1b 100644
--- a/plugins/SecureIM/svcs_menu.cpp
+++ b/plugins/SecureIM/src/svcs_menu.cpp
diff --git a/plugins/SecureIM/svcs_menu.h b/plugins/SecureIM/src/svcs_menu.h
index 69b079ebf7..69b079ebf7 100644
--- a/plugins/SecureIM/svcs_menu.h
+++ b/plugins/SecureIM/src/svcs_menu.h
diff --git a/plugins/SecureIM/svcs_popup.cpp b/plugins/SecureIM/src/svcs_popup.cpp
index bb1eb88355..bb1eb88355 100644
--- a/plugins/SecureIM/svcs_popup.cpp
+++ b/plugins/SecureIM/src/svcs_popup.cpp
diff --git a/plugins/SecureIM/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp
index ef8d6c850c..ef8d6c850c 100644
--- a/plugins/SecureIM/svcs_proto.cpp
+++ b/plugins/SecureIM/src/svcs_proto.cpp
diff --git a/plugins/SecureIM/svcs_proto.h b/plugins/SecureIM/src/svcs_proto.h
index 64ce1c43a3..64ce1c43a3 100644
--- a/plugins/SecureIM/svcs_proto.h
+++ b/plugins/SecureIM/src/svcs_proto.h
diff --git a/plugins/SecureIM/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp
index e72221dc91..e72221dc91 100644
--- a/plugins/SecureIM/svcs_rsa.cpp
+++ b/plugins/SecureIM/src/svcs_rsa.cpp
diff --git a/plugins/SecureIM/svcs_rsa.h b/plugins/SecureIM/src/svcs_rsa.h
index 3f43e71d30..3f43e71d30 100644
--- a/plugins/SecureIM/svcs_rsa.h
+++ b/plugins/SecureIM/src/svcs_rsa.h
diff --git a/plugins/SecureIM/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp
index 688246847e..688246847e 100644
--- a/plugins/SecureIM/svcs_srmm.cpp
+++ b/plugins/SecureIM/src/svcs_srmm.cpp
diff --git a/plugins/SecureIM/svcs_srmm.h b/plugins/SecureIM/src/svcs_srmm.h
index d64c89ab4e..d64c89ab4e 100644
--- a/plugins/SecureIM/svcs_srmm.h
+++ b/plugins/SecureIM/src/svcs_srmm.h
diff --git a/plugins/SecureIM/version.h b/plugins/SecureIM/src/version.h
index 22b458eac8..22b458eac8 100644
--- a/plugins/SecureIM/version.h
+++ b/plugins/SecureIM/src/version.h
diff --git a/plugins/SeenPlugin/readme_src.txt b/plugins/SeenPlugin/docs/readme_src.txt
index 0769b49b03..0769b49b03 100644
--- a/plugins/SeenPlugin/readme_src.txt
+++ b/plugins/SeenPlugin/docs/readme_src.txt
diff --git a/plugins/SeenPlugin/seen_info.txt b/plugins/SeenPlugin/docs/seen_info.txt
index 5ba87f079a..5ba87f079a 100644
--- a/plugins/SeenPlugin/seen_info.txt
+++ b/plugins/SeenPlugin/docs/seen_info.txt
diff --git a/plugins/SeenPlugin/seenplugin-translation.txt b/plugins/SeenPlugin/docs/seenplugin-translation.txt
index 67bbc30ebf..67bbc30ebf 100644
--- a/plugins/SeenPlugin/seenplugin-translation.txt
+++ b/plugins/SeenPlugin/docs/seenplugin-translation.txt
diff --git a/plugins/SeenPlugin/resource.rc b/plugins/SeenPlugin/res/resource.rc
index d813b69be3..4f93191aca 100644
--- a/plugins/SeenPlugin/resource.rc
+++ b/plugins/SeenPlugin/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +28,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 1 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE DISCARDABLE 
@@ -221,8 +221,6 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -265,8 +263,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
 #endif    // German (Germany) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/SeenPlugin/seenplugin_10.vcxproj b/plugins/SeenPlugin/seenplugin_10.vcxproj
index 29b4004f10..4e83e465ef 100644
--- a/plugins/SeenPlugin/seenplugin_10.vcxproj
+++ b/plugins/SeenPlugin/seenplugin_10.vcxproj
@@ -75,11 +75,10 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;PERMITNSN;NDEBUG;_WINDOWS;_USRDLL;MP_SEEN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -103,11 +102,10 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;PERMITNSN;NDEBUG;_WINDOWS;_USRDLL;MP_SEEN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,13 +127,12 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;PERMITNSN;_DEBUG;_WINDOWS;_USRDLL;MP_SEEN_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)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -155,11 +152,10 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;PERMITNSN;_DEBUG;_WINDOWS;_USRDLL;MP_SEEN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -176,25 +172,21 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="file.cpp" />
-    <ClCompile Include="history.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="menu.cpp" />
-    <ClCompile Include="missed.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="userinfo.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\file.cpp" />
+    <ClCompile Include="src\history.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\menu.cpp" />
+    <ClCompile Include="src\missed.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\userinfo.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="seen.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\seen.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="seen_info.txt" />
-    <None Include="seen_langpack.txt" />
+    <ResourceCompile Include="res\resource.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/SeenPlugin/seenplugin_10.vcxproj.filters b/plugins/SeenPlugin/seenplugin_10.vcxproj.filters
index 01ad56020d..77ba5eda3f 100644
--- a/plugins/SeenPlugin/seenplugin_10.vcxproj.filters
+++ b/plugins/SeenPlugin/seenplugin_10.vcxproj.filters
@@ -15,46 +15,42 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="file.cpp">
+    <ClCompile Include="src\file.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="history.cpp">
+    <ClCompile Include="src\history.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="menu.cpp">
+    <ClCompile Include="src\menu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="missed.cpp">
+    <ClCompile Include="src\missed.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="userinfo.cpp">
+    <ClCompile Include="src\userinfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="seen.h">
+    <ClInclude Include="src\seen.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="seen_info.txt" />
-    <None Include="seen_langpack.txt" />
-  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/plugins/SeenPlugin/file.cpp b/plugins/SeenPlugin/src/file.cpp
index cac37f8c30..cac37f8c30 100644
--- a/plugins/SeenPlugin/file.cpp
+++ b/plugins/SeenPlugin/src/file.cpp
diff --git a/plugins/SeenPlugin/history.cpp b/plugins/SeenPlugin/src/history.cpp
index 724cfd5612..724cfd5612 100644
--- a/plugins/SeenPlugin/history.cpp
+++ b/plugins/SeenPlugin/src/history.cpp
diff --git a/plugins/SeenPlugin/main.cpp b/plugins/SeenPlugin/src/main.cpp
index 68a774e435..68a774e435 100644
--- a/plugins/SeenPlugin/main.cpp
+++ b/plugins/SeenPlugin/src/main.cpp
diff --git a/plugins/SeenPlugin/menu.cpp b/plugins/SeenPlugin/src/menu.cpp
index 02f241b793..02f241b793 100644
--- a/plugins/SeenPlugin/menu.cpp
+++ b/plugins/SeenPlugin/src/menu.cpp
diff --git a/plugins/SeenPlugin/missed.cpp b/plugins/SeenPlugin/src/missed.cpp
index 179dd8ee4d..179dd8ee4d 100644
--- a/plugins/SeenPlugin/missed.cpp
+++ b/plugins/SeenPlugin/src/missed.cpp
diff --git a/plugins/SeenPlugin/options.cpp b/plugins/SeenPlugin/src/options.cpp
index daab1e8ee3..daab1e8ee3 100644
--- a/plugins/SeenPlugin/options.cpp
+++ b/plugins/SeenPlugin/src/options.cpp
diff --git a/plugins/SeenPlugin/resource.h b/plugins/SeenPlugin/src/resource.h
index 110639bb3b..110639bb3b 100644
--- a/plugins/SeenPlugin/resource.h
+++ b/plugins/SeenPlugin/src/resource.h
diff --git a/plugins/SeenPlugin/seen.h b/plugins/SeenPlugin/src/seen.h
index ba2b13a6c2..ba2b13a6c2 100644
--- a/plugins/SeenPlugin/seen.h
+++ b/plugins/SeenPlugin/src/seen.h
diff --git a/plugins/SeenPlugin/userinfo.cpp b/plugins/SeenPlugin/src/userinfo.cpp
index 442860bb86..442860bb86 100644
--- a/plugins/SeenPlugin/userinfo.cpp
+++ b/plugins/SeenPlugin/src/userinfo.cpp
diff --git a/plugins/SeenPlugin/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index d989f9e999..d989f9e999 100644
--- a/plugins/SeenPlugin/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
diff --git a/plugins/SendScreenshotPlus/SendSS_10.vcxproj b/plugins/SendScreenshotPlus/SendSS_10.vcxproj
index d58df0064f..cd757979d6 100644
--- a/plugins/SendScreenshotPlus/SendSS_10.vcxproj
+++ b/plugins/SendScreenshotPlus/SendSS_10.vcxproj
@@ -73,7 +73,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>sdk;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
@@ -97,7 +97,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>sdk;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -118,7 +118,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>sdk;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
@@ -142,7 +142,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>sdk;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -161,69 +161,43 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="UAboutForm.cpp" />
-    <ClCompile Include="UMainForm.cpp" />
-    <ClCompile Include="ctrl_button.cpp" />
-    <ClCompile Include="dlg_msgbox.cpp" />
-    <ClCompile Include="mir_icolib.cpp" />
-    <ClCompile Include="mir_string.cpp" />
-    <ClCompile Include="Utils.cpp" />
-    <ClCompile Include="CSend.cpp" />
-    <ClCompile Include="CSendEmail.cpp" />
-    <ClCompile Include="CSendFile.cpp" />
-    <ClCompile Include="CSendFTPFile.cpp" />
-    <ClCompile Include="CSendHTTPServer.cpp" />
-    <ClCompile Include="CSendImageShack.cpp" />
-    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="src\UAboutForm.cpp" />
+    <ClCompile Include="src\UMainForm.cpp" />
+    <ClCompile Include="src\ctrl_button.cpp" />
+    <ClCompile Include="src\dlg_msgbox.cpp" />
+    <ClCompile Include="src\mir_icolib.cpp" />
+    <ClCompile Include="src\mir_string.cpp" />
+    <ClCompile Include="src\Utils.cpp" />
+    <ClCompile Include="src\CSend.cpp" />
+    <ClCompile Include="src\CSendEmail.cpp" />
+    <ClCompile Include="src\CSendFile.cpp" />
+    <ClCompile Include="src\CSendFTPFile.cpp" />
+    <ClCompile Include="src\CSendHTTPServer.cpp" />
+    <ClCompile Include="src\CSendImageShack.cpp" />
+    <ClCompile Include="src\Main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="UAboutForm.h" />
-    <ClInclude Include="UMainForm.h" />
-    <ClInclude Include="ctrl_button.h" />
-    <ClInclude Include="dlg_msgbox.h" />
-    <ClInclude Include="mir_icolib.h" />
-    <ClInclude Include="mir_string.h" />
-    <ClInclude Include="Utils.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="CSend.h" />
-    <ClInclude Include="CSendEmail.h" />
-    <ClInclude Include="CSendFile.h" />
-    <ClInclude Include="CSendFTPFile.h" />
-    <ClInclude Include="CSendHTTPServer.h" />
-    <ClInclude Include="CSendImageShack.h" />
-    <ClInclude Include="global.h" />
-    <ClInclude Include="Main.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\UAboutForm.h" />
+    <ClInclude Include="src\UMainForm.h" />
+    <ClInclude Include="src\ctrl_button.h" />
+    <ClInclude Include="src\dlg_msgbox.h" />
+    <ClInclude Include="src\mir_icolib.h" />
+    <ClInclude Include="src\mir_string.h" />
+    <ClInclude Include="src\Utils.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\CSend.h" />
+    <ClInclude Include="src\CSendEmail.h" />
+    <ClInclude Include="src\CSendFile.h" />
+    <ClInclude Include="src\CSendFTPFile.h" />
+    <ClInclude Include="src\CSendHTTPServer.h" />
+    <ClInclude Include="src\CSendImageShack.h" />
+    <ClInclude Include="src\global.h" />
+    <ClInclude Include="src\Main.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\009_avatar.ico" />
-    <None Include="res\credits.txt" />
-    <None Include="res\default.ico" />
-    <None Include="res\icon1.ico" />
-    <None Include="res\license.txt" />
-    <None Include="res\overlay_disabled.ico" />
-    <None Include="res\overlay_enabled.ico" />
-    <None Include="res\ssArrow_Left.ico" />
-    <None Include="res\ssArrow_Right.ico" />
-    <None Include="res\ssCamera.ico" />
-    <None Include="res\ssCamera_1.ico" />
-    <None Include="res\ssCamera_2.ico" />
-    <None Include="res\ssDefault.ico" />
-    <None Include="res\ssDelOff.ico" />
-    <None Include="res\ssDelOn.ico" />
-    <None Include="res\ssDeskOff.ico" />
-    <None Include="res\ssDeskOn.ico" />
-    <None Include="res\sshelp.ico" />
-    <None Include="res\ssMonitor.ico" />
-    <None Include="res\ssOpen.ico" />
-    <None Include="res\ssTarget.ico" />
-    <None Include="res\treePhoto.ico" />
-    <None Include="res\UEditForm_nvr_1.bmp" />
-    <None Include="res\UEditForm_nvr_2.bmp" />
-  </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/SendScreenshotPlus/SendSS_10.vcxproj.filters b/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters
index 1c963f799a..3747d35c3d 100644
--- a/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters
+++ b/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters
@@ -18,181 +18,107 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="UAboutForm.cpp">
+    <ClCompile Include="src\UAboutForm.cpp">
       <Filter>Class Form</Filter>
     </ClCompile>
-    <ClCompile Include="UMainForm.cpp">
+    <ClCompile Include="src\UMainForm.cpp">
       <Filter>Class Form</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_button.cpp">
+    <ClCompile Include="src\ctrl_button.cpp">
       <Filter>Helper</Filter>
     </ClCompile>
-    <ClCompile Include="dlg_msgbox.cpp">
+    <ClCompile Include="src\dlg_msgbox.cpp">
       <Filter>Helper</Filter>
     </ClCompile>
-    <ClCompile Include="mir_icolib.cpp">
+    <ClCompile Include="src\mir_icolib.cpp">
       <Filter>Helper</Filter>
     </ClCompile>
-    <ClCompile Include="mir_string.cpp">
+    <ClCompile Include="src\mir_string.cpp">
       <Filter>Helper</Filter>
     </ClCompile>
-    <ClCompile Include="Utils.cpp">
+    <ClCompile Include="src\Utils.cpp">
       <Filter>Helper</Filter>
     </ClCompile>
-    <ClCompile Include="CSend.cpp">
+    <ClCompile Include="src\CSend.cpp">
       <Filter>Class Send</Filter>
     </ClCompile>
-    <ClCompile Include="CSendEmail.cpp">
+    <ClCompile Include="src\CSendEmail.cpp">
       <Filter>Class Send</Filter>
     </ClCompile>
-    <ClCompile Include="CSendFile.cpp">
+    <ClCompile Include="src\CSendFile.cpp">
       <Filter>Class Send</Filter>
     </ClCompile>
-    <ClCompile Include="CSendFTPFile.cpp">
+    <ClCompile Include="src\CSendFTPFile.cpp">
       <Filter>Class Send</Filter>
     </ClCompile>
-    <ClCompile Include="CSendHTTPServer.cpp">
+    <ClCompile Include="src\CSendHTTPServer.cpp">
       <Filter>Class Send</Filter>
     </ClCompile>
-    <ClCompile Include="CSendImageShack.cpp">
+    <ClCompile Include="src\CSendImageShack.cpp">
       <Filter>Class Send</Filter>
     </ClCompile>
-    <ClCompile Include="Main.cpp">
+    <ClCompile Include="src\Main.cpp">
       <Filter>Class Form</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="UAboutForm.h">
+    <ClInclude Include="src\UAboutForm.h">
       <Filter>Class Form</Filter>
     </ClInclude>
-    <ClInclude Include="UMainForm.h">
+    <ClInclude Include="src\UMainForm.h">
       <Filter>Class Form</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_button.h">
+    <ClInclude Include="src\ctrl_button.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="dlg_msgbox.h">
+    <ClInclude Include="src\dlg_msgbox.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="mir_icolib.h">
+    <ClInclude Include="src\mir_icolib.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="mir_string.h">
+    <ClInclude Include="src\mir_string.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="Utils.h">
+    <ClInclude Include="src\Utils.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="CSend.h">
+    <ClInclude Include="src\CSend.h">
       <Filter>Class Send</Filter>
     </ClInclude>
-    <ClInclude Include="CSendEmail.h">
+    <ClInclude Include="src\CSendEmail.h">
       <Filter>Class Send</Filter>
     </ClInclude>
-    <ClInclude Include="CSendFile.h">
+    <ClInclude Include="src\CSendFile.h">
       <Filter>Class Send</Filter>
     </ClInclude>
-    <ClInclude Include="CSendFTPFile.h">
+    <ClInclude Include="src\CSendFTPFile.h">
       <Filter>Class Send</Filter>
     </ClInclude>
-    <ClInclude Include="CSendHTTPServer.h">
+    <ClInclude Include="src\CSendHTTPServer.h">
       <Filter>Class Send</Filter>
     </ClInclude>
-    <ClInclude Include="CSendImageShack.h">
+    <ClInclude Include="src\CSendImageShack.h">
       <Filter>Class Send</Filter>
     </ClInclude>
-    <ClInclude Include="global.h">
+    <ClInclude Include="src\global.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="Main.h">
+    <ClInclude Include="src\Main.h">
       <Filter>Helper</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Helper</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\009_avatar.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\credits.txt">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\default.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\icon1.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\license.txt">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\overlay_disabled.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\overlay_enabled.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssArrow_Left.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssArrow_Right.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssCamera.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssCamera_1.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssCamera_2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssDefault.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssDelOff.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssDelOn.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssDeskOff.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssDeskOn.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\sshelp.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssMonitor.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssOpen.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\ssTarget.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\treePhoto.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\UEditForm_nvr_1.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\UEditForm_nvr_2.bmp">
-      <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/SendScreenshotPlus/res/credits.txt b/plugins/SendScreenshotPlus/docs/credits.txt
index 122042be3b..122042be3b 100644
--- a/plugins/SendScreenshotPlus/res/credits.txt
+++ b/plugins/SendScreenshotPlus/docs/credits.txt
diff --git a/plugins/SendScreenshotPlus/res/license.txt b/plugins/SendScreenshotPlus/docs/license.txt
index c5ebcce31f..c5ebcce31f 100644
--- a/plugins/SendScreenshotPlus/res/license.txt
+++ b/plugins/SendScreenshotPlus/docs/license.txt
diff --git a/plugins/SendScreenshotPlus/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc
index 8e24cc0204..6a0a12a119 100644
--- a/plugins/SendScreenshotPlus/resource.rc
+++ b/plugins/SendScreenshotPlus/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -146,37 +146,29 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_PLUG_MAIN           ICON                    "res\\ssCamera_1.ico"
-IDI_PLUG_ICON1          ICON                    "res\\ssCamera_2.ico"
-IDI_PLUG_DEFAULT        ICON                    "res\\ssDefault.ico"
-IDI_PLUG_ICON2          ICON                    "res\\ssTarget.ico"
-IDI_PLUG_ICON3          ICON                    "res\\ssMonitor.ico"
-IDI_PLUG_HELP           ICON                    "res\\sshelp.ico"
-IDI_PLUG_FOLDERO        ICON                    "res\\ssOpen.ico"
-IDI_PLUG_ARROWL         ICON                    "res\\ssArrow_Left.ico"
-IDI_PLUG_ARROWR         ICON                    "res\\ssArrow_Right.ico"
-IDI_PLUG_OVERLAYOFF     ICON                    "res\\overlay_disabled.ico"
-IDI_PLUG_OVERLAYON      ICON                    "res\\overlay_enabled.ico"
-IDI_PLUG_DESKOFF        ICON                    "res\\ssDeskOff.ico"
-IDI_PLUG_DESKON         ICON                    "res\\ssDeskOn.ico"
-IDI_PLUG_DELOFF         ICON                    "res\\ssDelOff.ico"
-IDI_PLUG_DELON          ICON                    "res\\ssDelOn.ico"
+IDI_PLUG_MAIN           ICON                    "ssCamera_1.ico"
+IDI_PLUG_ICON1          ICON                    "ssCamera_2.ico"
+IDI_PLUG_DEFAULT        ICON                    "ssDefault.ico"
+IDI_PLUG_ICON2          ICON                    "ssTarget.ico"
+IDI_PLUG_ICON3          ICON                    "ssMonitor.ico"
+IDI_PLUG_HELP           ICON                    "sshelp.ico"
+IDI_PLUG_FOLDERO        ICON                    "ssOpen.ico"
+IDI_PLUG_ARROWL         ICON                    "ssArrow_Left.ico"
+IDI_PLUG_ARROWR         ICON                    "ssArrow_Right.ico"
+IDI_PLUG_OVERLAYOFF     ICON                    "overlay_disabled.ico"
+IDI_PLUG_OVERLAYON      ICON                    "overlay_enabled.ico"
+IDI_PLUG_DESKOFF        ICON                    "ssDeskOff.ico"
+IDI_PLUG_DESKON         ICON                    "ssDeskOn.ico"
+IDI_PLUG_DELOFF         ICON                    "ssDelOff.ico"
+IDI_PLUG_DELON          ICON                    "ssDelOn.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-IDB_Bmp1                BITMAP                  "res\\UEditForm_nvr_1.bmp"
-IDB_Bmp2                BITMAP                  "res\\UEditForm_nvr_2.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXT
-//
-
-IDR_CREDIT              TEXT                    "./res/credits.txt"
-IDR_LICENSE             TEXT                    "./res/license.txt"
+IDB_Bmp1                BITMAP                  "UEditForm_nvr_1.bmp"
+IDB_Bmp2                BITMAP                  "UEditForm_nvr_2.bmp"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -186,7 +178,7 @@ IDR_LICENSE             TEXT                    "./res/license.txt"
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/SendScreenshotPlus/version.rc b/plugins/SendScreenshotPlus/res/version.rc
index 13b9affcf7..453bbb1742 100644
--- a/plugins/SendScreenshotPlus/version.rc
+++ b/plugins/SendScreenshotPlus/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h> // include for version info constants
-#include "version.h"
+#include "..\src\version.h"
 
 //
 // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
diff --git a/plugins/SendScreenshotPlus/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index 4e48ecb2b4..4e48ecb2b4 100644
--- a/plugins/SendScreenshotPlus/CSend.cpp
+++ b/plugins/SendScreenshotPlus/src/CSend.cpp
diff --git a/plugins/SendScreenshotPlus/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index 082f3e961a..082f3e961a 100644
--- a/plugins/SendScreenshotPlus/CSend.h
+++ b/plugins/SendScreenshotPlus/src/CSend.h
diff --git a/plugins/SendScreenshotPlus/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
index 14e539ea0d..14e539ea0d 100644
--- a/plugins/SendScreenshotPlus/CSendEmail.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
diff --git a/plugins/SendScreenshotPlus/CSendEmail.h b/plugins/SendScreenshotPlus/src/CSendEmail.h
index 940558b0d6..940558b0d6 100644
--- a/plugins/SendScreenshotPlus/CSendEmail.h
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.h
diff --git a/plugins/SendScreenshotPlus/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
index d7512d2fe6..d7512d2fe6 100644
--- a/plugins/SendScreenshotPlus/CSendFTPFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
diff --git a/plugins/SendScreenshotPlus/CSendFTPFile.h b/plugins/SendScreenshotPlus/src/CSendFTPFile.h
index 6012f76232..6012f76232 100644
--- a/plugins/SendScreenshotPlus/CSendFTPFile.h
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.h
diff --git a/plugins/SendScreenshotPlus/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp
index 1884c8307f..1884c8307f 100644
--- a/plugins/SendScreenshotPlus/CSendFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFile.cpp
diff --git a/plugins/SendScreenshotPlus/CSendFile.h b/plugins/SendScreenshotPlus/src/CSendFile.h
index edbb49822d..edbb49822d 100644
--- a/plugins/SendScreenshotPlus/CSendFile.h
+++ b/plugins/SendScreenshotPlus/src/CSendFile.h
diff --git a/plugins/SendScreenshotPlus/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index 788ebca4d1..788ebca4d1 100644
--- a/plugins/SendScreenshotPlus/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
diff --git a/plugins/SendScreenshotPlus/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
index 129153e0c6..129153e0c6 100644
--- a/plugins/SendScreenshotPlus/CSendHTTPServer.h
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
diff --git a/plugins/SendScreenshotPlus/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
index a27b4f5273..a27b4f5273 100644
--- a/plugins/SendScreenshotPlus/CSendImageShack.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
diff --git a/plugins/SendScreenshotPlus/CSendImageShack.h b/plugins/SendScreenshotPlus/src/CSendImageShack.h
index eae406aca9..eae406aca9 100644
--- a/plugins/SendScreenshotPlus/CSendImageShack.h
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.h
diff --git a/plugins/SendScreenshotPlus/sdk/DevKey.h b/plugins/SendScreenshotPlus/src/DevKey.h
index 2999f74466..2999f74466 100644
--- a/plugins/SendScreenshotPlus/sdk/DevKey.h
+++ b/plugins/SendScreenshotPlus/src/DevKey.h
diff --git a/plugins/SendScreenshotPlus/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 75e5655ac5..75e5655ac5 100644
--- a/plugins/SendScreenshotPlus/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
diff --git a/plugins/SendScreenshotPlus/Main.h b/plugins/SendScreenshotPlus/src/Main.h
index 67059fb73c..67059fb73c 100644
--- a/plugins/SendScreenshotPlus/Main.h
+++ b/plugins/SendScreenshotPlus/src/Main.h
diff --git a/plugins/SendScreenshotPlus/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp
index f4ea2b6bc2..f4ea2b6bc2 100644
--- a/plugins/SendScreenshotPlus/UAboutForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp
diff --git a/plugins/SendScreenshotPlus/UAboutForm.h b/plugins/SendScreenshotPlus/src/UAboutForm.h
index d9d598aeb6..d9d598aeb6 100644
--- a/plugins/SendScreenshotPlus/UAboutForm.h
+++ b/plugins/SendScreenshotPlus/src/UAboutForm.h
diff --git a/plugins/SendScreenshotPlus/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 2061f80d83..2061f80d83 100644
--- a/plugins/SendScreenshotPlus/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
diff --git a/plugins/SendScreenshotPlus/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h
index a7fdcdc643..a7fdcdc643 100644
--- a/plugins/SendScreenshotPlus/UMainForm.h
+++ b/plugins/SendScreenshotPlus/src/UMainForm.h
diff --git a/plugins/SendScreenshotPlus/Utils.cpp b/plugins/SendScreenshotPlus/src/Utils.cpp
index f1b7251fd7..f1b7251fd7 100644
--- a/plugins/SendScreenshotPlus/Utils.cpp
+++ b/plugins/SendScreenshotPlus/src/Utils.cpp
diff --git a/plugins/SendScreenshotPlus/Utils.h b/plugins/SendScreenshotPlus/src/Utils.h
index 2934391a8b..2934391a8b 100644
--- a/plugins/SendScreenshotPlus/Utils.h
+++ b/plugins/SendScreenshotPlus/src/Utils.h
diff --git a/plugins/SendScreenshotPlus/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
index ad8e542fa3..ad8e542fa3 100644
--- a/plugins/SendScreenshotPlus/ctrl_button.cpp
+++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
diff --git a/plugins/SendScreenshotPlus/ctrl_button.h b/plugins/SendScreenshotPlus/src/ctrl_button.h
index dc77334b05..dc77334b05 100644
--- a/plugins/SendScreenshotPlus/ctrl_button.h
+++ b/plugins/SendScreenshotPlus/src/ctrl_button.h
diff --git a/plugins/SendScreenshotPlus/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
index f1b1535802..f1b1535802 100644
--- a/plugins/SendScreenshotPlus/dlg_msgbox.cpp
+++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
diff --git a/plugins/SendScreenshotPlus/dlg_msgbox.h b/plugins/SendScreenshotPlus/src/dlg_msgbox.h
index a6cd04c6b7..a6cd04c6b7 100644
--- a/plugins/SendScreenshotPlus/dlg_msgbox.h
+++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.h
diff --git a/plugins/SendScreenshotPlus/global.h b/plugins/SendScreenshotPlus/src/global.h
index 48586f83d3..48586f83d3 100644
--- a/plugins/SendScreenshotPlus/global.h
+++ b/plugins/SendScreenshotPlus/src/global.h
diff --git a/plugins/SendScreenshotPlus/sdk/icons.h b/plugins/SendScreenshotPlus/src/icons.h
index 46871836bd..46871836bd 100644
--- a/plugins/SendScreenshotPlus/sdk/icons.h
+++ b/plugins/SendScreenshotPlus/src/icons.h
diff --git a/plugins/SendScreenshotPlus/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp
index 33718faf98..33718faf98 100644
--- a/plugins/SendScreenshotPlus/mir_icolib.cpp
+++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp
diff --git a/plugins/SendScreenshotPlus/mir_icolib.h b/plugins/SendScreenshotPlus/src/mir_icolib.h
index b80c014a07..b80c014a07 100644
--- a/plugins/SendScreenshotPlus/mir_icolib.h
+++ b/plugins/SendScreenshotPlus/src/mir_icolib.h
diff --git a/plugins/SendScreenshotPlus/mir_string.cpp b/plugins/SendScreenshotPlus/src/mir_string.cpp
index 0ee154b7b9..0ee154b7b9 100644
--- a/plugins/SendScreenshotPlus/mir_string.cpp
+++ b/plugins/SendScreenshotPlus/src/mir_string.cpp
diff --git a/plugins/SendScreenshotPlus/mir_string.h b/plugins/SendScreenshotPlus/src/mir_string.h
index 882cd38896..882cd38896 100644
--- a/plugins/SendScreenshotPlus/mir_string.h
+++ b/plugins/SendScreenshotPlus/src/mir_string.h
diff --git a/plugins/SendScreenshotPlus/resource.h b/plugins/SendScreenshotPlus/src/resource.h
index 6818f5b23f..6818f5b23f 100644
--- a/plugins/SendScreenshotPlus/resource.h
+++ b/plugins/SendScreenshotPlus/src/resource.h
diff --git a/plugins/SendScreenshotPlus/version.h b/plugins/SendScreenshotPlus/src/version.h
index a97e7aff37..a97e7aff37 100644
--- a/plugins/SendScreenshotPlus/version.h
+++ b/plugins/SendScreenshotPlus/src/version.h
diff --git a/plugins/Sessions/Sessions_10.vcxproj b/plugins/Sessions/Sessions_10.vcxproj
index 2a5d0fcf7f..b300532992 100644
--- a/plugins/Sessions/Sessions_10.vcxproj
+++ b/plugins/Sessions/Sessions_10.vcxproj
@@ -182,22 +182,14 @@
     <ClCompile Include="Src\Utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Resource.h" />
+    <ClInclude Include="src\Resource.h" />
     <ClInclude Include="Src\Sessions.h" />
     <ClInclude Include="Src\Utils.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="src\Version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Icons\Checked.ico" />
-    <None Include="Icons\Load.ico" />
-    <None Include="Icons\Loadlast.ico" />
-    <None Include="Icons\Save.ico" />
-    <None Include="Icons\Sessions.ico" />
-    <None Include="Icons\Unchecked.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Sessions.rc" />
-    <ResourceCompile Include="Version.rc" />
+    <ResourceCompile Include="res\Sessions.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Sessions/Sessions_10.vcxproj.filters b/plugins/Sessions/Sessions_10.vcxproj.filters
index 7a24363825..41b3127e59 100644
--- a/plugins/Sessions/Sessions_10.vcxproj.filters
+++ b/plugins/Sessions/Sessions_10.vcxproj.filters
@@ -26,10 +26,10 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="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>
     <ClInclude Include="Src\Utils.h">
@@ -40,30 +40,10 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="icons\checked.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icons\load.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icons\loadlast.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icons\save.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icons\sessions.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="icons\unchecked.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="sessions.rc">
+    <ResourceCompile Include="res\sessions.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/Sessions/Resource.h b/plugins/Sessions/Src/Resource.h
index 0a70198bcf..0a70198bcf 100644
--- a/plugins/Sessions/Resource.h
+++ b/plugins/Sessions/Src/Resource.h
diff --git a/plugins/Sessions/Src/Sessions.h b/plugins/Sessions/Src/Sessions.h
index 18c2878938..11883cae42 100644
--- a/plugins/Sessions/Src/Sessions.h
+++ b/plugins/Sessions/Src/Sessions.h
@@ -43,8 +43,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m_sessions.h"
 
 #include "Utils.h"
-#include "../Version.h"
-#include "../Resource.h"
+#include "Version.h"
+#include "Resource.h"
 
 extern HANDLE hibChecked;
 extern HANDLE hibNotChecked;
diff --git a/plugins/Sessions/Version.h b/plugins/Sessions/Src/Version.h
index ee0f3f450b..44e6d972f4 100644
--- a/plugins/Sessions/Version.h
+++ b/plugins/Sessions/Src/Version.h
@@ -17,5 +17,5 @@
 #define __DESCRIPTION 				"Sessions Manager for Miranda IM."
 #define __AUTHOR					"MaD_CLuSTeR"
 #define __AUTHOREMAIL				"daniok@yandex.ru"
-#define __AUTHORWEB					"http://nightly.miranda.im/"
+#define __AUTHORWEB					"http://miranda.radicaled.ru/index.php?plugin=2"
 #define __COPYRIGHT					"� 2007-2008 Danil Mozhar"
diff --git a/plugins/Sessions/sessions-translation.txt b/plugins/Sessions/docs/sessions-translation.txt
index 96153c70d0..96153c70d0 100644
--- a/plugins/Sessions/sessions-translation.txt
+++ b/plugins/Sessions/docs/sessions-translation.txt
diff --git a/plugins/Sessions/Icons/Checked.ico b/plugins/Sessions/res/Checked.ico
index e19208cdb3..e19208cdb3 100644
--- a/plugins/Sessions/Icons/Checked.ico
+++ b/plugins/Sessions/res/Checked.ico
diff --git a/plugins/Sessions/Icons/Load.ico b/plugins/Sessions/res/Load.ico
index 448a2e907d..448a2e907d 100644
--- a/plugins/Sessions/Icons/Load.ico
+++ b/plugins/Sessions/res/Load.ico
diff --git a/plugins/Sessions/Icons/Loadlast.ico b/plugins/Sessions/res/Loadlast.ico
index a86082e547..a86082e547 100644
--- a/plugins/Sessions/Icons/Loadlast.ico
+++ b/plugins/Sessions/res/Loadlast.ico
diff --git a/plugins/Sessions/Icons/Save.ico b/plugins/Sessions/res/Save.ico
index 9d19bff626..9d19bff626 100644
--- a/plugins/Sessions/Icons/Save.ico
+++ b/plugins/Sessions/res/Save.ico
diff --git a/plugins/Sessions/Icons/Sessions.ico b/plugins/Sessions/res/Sessions.ico
index 823c49aa17..823c49aa17 100644
--- a/plugins/Sessions/Icons/Sessions.ico
+++ b/plugins/Sessions/res/Sessions.ico
diff --git a/plugins/Sessions/Sessions.rc b/plugins/Sessions/res/Sessions.rc
index 7f430930a0..746831c05a 100644
--- a/plugins/Sessions/Sessions.rc
+++ b/plugins/Sessions/res/Sessions.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -29,8 +29,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
-    "version.rc\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -212,12 +211,12 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_SESSIONS            ICON                    "icons\\sessions.ico"
-IDI_SESSIONS_LOAD       ICON                    "icons\\load.ico"
-IDD_SESSIONS_SAVE       ICON                    "icons\\save.ico"
-IDD_SESSIONS_LOADLAST   ICON                    "icons\\loadlast.ico"
-IDD_SESSION_CHECKED     ICON                    "icons\\checked.ico"
-IDD_SESSION_UNCHECKED   ICON                    "icons\\unchecked.ico"
+IDI_SESSIONS            ICON                    "sessions.ico"
+IDI_SESSIONS_LOAD       ICON                    "load.ico"
+IDD_SESSIONS_SAVE       ICON                    "save.ico"
+IDD_SESSIONS_LOADLAST   ICON                    "loadlast.ico"
+IDD_SESSION_CHECKED     ICON                    "checked.ico"
+IDD_SESSION_UNCHECKED   ICON                    "unchecked.ico"
 
 
 #endif    // Russian resources
diff --git a/plugins/Sessions/Icons/Unchecked.ico b/plugins/Sessions/res/Unchecked.ico
index 30331f14d8..30331f14d8 100644
--- a/plugins/Sessions/Icons/Unchecked.ico
+++ b/plugins/Sessions/res/Unchecked.ico
diff --git a/plugins/Sessions/Version.rc b/plugins/Sessions/res/Version.rc
index d1da5e8d6a..d741488c4f 100644
--- a/plugins/Sessions/Version.rc
+++ b/plugins/Sessions/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