40 files changed, 67 insertions, 228 deletions

diff --git a/protocols/Weather/license.txt b/protocols/Weather/docs/license.txt
index 45645b4b53..45645b4b53 100644
--- a/protocols/Weather/license.txt
+++ b/protocols/Weather/docs/license.txt
diff --git a/protocols/Weather/sample_ini.ini b/protocols/Weather/docs/sample_ini.ini
index dc36eda754..dc36eda754 100644
--- a/protocols/Weather/sample_ini.ini
+++ b/protocols/Weather/docs/sample_ini.ini
diff --git a/protocols/Weather/weather-history.txt b/protocols/Weather/docs/weather-history.txt
index ff936f56f2..ff936f56f2 100644
--- a/protocols/Weather/weather-history.txt
+++ b/protocols/Weather/docs/weather-history.txt
diff --git a/protocols/Weather/weather-readme.html b/protocols/Weather/docs/weather-readme.html
index ff81561171..ff81561171 100644
--- a/protocols/Weather/weather-readme.html
+++ b/protocols/Weather/docs/weather-readme.html
diff --git a/protocols/Weather/weather-translation.txt b/protocols/Weather/docs/weather-translation.txt
index 91f2a6048d..91f2a6048d 100644
--- a/protocols/Weather/weather-translation.txt
+++ b/protocols/Weather/docs/weather-translation.txt
diff --git a/protocols/Weather/proto_weather/proto_weather_10.vcxproj b/protocols/Weather/proto_weather/proto_weather_10.vcxproj
index f100b68085..8187912e95 100644
--- a/protocols/Weather/proto_weather/proto_weather_10.vcxproj
+++ b/protocols/Weather/proto_weather/proto_weather_10.vcxproj
@@ -120,22 +120,7 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="wicons\Cloud.ico" />

-    <None Include="wicons\FOG.ico" />

-    <None Include="wicons\LIGHT.ICO" />

-    <None Include="wicons\NA.ico" />

-    <None Include="wicons\PCLOUDY.ico" />

-    <None Include="wicons\RAIN.ico" />

-    <None Include="wicons\RSHOWER.ico" />

-    <None Include="wicons\SNOW.ICO" />

-    <None Include="wicons\SSHOWER.ico" />

-    <None Include="wicons\SUN.ICO" />

-  </ItemGroup>

-  <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters b/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
index a94cf28821..27e90fab59 100644
--- a/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
+++ b/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
@@ -1,58 +1,13 @@
 <?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="wicons\Cloud.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\FOG.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\LIGHT.ICO">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\NA.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\PCLOUDY.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\RAIN.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\RSHOWER.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\SNOW.ICO">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\SSHOWER.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\SUN.ICO">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/Weather/proto_weather/wicons/Cloud.ico b/protocols/Weather/proto_weather/res/Cloud.ico
index 2edb539dcb..2edb539dcb 100644
--- a/protocols/Weather/proto_weather/wicons/Cloud.ico
+++ b/protocols/Weather/proto_weather/res/Cloud.ico
diff --git a/protocols/Weather/proto_weather/wicons/FOG.ico b/protocols/Weather/proto_weather/res/FOG.ico
index fbd81b9a03..fbd81b9a03 100644
--- a/protocols/Weather/proto_weather/wicons/FOG.ico
+++ b/protocols/Weather/proto_weather/res/FOG.ico
diff --git a/protocols/Weather/proto_weather/wicons/LIGHT.ICO b/protocols/Weather/proto_weather/res/LIGHT.ico
index d266094fbe..d266094fbe 100644
--- a/protocols/Weather/proto_weather/wicons/LIGHT.ICO
+++ b/protocols/Weather/proto_weather/res/LIGHT.ico
diff --git a/protocols/Weather/proto_weather/wicons/NA.ico b/protocols/Weather/proto_weather/res/NA.ico
index 3e4a3aa324..3e4a3aa324 100644
--- a/protocols/Weather/proto_weather/wicons/NA.ico
+++ b/protocols/Weather/proto_weather/res/NA.ico
diff --git a/protocols/Weather/proto_weather/wicons/PCLOUDY.ico b/protocols/Weather/proto_weather/res/PCLOUDY.ico
index be3d0c88bd..be3d0c88bd 100644
--- a/protocols/Weather/proto_weather/wicons/PCLOUDY.ico
+++ b/protocols/Weather/proto_weather/res/PCLOUDY.ico
diff --git a/protocols/Weather/proto_weather/wicons/RAIN.ico b/protocols/Weather/proto_weather/res/RAIN.ico
index 4b65fb6714..4b65fb6714 100644
--- a/protocols/Weather/proto_weather/wicons/RAIN.ico
+++ b/protocols/Weather/proto_weather/res/RAIN.ico
diff --git a/protocols/Weather/proto_weather/wicons/RSHOWER.ico b/protocols/Weather/proto_weather/res/RSHOWER.ico
index 442552e155..442552e155 100644
--- a/protocols/Weather/proto_weather/wicons/RSHOWER.ico
+++ b/protocols/Weather/proto_weather/res/RSHOWER.ico
diff --git a/protocols/Weather/proto_weather/wicons/SNOW.ICO b/protocols/Weather/proto_weather/res/SNOW.ico
index 1a482c3bc8..1a482c3bc8 100644
--- a/protocols/Weather/proto_weather/wicons/SNOW.ICO
+++ b/protocols/Weather/proto_weather/res/SNOW.ico
diff --git a/protocols/Weather/proto_weather/wicons/SSHOWER.ico b/protocols/Weather/proto_weather/res/SSHOWER.ico
index 0bd2264413..0bd2264413 100644
--- a/protocols/Weather/proto_weather/wicons/SSHOWER.ico
+++ b/protocols/Weather/proto_weather/res/SSHOWER.ico
diff --git a/protocols/Weather/proto_weather/wicons/SUN.ICO b/protocols/Weather/proto_weather/res/SUN.ico
index b37fc6ad2a..b37fc6ad2a 100644
--- a/protocols/Weather/proto_weather/wicons/SUN.ICO
+++ b/protocols/Weather/proto_weather/res/SUN.ico
diff --git a/protocols/Weather/proto_weather/resource.rc b/protocols/Weather/proto_weather/res/resource.rc
index 930886b96f..b059c0696d 100644
--- a/protocols/Weather/proto_weather/resource.rc
+++ b/protocols/Weather/proto_weather/res/resource.rc
@@ -26,16 +26,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

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

 // remains consistent on all systems.

