21 files changed, 42 insertions, 42 deletions
diff --git a/plugins/AssocMgr/assocmgr.vcxproj b/plugins/AssocMgr/assocmgr.vcxproj
index 457f753647..1d591fdad1 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj
+++ b/plugins/AssocMgr/assocmgr.vcxproj
@@ -78,14 +78,14 @@
       <MinimalRebuild>true</MinimalRebuild>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -106,14 +106,14 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;UNICODE;WIN64;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -134,14 +134,14 @@
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -164,14 +164,14 @@
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;UNICODE;WIN64;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <LinkDLL>true</LinkDLL>
@@ -187,24 +187,24 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="assoclist.cpp" />
-    <ClCompile Include="dde.cpp" />
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\assoclist.cpp" />
+    <ClCompile Include="src\dde.cpp" />
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="reg.cpp" />
-    <ClCompile Include="test.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\reg.cpp" />
+    <ClCompile Include="src\test.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="assoclist.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="dde.h" />
-    <ClInclude Include="reg.h" />
-    <ClInclude Include="test.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\assoclist.h" />
+    <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\dde.h" />
+    <ClInclude Include="src\reg.h" />
+    <ClInclude Include="src\test.h" />
+    <ClInclude Include="src\utils.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="res\miranda.ico" />
@@ -213,11 +213,11 @@
     <CustomBuild Include="docs\AssocMgr-License.txt" />
     <CustomBuild Include="docs\AssocMgr-Readme.txt" />
     <CustomBuild Include="docs\AssocMgr-Translation.txt" />
-    <CustomBuild Include="Info_Src.txt" />
-    <CustomBuild Include="License_Appendix.txt" />
+    <CustomBuild Include="docs\Info_Src.txt" />
+    <CustomBuild Include="docs\License_Appendix.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
+    <ResourceCompile Include="res\resource.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/AssocMgr/assocmgr.vcxproj.filters b/plugins/AssocMgr/assocmgr.vcxproj.filters
index 295050b0e0..85dfe0caf0 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj.filters
+++ b/plugins/AssocMgr/assocmgr.vcxproj.filters
@@ -19,53 +19,53 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="assoclist.cpp">
+    <ClCompile Include="src\assoclist.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dde.cpp">
+    <ClCompile Include="src\dde.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="reg.cpp">
+    <ClCompile Include="src\reg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="test.cpp">
+    <ClCompile Include="src\test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="assoclist.h">
+    <ClInclude Include="src\assoclist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common.h">
+    <ClInclude Include="src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dde.h">
+    <ClInclude Include="src\dde.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="reg.h">
+    <ClInclude Include="src\reg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="test.h">
+    <ClInclude Include="src\test.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
+    <ClInclude Include="src\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
@@ -88,10 +88,10 @@
     <CustomBuild Include="docs\AssocMgr-Translation.txt">
       <Filter>Documentation</Filter>
     </CustomBuild>
-    <CustomBuild Include="Info_Src.txt">
+    <CustomBuild Include="docs\Info_Src.txt">
       <Filter>Documentation</Filter>
     </CustomBuild>
-    <CustomBuild Include="License_Appendix.txt">
+    <CustomBuild Include="docs\License_Appendix.txt">
       <Filter>Documentation</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/plugins/AssocMgr/Info_Src.txt b/plugins/AssocMgr/docs/Info_Src.txt
