207 files changed, 262 insertions, 277 deletions

diff --git a/protocols/MRA/Readme_MRA.txt b/protocols/MRA/Docs/Readme_MRA.txt
index 5135a8b338..5135a8b338 100644
--- a/protocols/MRA/Readme_MRA.txt
+++ b/protocols/MRA/Docs/Readme_MRA.txt
diff --git a/protocols/MRA/TODO.txt b/protocols/MRA/Docs/TODO.txt
index 6366e73527..6366e73527 100644
--- a/protocols/MRA/TODO.txt
+++ b/protocols/MRA/Docs/TODO.txt
diff --git a/protocols/MRA/mra-translation.txt b/protocols/MRA/Docs/mra-translation.txt
index 9606e2ed53..9606e2ed53 100644
--- a/protocols/MRA/mra-translation.txt
+++ b/protocols/MRA/Docs/mra-translation.txt
diff --git a/protocols/MRA/Mra.vcxproj b/protocols/MRA/Mra.vcxproj
index 0e4eb762fe..79ebb6450e 100644
--- a/protocols/MRA/Mra.vcxproj
+++ b/protocols/MRA/Mra.vcxproj
@@ -81,7 +81,7 @@
       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

+      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

@@ -107,7 +107,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

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

+      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -132,7 +132,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

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

+      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <ExceptionHandling>false</ExceptionHandling>

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

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

+      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -184,59 +184,54 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="Mra.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="langpack_MRA_russian.txt" />

-    <None Include="Readme_MRA.txt" />

-    <None Include="TODO.txt" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\..\plugins\Zlib\zlib_10.vcxproj">

diff --git a/protocols/MRA/Mra.vcxproj.filters b/protocols/MRA/Mra.vcxproj.filters
index fd647eb504..c4251eca48 100644
--- a/protocols/MRA/Mra.vcxproj.filters
+++ b/protocols/MRA/Mra.vcxproj.filters
@@ -15,139 +15,134 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="Mra.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Mra_functions.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Mra_options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Mra_proto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Mra_svcs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraAdvancedSearch.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraAntiSpam.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraAvatars.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraChat.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraFilesQueue.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraIcons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraMPop.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraMRIMProxy.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraOfflineMsg.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraPopUp.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraRTFMsg.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraSelectEMail.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraSendCommand.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraSendQueue.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MraProto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <None Include="langpack_MRA_russian.txt" />

-    <None Include="Readme_MRA.txt" />

-    <None Include="TODO.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="Mra.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraAntiSpam.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraAvatars.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraChat.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraConstans.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraFilesQueue.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraIcons.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraMPop.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraMRIMProxy.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraOfflineMsg.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraPlaces.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraPopUp.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraRTFMsg.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraSelectEMail.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraSendCommand.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraSendQueue.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="proto.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MraProto.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </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/protocols/MRA/proto_mra/Proto_MRA.vcxproj b/protocols/MRA/proto_mra/Proto_MRA.vcxproj
index 69d39677cb..58229df271 100644
--- a/protocols/MRA/proto_mra/Proto_MRA.vcxproj
+++ b/protocols/MRA/proto_mra/Proto_MRA.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/MRA/proto_mra/Proto_MRA.vcxproj.filters b/protocols/MRA/proto_mra/Proto_MRA.vcxproj.filters
index 49e45df920..ad4773b73d 100644
--- a/protocols/MRA/proto_mra/Proto_MRA.vcxproj.filters
+++ b/protocols/MRA/proto_mra/Proto_MRA.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="Proto_MRA.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/MRA/proto_mra/icos/Away.ico b/protocols/MRA/proto_mra/res/Away.ico
index 466571a9ad..466571a9ad 100644
--- a/protocols/MRA/proto_mra/icos/Away.ico
+++ b/protocols/MRA/proto_mra/res/Away.ico
diff --git a/protocols/MRA/proto_mra/icos/DND.ico b/protocols/MRA/proto_mra/res/DND.ico
index bfb9a0c73c..bfb9a0c73c 100644
--- a/protocols/MRA/proto_mra/icos/DND.ico
+++ b/protocols/MRA/proto_mra/res/DND.ico
diff --git a/protocols/MRA/proto_mra/icos/FFC.ico b/protocols/MRA/proto_mra/res/FFC.ico
index 6c2d18d430..6c2d18d430 100644
--- a/protocols/MRA/proto_mra/icos/FFC.ico
+++ b/protocols/MRA/proto_mra/res/FFC.ico
diff --git a/protocols/MRA/proto_mra/icos/Invisible.ico b/protocols/MRA/proto_mra/res/Invisible.ico
index dadd58d089..dadd58d089 100644
--- a/protocols/MRA/proto_mra/icos/Invisible.ico
+++ b/protocols/MRA/proto_mra/res/Invisible.ico
diff --git a/protocols/MRA/proto_mra/icos/Lunch.ico b/protocols/MRA/proto_mra/res/Lunch.ico
index 80d1b4f83a..80d1b4f83a 100644
--- a/protocols/MRA/proto_mra/icos/Lunch.ico
+++ b/protocols/MRA/proto_mra/res/Lunch.ico
diff --git a/protocols/MRA/proto_mra/icos/Offline.ico b/protocols/MRA/proto_mra/res/Offline.ico
index 9f9e1e0316..9f9e1e0316 100644
--- a/protocols/MRA/proto_mra/icos/Offline.ico
+++ b/protocols/MRA/proto_mra/res/Offline.ico
diff --git a/protocols/MRA/proto_mra/icos/Online.ico b/protocols/MRA/proto_mra/res/Online.ico
index b7b01b7d57..b7b01b7d57 100644
--- a/protocols/MRA/proto_mra/icos/Online.ico
+++ b/protocols/MRA/proto_mra/res/Online.ico
diff --git a/protocols/MRA/proto_mra/icos/Phone.ico b/protocols/MRA/proto_mra/res/Phone.ico
index 16e1734ba6..16e1734ba6 100644
--- a/protocols/MRA/proto_mra/icos/Phone.ico
+++ b/protocols/MRA/proto_mra/res/Phone.ico
diff --git a/protocols/MRA/proto_mra/Proto_MRA.rc b/protocols/MRA/proto_mra/res/Proto_MRA.rc
index 4ac7000260..50cfd46646 100644
--- a/protocols/MRA/proto_mra/Proto_MRA.rc
+++ b/protocols/MRA/proto_mra/res/Proto_MRA.rc
diff --git a/protocols/MRA/proto_mra/resource.h b/protocols/MRA/proto_mra/src/resource.h
index ac56e8ca36..ac56e8ca36 100644
--- a/protocols/MRA/proto_mra/resource.h
+++ b/protocols/MRA/proto_mra/src/resource.h
diff --git a/protocols/MRA/Icons/Alarm.ico b/protocols/MRA/res/Alarm.ico
index 9da83ea0b8..9da83ea0b8 100644
--- a/protocols/MRA/Icons/Alarm.ico
+++ b/protocols/MRA/res/Alarm.ico
diff --git a/protocols/MRA/Icons/AuthGrant.ico b/protocols/MRA/res/AuthGrant.ico
index f24b71c739..f24b71c739 100644
--- a/protocols/MRA/Icons/AuthGrant.ico
+++ b/protocols/MRA/res/AuthGrant.ico
diff --git a/protocols/MRA/Icons/AuthReguest.ico b/protocols/MRA/res/AuthReguest.ico
index d7fb7db98c..d7fb7db98c 100644
--- a/protocols/MRA/Icons/AuthReguest.ico
+++ b/protocols/MRA/res/AuthReguest.ico
diff --git a/protocols/MRA/Icons/Bagz.ico b/protocols/MRA/res/Bagz.ico
index 87de879d85..87de879d85 100644
--- a/protocols/MRA/Icons/Bagz.ico
+++ b/protocols/MRA/res/Bagz.ico
diff --git a/protocols/MRA/Icons/BlogStatus.ico b/protocols/MRA/res/BlogStatus.ico
index a5dcea42b9..a5dcea42b9 100644
--- a/protocols/MRA/Icons/BlogStatus.ico
+++ b/protocols/MRA/res/BlogStatus.ico
diff --git a/protocols/MRA/Icons/Blogs.ico b/protocols/MRA/res/Blogs.ico
index 7de74d39c9..7de74d39c9 100644
--- a/protocols/MRA/Icons/Blogs.ico
+++ b/protocols/MRA/res/Blogs.ico
diff --git a/protocols/MRA/Icons/Chat.ico b/protocols/MRA/res/Chat.ico
index 5427f1120e..5427f1120e 100644
--- a/protocols/MRA/Icons/Chat.ico
+++ b/protocols/MRA/res/Chat.ico
diff --git a/protocols/MRA/Icons/Info.ico b/protocols/MRA/res/Info.ico
index 3cbe896a02..3cbe896a02 100644
--- a/protocols/MRA/Icons/Info.ico
+++ b/protocols/MRA/res/Info.ico
diff --git a/protocols/MRA/Icons/Magent.ico b/protocols/MRA/res/Magent.ico
index 468cbcd278..468cbcd278 100644
--- a/protocols/MRA/Icons/Magent.ico
+++ b/protocols/MRA/res/Magent.ico
diff --git a/protocols/MRA/Icons/Mail.ico b/protocols/MRA/res/Mail.ico
index 55007a879c..55007a879c 100644
--- a/protocols/MRA/Icons/Mail.ico
+++ b/protocols/MRA/res/Mail.ico
diff --git a/protocols/MRA/Icons/MailNotify.ico b/protocols/MRA/res/MailNotify.ico
index a4520bc8af..a4520bc8af 100644
--- a/protocols/MRA/Icons/MailNotify.ico
+++ b/protocols/MRA/res/MailNotify.ico
diff --git a/protocols/MRA/Icons/Phone.ico b/protocols/MRA/res/Phone.ico
index 0716aed2b6..0716aed2b6 100644
--- a/protocols/MRA/Icons/Phone.ico
+++ b/protocols/MRA/res/Phone.ico
diff --git a/protocols/MRA/Icons/Photo.ico b/protocols/MRA/res/Photo.ico
index dab4e204e4..dab4e204e4 100644
--- a/protocols/MRA/Icons/Photo.ico
+++ b/protocols/MRA/res/Photo.ico
diff --git a/protocols/MRA/Icons/PostCards.ico b/protocols/MRA/res/PostCards.ico
index 517653aee4..517653aee4 100644
--- a/protocols/MRA/Icons/PostCards.ico
+++ b/protocols/MRA/res/PostCards.ico
diff --git a/protocols/MRA/Icons/WebSearch.ico b/protocols/MRA/res/WebSearch.ico
index 6ac68cdd7e..6ac68cdd7e 100644
--- a/protocols/MRA/Icons/WebSearch.ico
+++ b/protocols/MRA/res/WebSearch.ico
diff --git a/protocols/MRA/Icons/answers.ico b/protocols/MRA/res/answers.ico
index 1b2bf773e3..1b2bf773e3 100644
--- a/protocols/MRA/Icons/answers.ico
+++ b/protocols/MRA/res/answers.ico
diff --git a/protocols/MRA/Icons/my world.ico b/protocols/MRA/res/my world.ico
index 6e0a4a650d..6e0a4a650d 100644
--- a/protocols/MRA/Icons/my world.ico
+++ b/protocols/MRA/res/my world.ico
diff --git a/protocols/MRA/resource.rc b/protocols/MRA/res/resource.rc
index cda7887e73..b4c18790b9 100644
--- a/protocols/MRA/resource.rc
+++ b/protocols/MRA/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -30,23 +30,23 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

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

 // remains consistent on all systems.