-104                     ICON    DISCARDABLE     "wicons\\SUN.ico"

-105                     ICON    DISCARDABLE     "wicons\\NA.ico"

-128                     ICON    DISCARDABLE     "wicons\\PCLOUDY.ico"

-129                     ICON    DISCARDABLE     "wicons\\RSHOWER.ico"

-130                     ICON    DISCARDABLE     "wicons\\LIGHT.ico"

-131                     ICON    DISCARDABLE     "wicons\\RAIN.ico"

-158                     ICON    DISCARDABLE     "wicons\\SNOW.ico"

-159                     ICON    DISCARDABLE     "wicons\\CLOUD.ico"

-1002                    ICON    DISCARDABLE     "wicons\\SSHOWER.ico"

-1003                    ICON    DISCARDABLE     "wicons\\FOG.ico"

+104                     ICON         "SUN.ico"

+105                     ICON         "NA.ico"

+128                     ICON         "PCLOUDY.ico"

+129                     ICON         "RSHOWER.ico"

+130                     ICON         "LIGHT.ico"

+131                     ICON         "RAIN.ico"

+158                     ICON         "SNOW.ico"

+159                     ICON         "CLOUD.ico"

+1002                    ICON         "SSHOWER.ico"

+1003                    ICON         "FOG.ico"

 

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

 /////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/protocols/Weather/proto_weather/resource.h b/protocols/Weather/proto_weather/resource.h
deleted file mode 100644
index 0ac64a0f1c..0000000000
--- a/protocols/Weather/proto_weather/resource.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by resource.rc

-//

-#define IDI_ONLINE                      104

-#define IDI_OFFLINE                     105

-#define IDI_AWAY                        128

-#define IDI_FREE4CHAT                   129

-#define IDI_INVISIBLE                   130

-#define IDI_NA                          131

-#define IDI_DND                         158

-#define IDI_OCCUPIED                    159

-#define IDI_ONTHEPHONE                  1002

-#define IDI_OUTTOLUNCH                  1003

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NO_MFC                     1

-#define _APS_NEXT_RESOURCE_VALUE        224

-#define _APS_NEXT_COMMAND_VALUE         40030

-#define _APS_NEXT_CONTROL_VALUE         2117

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

diff --git a/protocols/Weather/resource.rc b/protocols/Weather/res/resource.rc
index 79854b8c84..f8dd82df30 100644
--- a/protocols/Weather/resource.rc
+++ b/protocols/Weather/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include <windows.h>

-#include "version.h"

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

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -31,7 +31,7 @@ EXSTYLE WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,245,25

-    CONTROL         "",IDC_MTEXT,"RichEdit20A",ES_MULTILINE | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP,0,25,244,180,WS_EX_STATICEDGE