index 655c2f66f7..655c2f66f7 100644
--- a/plugins/AssocMgr/Info_Src.txt
+++ b/plugins/AssocMgr/docs/Info_Src.txt
diff --git a/plugins/AssocMgr/License_Appendix.txt b/plugins/AssocMgr/docs/License_Appendix.txt
index c590c3f5fb..c590c3f5fb 100644
--- a/plugins/AssocMgr/License_Appendix.txt
+++ b/plugins/AssocMgr/docs/License_Appendix.txt
diff --git a/plugins/AssocMgr/assocmgr-translation.txt b/plugins/AssocMgr/docs/assocmgr-translation.txt
index b00a8c3269..b00a8c3269 100644
--- a/plugins/AssocMgr/assocmgr-translation.txt
+++ b/plugins/AssocMgr/docs/assocmgr-translation.txt
diff --git a/plugins/AssocMgr/resource.rc b/plugins/AssocMgr/res/resource.rc
index 8c87596f46..8c87596f46 100644
--- a/plugins/AssocMgr/resource.rc
+++ b/plugins/AssocMgr/res/resource.rc
diff --git a/plugins/AssocMgr/version.rc b/plugins/AssocMgr/res/version.rc
index b052561f31..b052561f31 100644
--- a/plugins/AssocMgr/version.rc
+++ b/plugins/AssocMgr/res/version.rc
diff --git a/plugins/AssocMgr/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index 4ccb5645fe..4ccb5645fe 100644
--- a/plugins/AssocMgr/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
diff --git a/plugins/AssocMgr/assoclist.h b/plugins/AssocMgr/src/assoclist.h
index 5e8806b828..5e8806b828 100644
--- a/plugins/AssocMgr/assoclist.h
+++ b/plugins/AssocMgr/src/assoclist.h
diff --git a/plugins/AssocMgr/common.h b/plugins/AssocMgr/src/common.h
index 9f6c0b7505..9f6c0b7505 100644
--- a/plugins/AssocMgr/common.h
+++ b/plugins/AssocMgr/src/common.h
diff --git a/plugins/AssocMgr/dde.cpp b/plugins/AssocMgr/src/dde.cpp
index a8328b4d34..a8328b4d34 100644
--- a/plugins/AssocMgr/dde.cpp
+++ b/plugins/AssocMgr/src/dde.cpp
diff --git a/plugins/AssocMgr/dde.h b/plugins/AssocMgr/src/dde.h
index 9ca8a340ae..9ca8a340ae 100644
--- a/plugins/AssocMgr/dde.h
+++ b/plugins/AssocMgr/src/dde.h
diff --git a/plugins/AssocMgr/main.cpp b/plugins/AssocMgr/src/main.cpp
index e6095c25c4..e6095c25c4 100644
--- a/plugins/AssocMgr/main.cpp
+++ b/plugins/AssocMgr/src/main.cpp
diff --git a/plugins/AssocMgr/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 92451a52d3..92451a52d3 100644
--- a/plugins/AssocMgr/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
diff --git a/plugins/AssocMgr/reg.h b/plugins/AssocMgr/src/reg.h
index 98884a3224..98884a3224 100644
--- a/plugins/AssocMgr/reg.h
+++ b/plugins/AssocMgr/src/reg.h
diff --git a/plugins/AssocMgr/resource.h b/plugins/AssocMgr/src/resource.h
index 2eda2da237..2eda2da237 100644
--- a/plugins/AssocMgr/resource.h
+++ b/plugins/AssocMgr/src/resource.h
diff --git a/plugins/AssocMgr/test.cpp b/plugins/AssocMgr/src/test.cpp
index 73112af5a5..73112af5a5 100644
--- a/plugins/AssocMgr/test.cpp
+++ b/plugins/AssocMgr/src/test.cpp
diff --git a/plugins/AssocMgr/test.h b/plugins/AssocMgr/src/test.h
index 638dea164b..638dea164b 100644
--- a/plugins/AssocMgr/test.h
+++ b/plugins/AssocMgr/src/test.h
diff --git a/plugins/AssocMgr/utils.cpp b/plugins/AssocMgr/src/utils.cpp
index e6414eeb02..e6414eeb02 100644
--- a/plugins/AssocMgr/utils.cpp
+++ b/plugins/AssocMgr/src/utils.cpp
diff --git a/plugins/AssocMgr/utils.h b/plugins/AssocMgr/src/utils.h
index f65a29ebec..f65a29ebec 100644
--- a/plugins/AssocMgr/utils.h
+++ b/plugins/AssocMgr/src/utils.h
diff --git a/plugins/AssocMgr/version.h b/plugins/AssocMgr/src/version.h
index 9d68defbef..9d68defbef 100644
--- a/plugins/AssocMgr/version.h
+++ b/plugins/AssocMgr/src/version.h