-IDI_MRA                 ICON                    "Icons\\Magent.ico"

-IDI_INBOX               ICON                    "Icons\\Mail.ico"

-IDI_PROFILE             ICON                    "Icons\\Info.ico"

-IDI_AUTHRUGUEST         ICON                    "Icons\\AuthReguest.ico"

-IDI_AUTHGRANT           ICON                    "Icons\\AuthGrant.ico"

-IDI_MAIL_NOTIFY         ICON                    "Icons\\MailNotify.ico"

-IDI_MRA_WEB_SEARCH      ICON                    "Icons\\WebSearch.ico"

-IDI_MRA_BLOGS           ICON                    "Icons\\Blogs.ico"

-IDI_MRA_POSTCARD        ICON                    "Icons\\PostCards.ico"

-IDI_MRA_ZHUKI           ICON                    "Icons\\Bagz.ico"

-IDI_MRA_PHOTO           ICON                    "Icons\\Photo.ico"

-IDI_MRA_CHAT            ICON                    "Icons\\Chat.ico"

-IDI_MRA_PHONE           ICON                    "Icons\\Phone.ico"

-IDI_MRA_ALARM           ICON                    "Icons\\Alarm.ico"

-IDI_MRA_VIDEO           ICON                    "Icons\\video.ico"

-IDI_MRA_ANSWERS         ICON                    "Icons\\answers.ico"

-IDI_MRA_WORLD           ICON                    "Icons\\my world.ico"

+IDI_MRA                 ICON                    "Magent.ico"

+IDI_INBOX               ICON                    "Mail.ico"

+IDI_PROFILE             ICON                    "Info.ico"

+IDI_AUTHRUGUEST         ICON                    "AuthReguest.ico"

+IDI_AUTHGRANT           ICON                    "AuthGrant.ico"

+IDI_MAIL_NOTIFY         ICON                    "MailNotify.ico"

+IDI_MRA_WEB_SEARCH      ICON                    "WebSearch.ico"

+IDI_MRA_BLOGS           ICON                    "Blogs.ico"

+IDI_MRA_POSTCARD        ICON                    "PostCards.ico"

+IDI_MRA_ZHUKI           ICON                    "Bagz.ico"

+IDI_MRA_PHOTO           ICON                    "Photo.ico"

+IDI_MRA_CHAT            ICON                    "Chat.ico"

+IDI_MRA_PHONE           ICON                    "Phone.ico"

+IDI_MRA_ALARM           ICON                    "Alarm.ico"

+IDI_MRA_VIDEO           ICON                    "video.ico"

+IDI_MRA_ANSWERS         ICON                    "answers.ico"