+    CONTROL         "",IDC_MTEXT,"RichEdit20W",ES_MULTILINE | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP,0,25,244,180,WS_EX_STATICEDGE

     CONTROL         "List1",IDC_DATALIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_TABSTOP,0,25,244,180,WS_EX_STATICEDGE

     PUSHBUTTON      "Update",IDC_MUPDATE,10,213,48,13

     PUSHBUTTON      "Brief Info",IDC_MTOGGLE,79,213,48,13

@@ -373,17 +373,17 @@ END
 

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

 // remains consistent on all systems.

-IDI_ICON                ICON                    "res\\icon.ico"

-IDI_UPDATE              ICON                    "res\\update.ico"

-IDI_READ                ICON                    "res\\more.ico"

-IDI_S                   ICON                    "res\\brief.ico"

-IDI_LOG                 ICON                    "res\\log.ico"

-IDI_EDIT                ICON                    "res\\edit.ico"

-IDI_MAP                 ICON                    "res\\map.ico"

-IDI_POPUP               ICON                    "res\\popup.ico"

-IDI_NOPOPUP             ICON                    "res\\popup_no.ico"

-IDI_UPDATE2             ICON                    "res\\update2.ico"

-IDI_DISABLED            ICON                    "res\\disabled.ico"

+IDI_ICON                ICON                    "icon.ico"

+IDI_UPDATE              ICON                    "update.ico"

+IDI_READ                ICON                    "more.ico"

+IDI_S                   ICON                    "brief.ico"

+IDI_LOG                 ICON                    "log.ico"

+IDI_EDIT                ICON                    "edit.ico"

+IDI_MAP                 ICON                    "map.ico"

+IDI_POPUP               ICON                    "popup.ico"

+IDI_NOPOPUP             ICON                    "popup_no.ico"

+IDI_UPDATE2             ICON                    "update2.ico"

+IDI_DISABLED            ICON                    "disabled.ico"

 

 #ifdef APSTUDIO_INVOKED

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

@@ -393,13 +393,13 @@ IDI_DISABLED            ICON                    "res\\disabled.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

 BEGIN

     "#include <windows.h>\r\n"

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

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

     "\0"

 END

 

diff --git a/protocols/Weather/resource.h b/protocols/Weather/src/resource.h
index e88e4c19de..e88e4c19de 100644
--- a/protocols/Weather/resource.h
+++ b/protocols/Weather/src/resource.h
diff --git a/protocols/Weather/version.h b/protocols/Weather/src/version.h
index 133e5f0818..133e5f0818 100644
--- a/protocols/Weather/version.h
+++ b/protocols/Weather/src/version.h
diff --git a/protocols/Weather/weather.cpp b/protocols/Weather/src/weather.cpp
index 75d93b621d..754b7400fd 100644
--- a/protocols/Weather/weather.cpp
+++ b/protocols/Weather/src/weather.cpp
@@ -86,14 +86,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCO
 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 

 {

-	switch(fdwReason)

-	{

-	case DLL_PROCESS_ATTACH:

-		hInst = hinstDLL;

-		DisableThreadLibraryCalls(hinstDLL);

-		break;

-	}

-

+	hInst = hinstDLL;

 	return TRUE;

 }

 

