40 files changed, 39 insertions, 74 deletions
diff --git a/plugins/MetaContacts/MetaContacts_10.vcxproj b/plugins/MetaContacts/MetaContacts_10.vcxproj
index 124eb2b436..c7933fc1ba 100644
--- a/plugins/MetaContacts/MetaContacts_10.vcxproj
+++ b/plugins/MetaContacts/MetaContacts_10.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -101,7 +101,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -134,7 +134,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>metacontacts.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -160,7 +160,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>metacontacts.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -181,35 +181,26 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="addto.cpp" />
-    <ClCompile Include="edit.cpp" />
-    <ClCompile Include="icons.cpp" />
-    <ClCompile Include="meta_api.cpp" />
-    <ClCompile Include="meta_main.cpp">
+    <ClCompile Include="src\addto.cpp" />
+    <ClCompile Include="src\edit.cpp" />
+    <ClCompile Include="src\icons.cpp" />
+    <ClCompile Include="src\meta_api.cpp" />
+    <ClCompile Include="src\meta_main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="meta_menu.cpp" />
-    <ClCompile Include="meta_options.cpp" />
-    <ClCompile Include="meta_services.cpp" />
-    <ClCompile Include="meta_utils.cpp" />
+    <ClCompile Include="src\meta_menu.cpp" />
+    <ClCompile Include="src\meta_options.cpp" />
+    <ClCompile Include="src\meta_services.cpp" />
+    <ClCompile Include="src\meta_utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="metacontacts.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\metacontacts.h" />
+    <ClInclude Include="src\version.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="mcmenu.ico" />
-    <None Include="mcmenuof.ico" />
-    <None Include="meta_add.ico" />
-    <None Include="meta_convert.ico" />
-    <None Include="meta_edit.ico" />
-    <None Include="meta_remove2.ico" />
-    <None Include="meta_set_as_default.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MetaContacts.rc" />
-    <ResourceCompile Include="version.rc" />
+    <ResourceCompile Include="res\MetaContacts.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/MetaContacts/MetaContacts_10.vcxproj.filters b/plugins/MetaContacts/MetaContacts_10.vcxproj.filters
index 8277015a52..06d109be1b 100644
--- a/plugins/MetaContacts/MetaContacts_10.vcxproj.filters
+++ b/plugins/MetaContacts/MetaContacts_10.vcxproj.filters
@@ -13,78 +13,52 @@
       <UniqueIdentifier>{b4847f2a-7aa8-4577-a5a1-f7adf03537ec}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