+IDI_MRA_WORLD           ICON                    "my world.ico"

 

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

 //

@@ -285,7 +285,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

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

 // remains consistent on all systems.

-IDI_BLOGSTATUS          ICON                    "Icons\\BlogStatus.ico"

+IDI_BLOGSTATUS          ICON                    "BlogStatus.ico"

 

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

 //

@@ -360,7 +360,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE

diff --git a/protocols/MRA/version.rc b/protocols/MRA/res/version.rc
index 7aaaf3f951..c36de9b592 100644
--- a/protocols/MRA/version.rc
+++ b/protocols/MRA/res/version.rc
@@ -2,8 +2,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "version.h"

-#include "resource.h"

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

 #include "winres.h"

 

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

diff --git a/protocols/MRA/Icons/video.ico b/protocols/MRA/res/video.ico
index 9c075ab008..9c075ab008 100644
--- a/protocols/MRA/Icons/video.ico
+++ b/protocols/MRA/res/video.ico
diff --git a/protocols/MRA/Mra.cpp b/protocols/MRA/src/Mra.cpp
index d96a29a242..d96a29a242 100644
--- a/protocols/MRA/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
diff --git a/protocols/MRA/Mra.h b/protocols/MRA/src/Mra.h
index 9b7e16510a..7c6faac372 100644
--- a/protocols/MRA/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -13,7 +13,7 @@
 //#define CRTDLL

 

 #include "resource.h"

-#include ".\xstatus_MRA\resource.h"

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

 #include <SystemHeaders.h>

 #include <Wincrypt.h>

 #include <Ntsecapi.h>