diff --git a/protocols/Weather/weather.h b/protocols/Weather/src/weather.h
index 400d5e6778..400d5e6778 100644
--- a/protocols/Weather/weather.h
+++ b/protocols/Weather/src/weather.h
diff --git a/protocols/Weather/weather_addstn.cpp b/protocols/Weather/src/weather_addstn.cpp
index 31a83f75fc..31a83f75fc 100644
--- a/protocols/Weather/weather_addstn.cpp
+++ b/protocols/Weather/src/weather_addstn.cpp
diff --git a/protocols/Weather/weather_contacts.cpp b/protocols/Weather/src/weather_contacts.cpp
index 9111ea3d92..9111ea3d92 100644
--- a/protocols/Weather/weather_contacts.cpp
+++ b/protocols/Weather/src/weather_contacts.cpp
diff --git a/protocols/Weather/weather_conv.cpp b/protocols/Weather/src/weather_conv.cpp
index ff5e37cb58..ff5e37cb58 100644
--- a/protocols/Weather/weather_conv.cpp
+++ b/protocols/Weather/src/weather_conv.cpp
diff --git a/protocols/Weather/weather_data.cpp b/protocols/Weather/src/weather_data.cpp
index 3fadde88e7..3fadde88e7 100644
--- a/protocols/Weather/weather_data.cpp
+++ b/protocols/Weather/src/weather_data.cpp
diff --git a/protocols/Weather/weather_http.cpp b/protocols/Weather/src/weather_http.cpp
index bfeb6fe727..bfeb6fe727 100644
--- a/protocols/Weather/weather_http.cpp
+++ b/protocols/Weather/src/weather_http.cpp
diff --git a/protocols/Weather/weather_icons.cpp b/protocols/Weather/src/weather_icons.cpp
index 791f9c7a2d..791f9c7a2d 100644
--- a/protocols/Weather/weather_icons.cpp
+++ b/protocols/Weather/src/weather_icons.cpp
diff --git a/protocols/Weather/weather_info.cpp b/protocols/Weather/src/weather_info.cpp
index 524860fe3e..524860fe3e 100644
--- a/protocols/Weather/weather_info.cpp
+++ b/protocols/Weather/src/weather_info.cpp
diff --git a/protocols/Weather/weather_ini.cpp b/protocols/Weather/src/weather_ini.cpp
index 06e83db986..06e83db986 100644
--- a/protocols/Weather/weather_ini.cpp
+++ b/protocols/Weather/src/weather_ini.cpp
diff --git a/protocols/Weather/weather_mwin.cpp b/protocols/Weather/src/weather_mwin.cpp
index c5fa204f85..c5fa204f85 100644
--- a/protocols/Weather/weather_mwin.cpp
+++ b/protocols/Weather/src/weather_mwin.cpp
diff --git a/protocols/Weather/weather_opt.cpp b/protocols/Weather/src/weather_opt.cpp
index 1f7fe3e3ab..1f7fe3e3ab 100644
--- a/protocols/Weather/weather_opt.cpp
+++ b/protocols/Weather/src/weather_opt.cpp
diff --git a/protocols/Weather/weather_popup.cpp b/protocols/Weather/src/weather_popup.cpp
index 6b6b1d4ebd..6b6b1d4ebd 100644
--- a/protocols/Weather/weather_popup.cpp
+++ b/protocols/Weather/src/weather_popup.cpp
diff --git a/protocols/Weather/weather_svcs.cpp b/protocols/Weather/src/weather_svcs.cpp
index 1125ba8fb1..1125ba8fb1 100644
--- a/protocols/Weather/weather_svcs.cpp
+++ b/protocols/Weather/src/weather_svcs.cpp
diff --git a/protocols/Weather/weather_update.cpp b/protocols/Weather/src/weather_update.cpp
index 48ed3d84c2..48ed3d84c2 100644
--- a/protocols/Weather/weather_update.cpp
+++ b/protocols/Weather/src/weather_update.cpp
diff --git a/protocols/Weather/weather_userinfo.cpp b/protocols/Weather/src/weather_userinfo.cpp
index 0374b801cc..0374b801cc 100644
--- a/protocols/Weather/weather_userinfo.cpp
+++ b/protocols/Weather/src/weather_userinfo.cpp
diff --git a/protocols/Weather/weather_10.vcxproj b/protocols/Weather/weather_10.vcxproj
index d4168cda2a..7014c10f5e 100644
--- a/protocols/Weather/weather_10.vcxproj
+++ b/protocols/Weather/weather_10.vcxproj
@@ -185,49 +185,31 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="weather.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

-    <None Include="sample_ini.ini" />

-    <None Include="weather-history.txt" />

-    <None Include="weather-readme.html" />

-    <None Include="weather-translation.txt" />

-    <None Include="res\brief.ico" />

-    <None Include="res\disabled.ico" />

-    <None Include="res\edit.ico" />

-    <None Include="res\icon.ico" />

-    <None Include="res\log.ico" />

-    <None Include="res\map.ico" />

-    <None Include="res\more.ico" />

-    <None Include="res\popup.ico" />

-    <None Include="res\popup_no.ico" />

-    <None Include="res\update.ico" />

-    <None Include="res\update2.ico" />

-  </ItemGroup>

-  <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/Weather/weather_10.vcxproj.filters b/protocols/Weather/weather_10.vcxproj.filters
index 6cef70fb53..00fc2391f5 100644
--- a/protocols/Weather/weather_10.vcxproj.filters
+++ b/protocols/Weather/weather_10.vcxproj.filters
@@ -18,115 +18,65 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="weather.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_addstn.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_contacts.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_conv.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_data.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_http.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_icons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_info.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_ini.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_mwin.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_opt.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_popup.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_svcs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_update.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="weather_userinfo.cpp">

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

       <Filter>Source Files</Filter>

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

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="langpack_defweather.txt">

-      <Filter>Documentations</Filter>

-    </None>

-    <None Include="sample_ini.ini">

-      <Filter>Documentations</Filter>

-    </None>

-    <None Include="weather-history.txt">

-      <Filter>Documentations</Filter>

-    </None>

-    <None Include="weather-readme.html">

-      <Filter>Documentations</Filter>

-    </None>

-    <None Include="weather-translation.txt">

-      <Filter>Documentations</Filter>

-    </None>

-    <None Include="res\brief.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\disabled.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\edit.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\icon.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\log.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\map.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\more.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_no.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\update.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\update2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>