-    <Filter Include="translation template">
-      <UniqueIdentifier>{a8acfb52-2cd1-4156-ad43-fcdd6773d45c}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="addto.cpp">
+    <ClCompile Include="src\addto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="edit.cpp">
+    <ClCompile Include="src\edit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="icons.cpp">
+    <ClCompile Include="src\icons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta_api.cpp">
+    <ClCompile Include="src\meta_api.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta_main.cpp">
+    <ClCompile Include="src\meta_main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta_menu.cpp">
+    <ClCompile Include="src\meta_menu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta_options.cpp">
+    <ClCompile Include="src\meta_options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta_services.cpp">
+    <ClCompile Include="src\meta_services.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta_utils.cpp">
+    <ClCompile Include="src\meta_utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="metacontacts.h">
+    <ClInclude Include="src\metacontacts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="mcmenu.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="mcmenuof.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="meta_add.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="meta_convert.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="meta_edit.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="meta_remove2.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="meta_set_as_default.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="MetaContacts.rc">
+    <ResourceCompile Include="res\MetaContacts.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="version.rc">
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/MetaContacts/metacontacts-translation.txt b/plugins/MetaContacts/docs/metacontacts-translation.txt
index 9a4e07a013..9a4e07a013 100644
--- a/plugins/MetaContacts/metacontacts-translation.txt
+++ b/plugins/MetaContacts/docs/metacontacts-translation.txt
diff --git a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj b/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj
index 4195943ad0..a969e084be 100644
--- a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj
+++ b/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_MetaContacts.rc" />
+    <ResourceCompile Include="res\Proto_MetaContacts.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj.filters b/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj.filters
index f1da3c7881..af73080618 100644
--- a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj.filters
+++ b/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.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_MetaContacts.rc">
+    <ResourceCompile Include="res\Proto_MetaContacts.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Away.ico b/plugins/MetaContacts/proto_metacontacts/res/Away.ico
index 41def6a954..41def6a954 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Away.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Away.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/DND.ico b/plugins/MetaContacts/proto_metacontacts/res/DND.ico
index 7e2a80318c..7e2a80318c 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/DND.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/DND.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/FFC.ico b/plugins/MetaContacts/proto_metacontacts/res/FFC.ico
index 82e21a3d9c..82e21a3d9c 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/FFC.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/FFC.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Invisible.ico b/plugins/MetaContacts/proto_metacontacts/res/Invisible.ico
index a4c3701df6..a4c3701df6 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Invisible.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Invisible.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Lunch.ico b/plugins/MetaContacts/proto_metacontacts/res/Lunch.ico
index 03fe42309c..03fe42309c 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Lunch.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Lunch.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/NA.ico b/plugins/MetaContacts/proto_metacontacts/res/NA.ico
index 03b6aa419c..03b6aa419c 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/NA.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/NA.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Occupied.ico b/plugins/MetaContacts/proto_metacontacts/res/Occupied.ico
index 8b76a97269..8b76a97269 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Occupied.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Occupied.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Offline.ico b/plugins/MetaContacts/proto_metacontacts/res/Offline.ico
index 64a5750fbc..64a5750fbc 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Offline.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Offline.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Online.ico b/plugins/MetaContacts/proto_metacontacts/res/Online.ico
index ae811fa98c..ae811fa98c 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Online.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Online.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/icos/Phone.ico b/plugins/MetaContacts/proto_metacontacts/res/Phone.ico
index fe3532b6c1..fe3532b6c1 100644
--- a/plugins/MetaContacts/proto_metacontacts/icos/Phone.ico
+++ b/plugins/MetaContacts/proto_metacontacts/res/Phone.ico
diff --git a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.rc b/plugins/MetaContacts/proto_metacontacts/res/Proto_MetaContacts.rc
index bc0ee80246..219e1939a6 100644
--- a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.rc
+++ b/plugins/MetaContacts/proto_metacontacts/res/Proto_MetaContacts.rc
diff --git a/plugins/MetaContacts/proto_metacontacts/resource.h b/plugins/MetaContacts/proto_metacontacts/src/resource.h
index 6a73a87039..6a73a87039 100644
--- a/plugins/MetaContacts/proto_metacontacts/resource.h
+++ b/plugins/MetaContacts/proto_metacontacts/src/resource.h
diff --git a/plugins/MetaContacts/MetaContacts.rc b/plugins/MetaContacts/res/MetaContacts.rc
index 42862c843c..c6f783f10b 100644
--- a/plugins/MetaContacts/MetaContacts.rc
+++ b/plugins/MetaContacts/res/MetaContacts.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -110,7 +110,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/MetaContacts/mcmenu.ico b/plugins/MetaContacts/res/mcmenu.ico
index b28455c554..b28455c554 100644
--- a/plugins/MetaContacts/mcmenu.ico
+++ b/plugins/MetaContacts/res/mcmenu.ico
diff --git a/plugins/MetaContacts/mcmenuof.ico b/plugins/MetaContacts/res/mcmenuof.ico
index 72749e1c70..72749e1c70 100644
--- a/plugins/MetaContacts/mcmenuof.ico
+++ b/plugins/MetaContacts/res/mcmenuof.ico
diff --git a/plugins/MetaContacts/mcmenuoff2.ico b/plugins/MetaContacts/res/mcmenuoff2.ico
index 5b3444abb0..5b3444abb0 100644
--- a/plugins/MetaContacts/mcmenuoff2.ico
+++ b/plugins/MetaContacts/res/mcmenuoff2.ico
diff --git a/plugins/MetaContacts/meta_add.ico b/plugins/MetaContacts/res/meta_add.ico
index e3907099d9..e3907099d9 100644
--- a/plugins/MetaContacts/meta_add.ico
+++ b/plugins/MetaContacts/res/meta_add.ico
diff --git a/plugins/MetaContacts/meta_convert.ico b/plugins/MetaContacts/res/meta_convert.ico
index 747d9d1d18..747d9d1d18 100644
--- a/plugins/MetaContacts/meta_convert.ico
+++ b/plugins/MetaContacts/res/meta_convert.ico
diff --git a/plugins/MetaContacts/meta_edit.ico b/plugins/MetaContacts/res/meta_edit.ico
index 2992671618..2992671618 100644
--- a/plugins/MetaContacts/meta_edit.ico
+++ b/plugins/MetaContacts/res/meta_edit.ico
diff --git a/plugins/MetaContacts/meta_remove2.ico b/plugins/MetaContacts/res/meta_remove2.ico
index ecfe29e6bf..ecfe29e6bf 100644
--- a/plugins/MetaContacts/meta_remove2.ico
+++ b/plugins/MetaContacts/res/meta_remove2.ico
diff --git a/plugins/MetaContacts/meta_set_as_default.ico b/plugins/MetaContacts/res/meta_set_as_default.ico
index 1792f9b23c..1792f9b23c 100644
--- a/plugins/MetaContacts/meta_set_as_default.ico
+++ b/plugins/MetaContacts/res/meta_set_as_default.ico
diff --git a/plugins/MetaContacts/version.rc b/plugins/MetaContacts/res/version.rc
index c962918f07..3ad9c3a4b3 100644
--- a/plugins/MetaContacts/version.rc
+++ b/plugins/MetaContacts/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
diff --git a/plugins/MetaContacts/addto.cpp b/plugins/MetaContacts/src/addto.cpp
index b92e97b978..b92e97b978 100644
--- a/plugins/MetaContacts/addto.cpp
+++ b/plugins/MetaContacts/src/addto.cpp
diff --git a/plugins/MetaContacts/edit.cpp b/plugins/MetaContacts/src/edit.cpp
index a5866576dd..a5866576dd 100644
--- a/plugins/MetaContacts/edit.cpp
+++ b/plugins/MetaContacts/src/edit.cpp
diff --git a/plugins/MetaContacts/icons.cpp b/plugins/MetaContacts/src/icons.cpp
index e6cbc9a3a3..e6cbc9a3a3 100644
--- a/plugins/MetaContacts/icons.cpp
+++ b/plugins/MetaContacts/src/icons.cpp
diff --git a/plugins/MetaContacts/icons.h b/plugins/MetaContacts/src/icons.h
index c77b1b02fc..c77b1b02fc 100644
--- a/plugins/MetaContacts/icons.h
+++ b/plugins/MetaContacts/src/icons.h
diff --git a/plugins/MetaContacts/meta_api.cpp b/plugins/MetaContacts/src/meta_api.cpp
index 331bdb55d5..331bdb55d5 100644
--- a/plugins/MetaContacts/meta_api.cpp
+++ b/plugins/MetaContacts/src/meta_api.cpp
diff --git a/plugins/MetaContacts/meta_main.cpp b/plugins/MetaContacts/src/meta_main.cpp
index 5aae726ace..5aae726ace 100644
--- a/plugins/MetaContacts/meta_main.cpp
+++ b/plugins/MetaContacts/src/meta_main.cpp
diff --git a/plugins/MetaContacts/meta_menu.cpp b/plugins/MetaContacts/src/meta_menu.cpp
index e71e9357a5..e71e9357a5 100644
--- a/plugins/MetaContacts/meta_menu.cpp
+++ b/plugins/MetaContacts/src/meta_menu.cpp
diff --git a/plugins/MetaContacts/meta_options.cpp b/plugins/MetaContacts/src/meta_options.cpp
index 9b113def92..9b113def92 100644
--- a/plugins/MetaContacts/meta_options.cpp
+++ b/plugins/MetaContacts/src/meta_options.cpp
diff --git a/plugins/MetaContacts/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp
index 94aea51fc9..94aea51fc9 100644
--- a/plugins/MetaContacts/meta_services.cpp
+++ b/plugins/MetaContacts/src/meta_services.cpp
diff --git a/plugins/MetaContacts/meta_utils.cpp b/plugins/MetaContacts/src/meta_utils.cpp
index 470f4aa663..470f4aa663 100644
--- a/plugins/MetaContacts/meta_utils.cpp
+++ b/plugins/MetaContacts/src/meta_utils.cpp
diff --git a/plugins/MetaContacts/metacontacts.h b/plugins/MetaContacts/src/metacontacts.h
index b0c896c5f8..b0c896c5f8 100644
--- a/plugins/MetaContacts/metacontacts.h
+++ b/plugins/MetaContacts/src/metacontacts.h
diff --git a/plugins/MetaContacts/resource.h b/plugins/MetaContacts/src/resource.h
index fe813d2ccf..fe813d2ccf 100644
--- a/plugins/MetaContacts/resource.h
+++ b/plugins/MetaContacts/src/resource.h
diff --git a/plugins/MetaContacts/version.h b/plugins/MetaContacts/src/version.h
index 26d5ee8f2a..26d5ee8f2a 100644
--- a/plugins/MetaContacts/version.h
+++ b/plugins/MetaContacts/src/version.h