diff --git a/protocols/MRA/MraAdvancedSearch.cpp b/protocols/MRA/src/MraAdvancedSearch.cpp
index 8ffe222cab..8ffe222cab 100644
--- a/protocols/MRA/MraAdvancedSearch.cpp
+++ b/protocols/MRA/src/MraAdvancedSearch.cpp
diff --git a/protocols/MRA/MraAntiSpam.cpp b/protocols/MRA/src/MraAntiSpam.cpp
index 4d8456d5c1..4d8456d5c1 100644
--- a/protocols/MRA/MraAntiSpam.cpp
+++ b/protocols/MRA/src/MraAntiSpam.cpp
diff --git a/protocols/MRA/MraAntiSpam.h b/protocols/MRA/src/MraAntiSpam.h
index 7549e308c3..7549e308c3 100644
--- a/protocols/MRA/MraAntiSpam.h
+++ b/protocols/MRA/src/MraAntiSpam.h
diff --git a/protocols/MRA/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp
index 78989906ee..78989906ee 100644
--- a/protocols/MRA/MraAvatars.cpp
+++ b/protocols/MRA/src/MraAvatars.cpp
diff --git a/protocols/MRA/MraAvatars.h b/protocols/MRA/src/MraAvatars.h
index 67c0eff121..67c0eff121 100644
--- a/protocols/MRA/MraAvatars.h
+++ b/protocols/MRA/src/MraAvatars.h
diff --git a/protocols/MRA/MraChat.cpp b/protocols/MRA/src/MraChat.cpp
index 30cac7690d..30cac7690d 100644
--- a/protocols/MRA/MraChat.cpp
+++ b/protocols/MRA/src/MraChat.cpp
diff --git a/protocols/MRA/MraChat.h b/protocols/MRA/src/MraChat.h
index 790c16584a..790c16584a 100644
--- a/protocols/MRA/MraChat.h
+++ b/protocols/MRA/src/MraChat.h
diff --git a/protocols/MRA/MraConstans.h b/protocols/MRA/src/MraConstans.h
index 17b73e5642..17b73e5642 100644
--- a/protocols/MRA/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
diff --git a/protocols/MRA/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index 539bf9562d..539bf9562d 100644
--- a/protocols/MRA/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
diff --git a/protocols/MRA/MraFilesQueue.h b/protocols/MRA/src/MraFilesQueue.h
index 5c55c5b8ad..5c55c5b8ad 100644
--- a/protocols/MRA/MraFilesQueue.h
+++ b/protocols/MRA/src/MraFilesQueue.h
diff --git a/protocols/MRA/MraFilesQueue_mod.cpp b/protocols/MRA/src/MraFilesQueue_mod.cpp
index b315636a69..b315636a69 100644
--- a/protocols/MRA/MraFilesQueue_mod.cpp
+++ b/protocols/MRA/src/MraFilesQueue_mod.cpp
diff --git a/protocols/MRA/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index d3d6828238..d3d6828238 100644
--- a/protocols/MRA/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
diff --git a/protocols/MRA/MraIcons.h b/protocols/MRA/src/MraIcons.h
index 992914805b..992914805b 100644
--- a/protocols/MRA/MraIcons.h
+++ b/protocols/MRA/src/MraIcons.h
diff --git a/protocols/MRA/MraMPop.cpp b/protocols/MRA/src/MraMPop.cpp
index ec49686f5e..ec49686f5e 100644
--- a/protocols/MRA/MraMPop.cpp
+++ b/protocols/MRA/src/MraMPop.cpp
diff --git a/protocols/MRA/MraMPop.h b/protocols/MRA/src/MraMPop.h
index 18aef30f27..18aef30f27 100644
--- a/protocols/MRA/MraMPop.h
+++ b/protocols/MRA/src/MraMPop.h
diff --git a/protocols/MRA/MraMRIMProxy.cpp b/protocols/MRA/src/MraMRIMProxy.cpp
index 01a46ecc49..01a46ecc49 100644
--- a/protocols/MRA/MraMRIMProxy.cpp
+++ b/protocols/MRA/src/MraMRIMProxy.cpp
diff --git a/protocols/MRA/MraMRIMProxy.h b/protocols/MRA/src/MraMRIMProxy.h
index c0051daec9..c0051daec9 100644
--- a/protocols/MRA/MraMRIMProxy.h
+++ b/protocols/MRA/src/MraMRIMProxy.h
diff --git a/protocols/MRA/MraOfflineMsg.cpp b/protocols/MRA/src/MraOfflineMsg.cpp
index e3e8b76aff..e3e8b76aff 100644
--- a/protocols/MRA/MraOfflineMsg.cpp
+++ b/protocols/MRA/src/MraOfflineMsg.cpp
diff --git a/protocols/MRA/MraOfflineMsg.h b/protocols/MRA/src/MraOfflineMsg.h
index 2958fbe4a9..2958fbe4a9 100644
--- a/protocols/MRA/MraOfflineMsg.h
+++ b/protocols/MRA/src/MraOfflineMsg.h
diff --git a/protocols/MRA/MraPlaces.h b/protocols/MRA/src/MraPlaces.h
index 56a0573a6d..56a0573a6d 100644
--- a/protocols/MRA/MraPlaces.h
+++ b/protocols/MRA/src/MraPlaces.h
diff --git a/protocols/MRA/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp
index af399eee9e..af399eee9e 100644
--- a/protocols/MRA/MraPopUp.cpp
+++ b/protocols/MRA/src/MraPopUp.cpp
diff --git a/protocols/MRA/MraPopUp.h b/protocols/MRA/src/MraPopUp.h
index 722dac168c..722dac168c 100644
--- a/protocols/MRA/MraPopUp.h
+++ b/protocols/MRA/src/MraPopUp.h
diff --git a/protocols/MRA/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index f1b826767c..f1b826767c 100644
--- a/protocols/MRA/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
diff --git a/protocols/MRA/MraProto.h b/protocols/MRA/src/MraProto.h
index 7c3302119c..7c3302119c 100644
--- a/protocols/MRA/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
diff --git a/protocols/MRA/MraRTFMsg.cpp b/protocols/MRA/src/MraRTFMsg.cpp
index 9866e44a99..9866e44a99 100644
--- a/protocols/MRA/MraRTFMsg.cpp
+++ b/protocols/MRA/src/MraRTFMsg.cpp
diff --git a/protocols/MRA/MraRTFMsg.h b/protocols/MRA/src/MraRTFMsg.h
index 1dadb5a801..1dadb5a801 100644
--- a/protocols/MRA/MraRTFMsg.h
+++ b/protocols/MRA/src/MraRTFMsg.h
diff --git a/protocols/MRA/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp
index a3c9bfd313..a3c9bfd313 100644
--- a/protocols/MRA/MraSelectEMail.cpp
+++ b/protocols/MRA/src/MraSelectEMail.cpp
diff --git a/protocols/MRA/MraSelectEMail.h b/protocols/MRA/src/MraSelectEMail.h
index c031ee72ab..c031ee72ab 100644
--- a/protocols/MRA/MraSelectEMail.h
+++ b/protocols/MRA/src/MraSelectEMail.h
diff --git a/protocols/MRA/MraSendCommand.cpp b/protocols/MRA/src/MraSendCommand.cpp
index 158427cbe4..158427cbe4 100644
--- a/protocols/MRA/MraSendCommand.cpp
+++ b/protocols/MRA/src/MraSendCommand.cpp
diff --git a/protocols/MRA/MraSendCommand.h b/protocols/MRA/src/MraSendCommand.h
index dd1eb9a2b0..dd1eb9a2b0 100644
--- a/protocols/MRA/MraSendCommand.h
+++ b/protocols/MRA/src/MraSendCommand.h
diff --git a/protocols/MRA/MraSendQueue.cpp b/protocols/MRA/src/MraSendQueue.cpp
index 53d6f1345d..53d6f1345d 100644
--- a/protocols/MRA/MraSendQueue.cpp
+++ b/protocols/MRA/src/MraSendQueue.cpp
diff --git a/protocols/MRA/MraSendQueue.h b/protocols/MRA/src/MraSendQueue.h
index 0e7f7ae51a..0e7f7ae51a 100644
--- a/protocols/MRA/MraSendQueue.h
+++ b/protocols/MRA/src/MraSendQueue.h
diff --git a/protocols/MRA/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 7083da1b8d..7083da1b8d 100644
--- a/protocols/MRA/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
diff --git a/protocols/MRA/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp
index c692f3e244..c692f3e244 100644
--- a/protocols/MRA/Mra_options.cpp
+++ b/protocols/MRA/src/Mra_options.cpp
diff --git a/protocols/MRA/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 0e6753fb7d..0e6753fb7d 100644
--- a/protocols/MRA/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
diff --git a/protocols/MRA/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index 28c761a5c4..28c761a5c4 100644
--- a/protocols/MRA/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
diff --git a/protocols/MRA/Sdk/Base64.h b/protocols/MRA/src/Sdk/Base64.h
index d3cce03e9a..d3cce03e9a 100644
--- a/protocols/MRA/Sdk/Base64.h
+++ b/protocols/MRA/src/Sdk/Base64.h
diff --git a/protocols/MRA/Sdk/BuffToLowerCase.h b/protocols/MRA/src/Sdk/BuffToLowerCase.h
index 3d7909bf41..3d7909bf41 100644
--- a/protocols/MRA/Sdk/BuffToLowerCase.h
+++ b/protocols/MRA/src/Sdk/BuffToLowerCase.h
diff --git a/protocols/MRA/Sdk/DebugFunctions.h b/protocols/MRA/src/Sdk/DebugFunctions.h
index 6bd9df5b5a..6bd9df5b5a 100644
--- a/protocols/MRA/Sdk/DebugFunctions.h
+++ b/protocols/MRA/src/Sdk/DebugFunctions.h
diff --git a/protocols/MRA/Sdk/FIFOMT.h b/protocols/MRA/src/Sdk/FIFOMT.h
index acff96f500..acff96f500 100644
--- a/protocols/MRA/Sdk/FIFOMT.h
+++ b/protocols/MRA/src/Sdk/FIFOMT.h
diff --git a/protocols/MRA/Sdk/InterlockedFunctions.h b/protocols/MRA/src/Sdk/InterlockedFunctions.h
index 742f904944..742f904944 100644
--- a/protocols/MRA/Sdk/InterlockedFunctions.h
+++ b/protocols/MRA/src/Sdk/InterlockedFunctions.h
diff --git a/protocols/MRA/Sdk/InternetTime.h b/protocols/MRA/src/Sdk/InternetTime.h
index c6abf16786..c6abf16786 100644
--- a/protocols/MRA/Sdk/InternetTime.h
+++ b/protocols/MRA/src/Sdk/InternetTime.h
diff --git a/protocols/MRA/Sdk/ListMT.h b/protocols/MRA/src/Sdk/ListMT.h
index 38d9247488..38d9247488 100644
--- a/protocols/MRA/Sdk/ListMT.h
+++ b/protocols/MRA/src/Sdk/ListMT.h
diff --git a/protocols/MRA/Sdk/MemoryCompare.h b/protocols/MRA/src/Sdk/MemoryCompare.h
index 17ef96f35a..17ef96f35a 100644
--- a/protocols/MRA/Sdk/MemoryCompare.h
+++ b/protocols/MRA/src/Sdk/MemoryCompare.h
diff --git a/protocols/MRA/Sdk/MemoryFind.h b/protocols/MRA/src/Sdk/MemoryFind.h
index 860c5ce20a..860c5ce20a 100644
--- a/protocols/MRA/Sdk/MemoryFind.h
+++ b/protocols/MRA/src/Sdk/MemoryFind.h
diff --git a/protocols/MRA/Sdk/MemoryFindByte.h b/protocols/MRA/src/Sdk/MemoryFindByte.h
index a18a721b9d..a18a721b9d 100644
--- a/protocols/MRA/Sdk/MemoryFindByte.h
+++ b/protocols/MRA/src/Sdk/MemoryFindByte.h
diff --git a/protocols/MRA/Sdk/MemoryReplace.h b/protocols/MRA/src/Sdk/MemoryReplace.h
index c911ccfbe1..c911ccfbe1 100644
--- a/protocols/MRA/Sdk/MemoryReplace.h
+++ b/protocols/MRA/src/Sdk/MemoryReplace.h
diff --git a/protocols/MRA/Sdk/RC4.h b/protocols/MRA/src/Sdk/RC4.h
index cb6331a183..cb6331a183 100644
--- a/protocols/MRA/Sdk/RC4.h
+++ b/protocols/MRA/src/Sdk/RC4.h
diff --git a/protocols/MRA/Sdk/SHA1.h b/protocols/MRA/src/Sdk/SHA1.h
index f7d4643d32..f7d4643d32 100644
--- a/protocols/MRA/Sdk/SHA1.h
+++ b/protocols/MRA/src/Sdk/SHA1.h
diff --git a/protocols/MRA/Sdk/SocketFunctions.h b/protocols/MRA/src/Sdk/SocketFunctions.h
index 0d609d80f9..0d609d80f9 100644
--- a/protocols/MRA/Sdk/SocketFunctions.h
+++ b/protocols/MRA/src/Sdk/SocketFunctions.h
diff --git a/protocols/MRA/Sdk/StrHexToNum.h b/protocols/MRA/src/Sdk/StrHexToNum.h
index e4a5cc98fa..e4a5cc98fa 100644
--- a/protocols/MRA/Sdk/StrHexToNum.h
+++ b/protocols/MRA/src/Sdk/StrHexToNum.h
diff --git a/protocols/MRA/Sdk/StrToNum.h b/protocols/MRA/src/Sdk/StrToNum.h
index 6e67ac6be1..6e67ac6be1 100644
--- a/protocols/MRA/Sdk/StrToNum.h
+++ b/protocols/MRA/src/Sdk/StrToNum.h
diff --git a/protocols/MRA/Sdk/SystemHeaders.h b/protocols/MRA/src/Sdk/SystemHeaders.h
index 6779342812..6779342812 100644
--- a/protocols/MRA/Sdk/SystemHeaders.h
+++ b/protocols/MRA/src/Sdk/SystemHeaders.h
diff --git a/protocols/MRA/Sdk/timefuncs.h b/protocols/MRA/src/Sdk/timefuncs.h
index 3b25b99787..3b25b99787 100644
--- a/protocols/MRA/Sdk/timefuncs.h
+++ b/protocols/MRA/src/Sdk/timefuncs.h
diff --git a/protocols/MRA/Sdk/zconf.h b/protocols/MRA/src/Sdk/zconf.h
index 02ce56c431..02ce56c431 100644
--- a/protocols/MRA/Sdk/zconf.h
+++ b/protocols/MRA/src/Sdk/zconf.h
diff --git a/protocols/MRA/Sdk/zlib.h b/protocols/MRA/src/Sdk/zlib.h
index 62d0e4675b..62d0e4675b 100644
--- a/protocols/MRA/Sdk/zlib.h
+++ b/protocols/MRA/src/Sdk/zlib.h
diff --git a/protocols/MRA/proto.h b/protocols/MRA/src/proto.h
index bf0c28e03a..bf0c28e03a 100644
--- a/protocols/MRA/proto.h
+++ b/protocols/MRA/src/proto.h
diff --git a/protocols/MRA/resource.h b/protocols/MRA/src/resource.h
index aa5469d599..aa5469d599 100644
--- a/protocols/MRA/resource.h
+++ b/protocols/MRA/src/resource.h
diff --git a/protocols/MRA/version.h b/protocols/MRA/src/version.h
index b7ce1137bf..b7ce1137bf 100644
--- a/protocols/MRA/version.h
+++ b/protocols/MRA/src/version.h
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/10.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/10.ico
deleted file mode 100644
index 8a6082b8c4..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/10.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/11.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/11.ico
deleted file mode 100644
index 45fc19ba88..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/11.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/12.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/12.ico
deleted file mode 100644
index 22b5852e99..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/12.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/13.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/13.ico
deleted file mode 100644
index 99f9bcbd73..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/13.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/14.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/14.ico
deleted file mode 100644
index 51022c08d7..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/14.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/15.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/15.ico
deleted file mode 100644
index 71479065bb..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/15.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/16.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/16.ico
deleted file mode 100644
index 6d18f2342f..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/16.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/17.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/17.ico
deleted file mode 100644
index 79a6ce355a..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/17.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/18.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/18.ico
deleted file mode 100644
index 9bcc8cc787..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/18.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/19.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/19.ico
deleted file mode 100644
index 1cd2c5ec1e..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/19.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/20.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/20.ico
deleted file mode 100644
index f315d56e3f..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/20.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/21.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/21.ico
deleted file mode 100644
index c2a63adf40..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/21.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/22.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/22.ico
deleted file mode 100644
index b8db78d98b..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/22.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/23.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/23.ico
deleted file mode 100644
index 43737bcd53..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/23.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/24.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/24.ico
deleted file mode 100644
index f2d6c05e6c..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/24.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/25.txt b/protocols/MRA/xstatus_MRA/XStatus_icons_original/25.txt
deleted file mode 100644
index ff981d2f44..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/25.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-no icon

