11 files changed, 23 insertions, 57 deletions
diff --git a/plugins/FileAsMessage/fileecho.vcxproj b/plugins/FileAsMessage/fileecho.vcxproj
index f56a0cb4d5..f85432de07 100644
--- a/plugins/FileAsMessage/fileecho.vcxproj
+++ b/plugins/FileAsMessage/fileecho.vcxproj
@@ -149,7 +149,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -167,24 +166,18 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="crc32.cpp" />
-    <ClCompile Include="dialog.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="optionsdlg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dialog.h" />
-    <ClInclude Include="main.h" />
+    <ClCompile Include="src\crc32.cpp" />
+    <ClCompile Include="src\dialog.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\optionsdlg.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\abort.ico" />
-    <None Include="file.ico" />
-    <None Include="res\pause.ico" />
-    <None Include="res\play.ico" />
-    <None Include="res\refresh.ico" />
+    <ClInclude Include="src\dialog.h" />
+    <ClInclude Include="src\main.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resources.rc" />
+    <ResourceCompile Include="res\resources.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FileAsMessage/fileecho.vcxproj.filters b/plugins/FileAsMessage/fileecho.vcxproj.filters
index 68d28e0f7e..2668a9153b 100644
--- a/plugins/FileAsMessage/fileecho.vcxproj.filters
+++ b/plugins/FileAsMessage/fileecho.vcxproj.filters
@@ -15,24 +15,27 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dialog.cpp">
+    <ClCompile Include="src\dialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="optionsdlg.cpp">
+    <ClCompile Include="src\optionsdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crc32.cpp">
+    <ClCompile Include="src\crc32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="dialog.h">
+    <ClInclude Include="src\dialog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="main.h">
+    <ClInclude Include="src\main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/FileAsMessage/main.rc b/plugins/FileAsMessage/main.rc
deleted file mode 100644
index 73be51abff..0000000000
--- a/plugins/FileAsMessage/main.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "windows.h"
-#include "resource.h"
-IDD_OPTIONS DIALOGEX 0,0,210,164
-FONT 8,"MS Shell Dlg"
-STYLE 0x50000008
-EXSTYLE 0x00010000
-BEGIN
-  CONTROL "Hide delay",IDC_STATIC,"Static",0x50020002,15,135,88,8,0x00000000
-  CONTROL "",IDC_HIDEDELAY,"Edit",0x50010080,108,132,45,14,0x00000200
-  CONTROL "ms",IDC_STATIC,"Static",0x50020000,155,117,33,8,0x00000000
-  CONTROL "Show delay",IDC_STATIC,"Static",0x50020002,15,117,88,8,0x00000000
-  CONTROL "",IDC_SHOWDELAY,"Edit",0x50010080,108,114,45,14,0x00000200
-  CONTROL "ms",IDC_STATIC,"Static",0x50020000,155,135,40,8,0x00000000
-  CONTROL "Screen position",IDC_STATIC,"Button",0x50000007,7,6,198,90,0x00000000
-  CONTROL "",IDC_DISABLED,"MButtonClass",0x10010000,100,46,16,14,0x00000000
-  CONTROL "",IDC_LEFT,"MButtonClass",0x10010000,14,46,16,14,0x00000000
-  CONTROL "",IDC_UPLEFT,"MButtonClass",0x10010000,14,17,16,14,0x00000000
-  CONTROL "",IDC_DOWNLEFT,"MButtonClass",0x10010000,14,76,16,14,0x00000000
-  CONTROL "",IDC_RIGHT,"MButtonClass",0x10010000,182,46,16,14,0x00000000
-  CONTROL "",IDC_UPRIGHT,"MButtonClass",0x10010000,182,17,16,14,0x00000000
-  CONTROL "",IDC_DOWNRIGHT,"MButtonClass",0x10010000,182,76,16,14,0x00000000
-  CONTROL "Delays",IDC_STATIC,"Button",0x50000007,8,99,198,59,0x00000000
-END
-IDI_DISABLED ICON DISCARDABLE "res/Disabled.ico"
-IDI_LEFT ICON DISCARDABLE "res/Left.ico"
-IDI_RIGHT ICON DISCARDABLE "res/Right.ico"
-IDI_UPLEFT ICON DISCARDABLE "res/LeftUp.ico"
-IDI_UPRIGHT ICON DISCARDABLE "res/RightUp.ico"
-IDI_DOWNLEFT ICON DISCARDABLE "res/LeftDown.ico"
-IDI_DOWNRIGHT ICON DISCARDABLE "res/RightDown.ico"
diff --git a/plugins/FileAsMessage/resources.rc b/plugins/FileAsMessage/res/resources.rc
index cbca7fcacc..e9a89d8c8f 100644
--- a/plugins/FileAsMessage/resources.rc
+++ b/plugins/FileAsMessage/res/resources.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -134,11 +134,11 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_SMALLICON           ICON    DISCARDABLE     "res\\file.ico"
-IDI_STOP                ICON    DISCARDABLE     "res\\abort.ico"
-IDI_PAUSE               ICON    DISCARDABLE     "res\\pause.ico"
-IDI_PLAY                ICON    DISCARDABLE     "res\\play.ico"
-IDI_REFRESH             ICON    DISCARDABLE     "res\\refresh.ico"
+IDI_SMALLICON           ICON     "file.ico"
+IDI_STOP                ICON     "abort.ico"
+IDI_PAUSE               ICON     "pause.ico"
+IDI_PLAY                ICON     "play.ico"
+IDI_REFRESH             ICON     "refresh.ico"
 #endif    // Russian resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/FileAsMessage/crc32.cpp b/plugins/FileAsMessage/src/crc32.cpp
index ab34393f8d..ab34393f8d 100644
--- a/plugins/FileAsMessage/crc32.cpp
+++ b/plugins/FileAsMessage/src/crc32.cpp
diff --git a/plugins/FileAsMessage/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index f038b87a33..f038b87a33 100644
--- a/plugins/FileAsMessage/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
diff --git a/plugins/FileAsMessage/dialog.h b/plugins/FileAsMessage/src/dialog.h
index 679742c2f6..679742c2f6 100644
--- a/plugins/FileAsMessage/dialog.h
+++ b/plugins/FileAsMessage/src/dialog.h
diff --git a/plugins/FileAsMessage/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 61dfdb512b..61dfdb512b 100644
--- a/plugins/FileAsMessage/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
diff --git a/plugins/FileAsMessage/main.h b/plugins/FileAsMessage/src/main.h
index e21472e5a1..e21472e5a1 100644
--- a/plugins/FileAsMessage/main.h
+++ b/plugins/FileAsMessage/src/main.h
diff --git a/plugins/FileAsMessage/optionsdlg.cpp b/plugins/FileAsMessage/src/optionsdlg.cpp
index 748a118db5..748a118db5 100644
--- a/plugins/FileAsMessage/optionsdlg.cpp
+++ b/plugins/FileAsMessage/src/optionsdlg.cpp
diff --git a/plugins/FileAsMessage/resource.h b/plugins/FileAsMessage/src/resource.h
index b6a254dcf7..b6a254dcf7 100644
--- a/plugins/FileAsMessage/resource.h
+++ b/plugins/FileAsMessage/src/resource.h