-possible chat/dnd icon here
\ No newline at end of file
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/26.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/26.ico
deleted file mode 100644
index c225440c07..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/26.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/27.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/27.ico
deleted file mode 100644
index 1ee08b64f9..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/27.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/28.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/28.ico
deleted file mode 100644
index 8fb918beb2..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/28.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/29.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/29.ico
deleted file mode 100644
index caf1684960..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/29.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/30.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/30.ico
deleted file mode 100644
index 329b07ecb7..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/30.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/31.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/31.ico
deleted file mode 100644
index 5cb465e1c0..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/31.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/32.txt b/protocols/MRA/xstatus_MRA/XStatus_icons_original/32.txt
deleted file mode 100644
index ff981d2f44..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/32.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-no icon

-possible chat/dnd icon here
\ No newline at end of file
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/33.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/33.ico
deleted file mode 100644
index c16ab7b3ce..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/33.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/34.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/34.ico
deleted file mode 100644
index f73d8c5817..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/34.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/35.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/35.ico
deleted file mode 100644
index 8594b058e2..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/35.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/36.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/36.ico
deleted file mode 100644
index 51fb924ddb..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/36.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/37.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/37.ico
deleted file mode 100644
index f431151670..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/37.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/38.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/38.ico
deleted file mode 100644
index 9e9b8661f3..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/38.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/39.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/39.ico
deleted file mode 100644
index 83623ab3e0..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/39.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/4.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/4.ico
deleted file mode 100644
index 2c15d84e71..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/4.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/40.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/40.ico
deleted file mode 100644
index cd47c4a72f..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/40.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/41.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/41.ico
deleted file mode 100644
index c78cfcf4d8..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/41.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/42.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/42.ico
deleted file mode 100644
index eb10108409..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/42.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/43.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/43.ico
deleted file mode 100644
index db60b063ba..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/43.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/44.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/44.ico
deleted file mode 100644
index dfcc56903c..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/44.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/45.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/45.ico
deleted file mode 100644
index 72edb15716..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/45.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/46.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/46.ico
deleted file mode 100644
index 3be634fac4..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/46.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/47.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/47.ico
deleted file mode 100644
index 0d9e7e058f..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/47.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/48.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/48.ico
deleted file mode 100644
index 6905be19ab..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/48.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/49.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/49.ico
deleted file mode 100644
index 368652a607..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/49.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/5.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/5.ico
deleted file mode 100644
index 73995f4291..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/5.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/50.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/50.ico
deleted file mode 100644
index ef41641d1c..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/50.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/51.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/51.ico
deleted file mode 100644
index b07c24e48c..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/51.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/52.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/52.ico
deleted file mode 100644
index 3e90a10d30..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/52.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/53.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/53.ico
deleted file mode 100644
index 56f8edce42..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/53.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/6.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/6.ico
deleted file mode 100644
index 7381d1de44..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/6.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/7.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/7.ico
deleted file mode 100644
index 8ed6d251d5..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/7.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/8.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/8.ico
deleted file mode 100644
index b6adfa5f25..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/8.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/9.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/9.ico
deleted file mode 100644
index 066330a625..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/9.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons_original/unknown.ico b/protocols/MRA/xstatus_MRA/XStatus_icons_original/unknown.ico
deleted file mode 100644
index 5d506b96f1..0000000000
--- a/protocols/MRA/xstatus_MRA/XStatus_icons_original/unknown.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/10.ico b/protocols/MRA/xstatus_MRA/res/10.ico
index b13a898589..b13a898589 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/10.ico
+++ b/protocols/MRA/xstatus_MRA/res/10.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/11.ico b/protocols/MRA/xstatus_MRA/res/11.ico
index 16d72d33c6..16d72d33c6 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/11.ico
+++ b/protocols/MRA/xstatus_MRA/res/11.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/12.ico b/protocols/MRA/xstatus_MRA/res/12.ico
index 971327565c..971327565c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/12.ico
+++ b/protocols/MRA/xstatus_MRA/res/12.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/13.ico b/protocols/MRA/xstatus_MRA/res/13.ico
index 0d824adc50..0d824adc50 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/13.ico
+++ b/protocols/MRA/xstatus_MRA/res/13.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/14.ico b/protocols/MRA/xstatus_MRA/res/14.ico
index a939be5606..a939be5606 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/14.ico
+++ b/protocols/MRA/xstatus_MRA/res/14.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/15.ico b/protocols/MRA/xstatus_MRA/res/15.ico
index d525499cd3..d525499cd3 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/15.ico
+++ b/protocols/MRA/xstatus_MRA/res/15.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/16.ico b/protocols/MRA/xstatus_MRA/res/16.ico
index 950b03fa4b..950b03fa4b 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/16.ico
+++ b/protocols/MRA/xstatus_MRA/res/16.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/17.ico b/protocols/MRA/xstatus_MRA/res/17.ico
index 9f90a34806..9f90a34806 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/17.ico
+++ b/protocols/MRA/xstatus_MRA/res/17.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/18.ico b/protocols/MRA/xstatus_MRA/res/18.ico
index a76170ed1c..a76170ed1c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/18.ico
+++ b/protocols/MRA/xstatus_MRA/res/18.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/19.ico b/protocols/MRA/xstatus_MRA/res/19.ico
index ae535164ae..ae535164ae 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/19.ico
+++ b/protocols/MRA/xstatus_MRA/res/19.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/20.ico b/protocols/MRA/xstatus_MRA/res/20.ico
index ee2fe2c2a9..ee2fe2c2a9 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/20.ico
+++ b/protocols/MRA/xstatus_MRA/res/20.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/21.ico b/protocols/MRA/xstatus_MRA/res/21.ico
index 03a5d108cc..03a5d108cc 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/21.ico
+++ b/protocols/MRA/xstatus_MRA/res/21.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/22.ico b/protocols/MRA/xstatus_MRA/res/22.ico
index ba2907284a..ba2907284a 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/22.ico
+++ b/protocols/MRA/xstatus_MRA/res/22.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/23.ico b/protocols/MRA/xstatus_MRA/res/23.ico
index a5a22372db..a5a22372db 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/23.ico
+++ b/protocols/MRA/xstatus_MRA/res/23.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/24.ico b/protocols/MRA/xstatus_MRA/res/24.ico
index abf66b3823..abf66b3823 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/24.ico
+++ b/protocols/MRA/xstatus_MRA/res/24.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/25.txt b/protocols/MRA/xstatus_MRA/res/25.txt
index ff981d2f44..ff981d2f44 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/25.txt
+++ b/protocols/MRA/xstatus_MRA/res/25.txt
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/26.ico b/protocols/MRA/xstatus_MRA/res/26.ico
index fea4f7722f..fea4f7722f 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/26.ico
+++ b/protocols/MRA/xstatus_MRA/res/26.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/27.ico b/protocols/MRA/xstatus_MRA/res/27.ico
index d5671d61c0..d5671d61c0 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/27.ico
+++ b/protocols/MRA/xstatus_MRA/res/27.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/28.ico b/protocols/MRA/xstatus_MRA/res/28.ico
index cb4fc69ce3..cb4fc69ce3 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/28.ico
+++ b/protocols/MRA/xstatus_MRA/res/28.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/29.ico b/protocols/MRA/xstatus_MRA/res/29.ico
index caf1684960..caf1684960 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/29.ico
+++ b/protocols/MRA/xstatus_MRA/res/29.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/30.ico b/protocols/MRA/xstatus_MRA/res/30.ico
index 329b07ecb7..329b07ecb7 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/30.ico
+++ b/protocols/MRA/xstatus_MRA/res/30.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/31.ico b/protocols/MRA/xstatus_MRA/res/31.ico
index 5cb465e1c0..5cb465e1c0 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/31.ico
+++ b/protocols/MRA/xstatus_MRA/res/31.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/32.txt b/protocols/MRA/xstatus_MRA/res/32.txt
index ff981d2f44..ff981d2f44 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/32.txt
+++ b/protocols/MRA/xstatus_MRA/res/32.txt
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/33.ico b/protocols/MRA/xstatus_MRA/res/33.ico
index c16ab7b3ce..c16ab7b3ce 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/33.ico
+++ b/protocols/MRA/xstatus_MRA/res/33.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/34.ico b/protocols/MRA/xstatus_MRA/res/34.ico
index f73d8c5817..f73d8c5817 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/34.ico
+++ b/protocols/MRA/xstatus_MRA/res/34.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/35.ico b/protocols/MRA/xstatus_MRA/res/35.ico
index 8594b058e2..8594b058e2 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/35.ico
+++ b/protocols/MRA/xstatus_MRA/res/35.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/36.ico b/protocols/MRA/xstatus_MRA/res/36.ico
index 51fb924ddb..51fb924ddb 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/36.ico
+++ b/protocols/MRA/xstatus_MRA/res/36.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/37.ico b/protocols/MRA/xstatus_MRA/res/37.ico
index f431151670..f431151670 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/37.ico
+++ b/protocols/MRA/xstatus_MRA/res/37.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/38.ico b/protocols/MRA/xstatus_MRA/res/38.ico
index 9e9b8661f3..9e9b8661f3 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/38.ico
+++ b/protocols/MRA/xstatus_MRA/res/38.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/39.ico b/protocols/MRA/xstatus_MRA/res/39.ico
index 83623ab3e0..83623ab3e0 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/39.ico
+++ b/protocols/MRA/xstatus_MRA/res/39.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/4.ico b/protocols/MRA/xstatus_MRA/res/4.ico
index be302007ed..be302007ed 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/4.ico
+++ b/protocols/MRA/xstatus_MRA/res/4.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/40.ico b/protocols/MRA/xstatus_MRA/res/40.ico
index cd47c4a72f..cd47c4a72f 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/40.ico
+++ b/protocols/MRA/xstatus_MRA/res/40.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/41.ico b/protocols/MRA/xstatus_MRA/res/41.ico
index c78cfcf4d8..c78cfcf4d8 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/41.ico
+++ b/protocols/MRA/xstatus_MRA/res/41.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/42.ico b/protocols/MRA/xstatus_MRA/res/42.ico
index eb10108409..eb10108409 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/42.ico
+++ b/protocols/MRA/xstatus_MRA/res/42.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/43.ico b/protocols/MRA/xstatus_MRA/res/43.ico
index db60b063ba..db60b063ba 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/43.ico
+++ b/protocols/MRA/xstatus_MRA/res/43.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/44.ico b/protocols/MRA/xstatus_MRA/res/44.ico
index dfcc56903c..dfcc56903c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/44.ico
+++ b/protocols/MRA/xstatus_MRA/res/44.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/45.ico b/protocols/MRA/xstatus_MRA/res/45.ico
index 72edb15716..72edb15716 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/45.ico
+++ b/protocols/MRA/xstatus_MRA/res/45.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/46.ico b/protocols/MRA/xstatus_MRA/res/46.ico
index 4dbd7cecec..4dbd7cecec 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/46.ico
+++ b/protocols/MRA/xstatus_MRA/res/46.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/47.ico b/protocols/MRA/xstatus_MRA/res/47.ico
index 2468c5ef6c..2468c5ef6c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/47.ico
+++ b/protocols/MRA/xstatus_MRA/res/47.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/48.ico b/protocols/MRA/xstatus_MRA/res/48.ico
index e8f4e4de3a..e8f4e4de3a 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/48.ico
+++ b/protocols/MRA/xstatus_MRA/res/48.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/49.ico b/protocols/MRA/xstatus_MRA/res/49.ico
index 368652a607..368652a607 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/49.ico
+++ b/protocols/MRA/xstatus_MRA/res/49.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/5.ico b/protocols/MRA/xstatus_MRA/res/5.ico
index 76cca4e0aa..76cca4e0aa 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/5.ico
+++ b/protocols/MRA/xstatus_MRA/res/5.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/50.ico b/protocols/MRA/xstatus_MRA/res/50.ico
index ef41641d1c..ef41641d1c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/50.ico
+++ b/protocols/MRA/xstatus_MRA/res/50.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/51.ico b/protocols/MRA/xstatus_MRA/res/51.ico
index a3ec794c39..a3ec794c39 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/51.ico
+++ b/protocols/MRA/xstatus_MRA/res/51.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/52.ico b/protocols/MRA/xstatus_MRA/res/52.ico
index 08edc62dc6..08edc62dc6 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/52.ico
+++ b/protocols/MRA/xstatus_MRA/res/52.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/53.ico b/protocols/MRA/xstatus_MRA/res/53.ico
index 374b72f91a..374b72f91a 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/53.ico
+++ b/protocols/MRA/xstatus_MRA/res/53.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/54.ico b/protocols/MRA/xstatus_MRA/res/54.ico
index 0223143885..0223143885 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/54.ico
+++ b/protocols/MRA/xstatus_MRA/res/54.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/6.ico b/protocols/MRA/xstatus_MRA/res/6.ico
index 9cfbd0544f..9cfbd0544f 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/6.ico
+++ b/protocols/MRA/xstatus_MRA/res/6.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/7.ico b/protocols/MRA/xstatus_MRA/res/7.ico
index 63a7b8bdfe..63a7b8bdfe 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/7.ico
+++ b/protocols/MRA/xstatus_MRA/res/7.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/8.ico b/protocols/MRA/xstatus_MRA/res/8.ico
index dba6ee75e4..dba6ee75e4 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/8.ico
+++ b/protocols/MRA/xstatus_MRA/res/8.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/9.ico b/protocols/MRA/xstatus_MRA/res/9.ico
index 598395399c..598395399c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/9.ico
+++ b/protocols/MRA/xstatus_MRA/res/9.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/icon1.ico b/protocols/MRA/xstatus_MRA/res/icon1.ico
index 1fa172375c..1fa172375c 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/icon1.ico
+++ b/protocols/MRA/xstatus_MRA/res/icon1.ico
diff --git a/protocols/MRA/xstatus_MRA/XStatus_icons/unknown.ico b/protocols/MRA/xstatus_MRA/res/unknown.ico
index 52f5847529..52f5847529 100644
--- a/protocols/MRA/xstatus_MRA/XStatus_icons/unknown.ico
+++ b/protocols/MRA/xstatus_MRA/res/unknown.ico
diff --git a/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc b/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc
new file mode 100644
index 0000000000..9100d93f85
--- /dev/null
+++ b/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc
@@ -0,0 +1,144 @@
+// Microsoft Visual C++ generated resource script.

+//

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

+

+#define APSTUDIO_READONLY_SYMBOLS

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

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+

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

+#undef APSTUDIO_READONLY_SYMBOLS

+

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

+// Neutral resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#pragma code_page(1251)

+#endif //_WIN32

+

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

+//

+// Icon

+//

+

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

+// remains consistent on all systems.

+IDI_XSTATUS1            ICON                    "4.ico"

+IDI_XSTATUS2            ICON                    "5.ico"

+IDI_XSTATUS3            ICON                    "6.ico"

+IDI_XSTATUS4            ICON                    "7.ico"

+IDI_XSTATUS5            ICON                    "8.ico"

+IDI_XSTATUS6            ICON                    "9.ico"

+IDI_XSTATUS7            ICON                    "10.ico"

+IDI_XSTATUS8            ICON                    "11.ico"

+IDI_XSTATUS9            ICON                    "12.ico"

+IDI_XSTATUS10           ICON                    "13.ico"

+IDI_XSTATUS11           ICON                    "14.ico"

+IDI_XSTATUS12           ICON                    "15.ico"

+IDI_XSTATUS13           ICON                    "16.ico"

+IDI_XSTATUS14           ICON                    "17.ico"

+IDI_XSTATUS15           ICON                    "18.ico"

+IDI_XSTATUS16           ICON                    "19.ico"

+IDI_XSTATUS17           ICON                    "20.ico"

+IDI_XSTATUS18           ICON                    "21.ico"

+IDI_XSTATUS19           ICON                    "22.ico"

+IDI_XSTATUS20           ICON                    "23.ico"

+IDI_XSTATUS21           ICON                    "24.ico"

+IDI_XSTATUS22           ICON                    "26.ico"

+IDI_XSTATUS23           ICON                    "27.ico"

+IDI_XSTATUS24           ICON                    "28.ico"

+IDI_XSTATUS25           ICON                    "29.ico"

+IDI_XSTATUS26           ICON                    "30.ico"

+IDI_XSTATUS27           ICON                    "31.ico"

+IDI_XSTATUS28           ICON                    "33.ico"

+IDI_XSTATUS29           ICON                    "34.ico"

+IDI_XSTATUS30           ICON                    "35.ico"

+IDI_XSTATUS31           ICON                    "36.ico"

+IDI_XSTATUS32           ICON                    "37.ico"

+IDI_XSTATUS33           ICON                    "38.ico"

+IDI_XSTATUS34           ICON                    "39.ico"

+IDI_XSTATUS35           ICON                    "40.ico"

+IDI_XSTATUS36           ICON                    "41.ico"

+IDI_XSTATUS37           ICON                    "42.ico"

+IDI_XSTATUS38           ICON                    "43.ico"

+IDI_XSTATUS39           ICON                    "44.ico"

+IDI_XSTATUS40           ICON                    "45.ico"

+IDI_XSTATUS41           ICON                    "46.ico"

+IDI_XSTATUS42           ICON                    "47.ico"

+IDI_XSTATUS43           ICON                    "48.ico"

+IDI_XSTATUS44           ICON                    "49.ico"

+IDI_XSTATUS45           ICON                    "50.ico"

+IDI_XSTATUS46           ICON                    "51.ico"

+IDI_XSTATUS47           ICON                    "52.ico"

+IDI_XSTATUS48           ICON                    "53.ico"

+IDI_XSTATUS_UNKNOWN     ICON                    "unknown.ico"

+IDI_XSTATUS49           ICON                    "54.ico"

+

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

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_IDENTIFY            "# Custom Status Icons #"

+END

+

+#endif    // Neutral resources

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

+

+

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

+// 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

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

+END

+

+2 TEXTINCLUDE 

+BEGIN

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

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

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

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

+

+

+

+#ifndef APSTUDIO_INVOKED

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

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

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

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/protocols/MRA/xstatus_MRA/resource.h b/protocols/MRA/xstatus_MRA/src/resource.h
index 7a9bbeb1d8..7a9bbeb1d8 100644
--- a/protocols/MRA/xstatus_MRA/resource.h
+++ b/protocols/MRA/xstatus_MRA/src/resource.h
diff --git a/protocols/MRA/xstatus_MRA/xstatus_MRA.rc b/protocols/MRA/xstatus_MRA/xstatus_MRA.rc
deleted file mode 100644
index 2d4dc48413..0000000000
--- a/protocols/MRA/xstatus_MRA/xstatus_MRA.rc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

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

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

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

-#undef APSTUDIO_READONLY_SYMBOLS

-

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

-// Neutral resources

-

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

-#ifdef _WIN32

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1251)

-#endif //_WIN32

-

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

-//

-// Icon

-//

-

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

-// remains consistent on all systems.

-IDI_XSTATUS1            ICON                    "XStatus_icons\\4.ico"

-IDI_XSTATUS2            ICON                    "XStatus_icons\\5.ico"

-IDI_XSTATUS3            ICON                    "XStatus_icons\\6.ico"

-IDI_XSTATUS4            ICON                    "XStatus_icons\\7.ico"

-IDI_XSTATUS5            ICON                    "XStatus_icons\\8.ico"

-IDI_XSTATUS6            ICON                    "XStatus_icons\\9.ico"

-IDI_XSTATUS7            ICON                    "XStatus_icons\\10.ico"

-IDI_XSTATUS8            ICON                    "XStatus_icons\\11.ico"

-IDI_XSTATUS9            ICON                    "XStatus_icons\\12.ico"

-IDI_XSTATUS10           ICON                    "XStatus_icons\\13.ico"

-IDI_XSTATUS11           ICON                    "XStatus_icons\\14.ico"

-IDI_XSTATUS12           ICON                    "XStatus_icons\\15.ico"

-IDI_XSTATUS13           ICON                    "XStatus_icons\\16.ico"

-IDI_XSTATUS14           ICON                    "XStatus_icons\\17.ico"

-IDI_XSTATUS15           ICON                    "XStatus_icons\\18.ico"

-IDI_XSTATUS16           ICON                    "XStatus_icons\\19.ico"

-IDI_XSTATUS17           ICON                    "XStatus_icons\\20.ico"

-IDI_XSTATUS18           ICON                    "XStatus_icons\\21.ico"

-IDI_XSTATUS19           ICON                    "XStatus_icons\\22.ico"

-IDI_XSTATUS20           ICON                    "XStatus_icons\\23.ico"

-IDI_XSTATUS21           ICON                    "XStatus_icons\\24.ico"

-IDI_XSTATUS22           ICON                    "XStatus_icons\\26.ico"

-IDI_XSTATUS23           ICON                    "XStatus_icons\\27.ico"

-IDI_XSTATUS24           ICON                    "XStatus_icons\\28.ico"

-IDI_XSTATUS25           ICON                    "XStatus_icons\\29.ico"

-IDI_XSTATUS26           ICON                    "XStatus_icons\\30.ico"

-IDI_XSTATUS27           ICON                    "XStatus_icons\\31.ico"

-IDI_XSTATUS28           ICON                    "XStatus_icons\\33.ico"

-IDI_XSTATUS29           ICON                    "XStatus_icons\\34.ico"

-IDI_XSTATUS30           ICON                    "XStatus_icons\\35.ico"

-IDI_XSTATUS31           ICON                    "XStatus_icons\\36.ico"

-IDI_XSTATUS32           ICON                    "XStatus_icons\\37.ico"

-IDI_XSTATUS33           ICON                    "XStatus_icons\\38.ico"

-IDI_XSTATUS34           ICON                    "XStatus_icons\\39.ico"

-IDI_XSTATUS35           ICON                    "XStatus_icons\\40.ico"

-IDI_XSTATUS36           ICON                    "XStatus_icons\\41.ico"

-IDI_XSTATUS37           ICON                    "XStatus_icons\\42.ico"

-IDI_XSTATUS38           ICON                    "XStatus_icons\\43.ico"

-IDI_XSTATUS39           ICON                    "XStatus_icons\\44.ico"

-IDI_XSTATUS40           ICON                    "XStatus_icons\\45.ico"

-IDI_XSTATUS41           ICON                    "XStatus_icons\\46.ico"

-IDI_XSTATUS42           ICON                    "XStatus_icons\\47.ico"

-IDI_XSTATUS43           ICON                    "XStatus_icons\\48.ico"

-IDI_XSTATUS44           ICON                    "XStatus_icons\\49.ico"

-IDI_XSTATUS45           ICON                    "XStatus_icons\\50.ico"

-IDI_XSTATUS46           ICON                    "XStatus_icons\\51.ico"

-IDI_XSTATUS47           ICON                    "XStatus_icons\\52.ico"

-IDI_XSTATUS48           ICON                    "XStatus_icons\\53.ico"

-IDI_XSTATUS_UNKNOWN     ICON                    "XStatus_icons\\unknown.ico"

-IDI_XSTATUS49           ICON                    "XStatus_icons\\54.ico"

-

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

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_IDENTIFY            "# Custom Status Icons #"

-END

-

-#endif    // Neutral resources

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

-

-

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

-// 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

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

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

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

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

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

-

-

-

-#ifndef APSTUDIO_INVOKED

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

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

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

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj
index 5aefd32a12..9bbd44f87f 100644
--- a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj
+++ b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj
@@ -116,10 +116,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj.filters b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj.filters
index 6f191e0e91..2ad3ae2882 100644
--- a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj.filters
+++ b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj.filters
@@ -15,12 +15,12 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="xstatus_MRA.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>