15 files changed, 25 insertions, 33 deletions
diff --git a/plugins/HistoryLinkListPlus/historylinklistplus-translation.txt b/plugins/HistoryLinkListPlus/docs/historylinklistplus-translation.txt
index cd419cb143..cd419cb143 100644
--- a/plugins/HistoryLinkListPlus/historylinklistplus-translation.txt
+++ b/plugins/HistoryLinkListPlus/docs/historylinklistplus-translation.txt
diff --git a/plugins/HistoryLinkListPlus/linklist.vcxproj b/plugins/HistoryLinkListPlus/linklist.vcxproj
index d41c2eb78c..570d18378e 100644
--- a/plugins/HistoryLinkListPlus/linklist.vcxproj
+++ b/plugins/HistoryLinkListPlus/linklist.vcxproj
@@ -104,7 +104,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;LINKLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
@@ -178,24 +178,21 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="linklist.cpp" />
-    <ClCompile Include="linklist_dlg.cpp" />
-    <ClCompile Include="linklist_fct.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\linklist.cpp" />
+    <ClCompile Include="src\linklist_dlg.cpp" />
+    <ClCompile Include="src\linklist_fct.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="language.h" />
-    <ClInclude Include="linklist.h" />
-    <ClInclude Include="linklist_dlg.h" />
-    <ClInclude Include="linklist_fct.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="utils.h" />
+    <ClInclude Include="src\language.h" />
+    <ClInclude Include="src\linklist.h" />
+    <ClInclude Include="src\linklist_dlg.h" />
+    <ClInclude Include="src\linklist_fct.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\utils.h" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="linklist.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="linklist.rc" />
+    <ResourceCompile Include="res\linklist.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/HistoryLinkListPlus/linklist.vcxproj.filters b/plugins/HistoryLinkListPlus/linklist.vcxproj.filters
index e71bcb3719..b7f1857be2 100644
--- a/plugins/HistoryLinkListPlus/linklist.vcxproj.filters
+++ b/plugins/HistoryLinkListPlus/linklist.vcxproj.filters
@@ -15,47 +15,42 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="linklist.cpp">
+    <ClCompile Include="src\linklist.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="linklist_dlg.cpp">
+    <ClCompile Include="src\linklist_dlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="linklist_fct.cpp">
+    <ClCompile Include="src\linklist_fct.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="linklist.h">
+    <ClInclude Include="src\linklist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="linklist_dlg.h">
+    <ClInclude Include="src\linklist_dlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="linklist_fct.h">
+    <ClInclude Include="src\linklist_fct.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="language.h">
+    <ClInclude Include="src\language.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
+    <ClInclude Include="src\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="linklist.rc">
+    <ResourceCompile Include="res\linklist.rc">
       <Filter>Resources</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="linklist.ico">
-      <Filter>Resources</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/plugins/HistoryLinkListPlus/linklist.ico b/plugins/HistoryLinkListPlus/res/linklist.ico
index 43a005cbbb..43a005cbbb 100644
--- a/plugins/HistoryLinkListPlus/linklist.ico
+++ b/plugins/HistoryLinkListPlus/res/linklist.ico
diff --git a/plugins/HistoryLinkListPlus/linklist.rc b/plugins/HistoryLinkListPlus/res/linklist.rc
index 2c3d44b222..3a9a359e31 100644
--- a/plugins/HistoryLinkListPlus/linklist.rc
+++ b/plugins/HistoryLinkListPlus/res/linklist.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/HistoryLinkListPlus/language.h b/plugins/HistoryLinkListPlus/src/language.h
index 92eb5a6486..92eb5a6486 100644
--- a/plugins/HistoryLinkListPlus/language.h
+++ b/plugins/HistoryLinkListPlus/src/language.h
diff --git a/plugins/HistoryLinkListPlus/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp
index 6de2a4a1e9..6de2a4a1e9 100644
--- a/plugins/HistoryLinkListPlus/linklist.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist.cpp
diff --git a/plugins/HistoryLinkListPlus/linklist.h b/plugins/HistoryLinkListPlus/src/linklist.h
index 17cc63e9c9..17cc63e9c9 100644
--- a/plugins/HistoryLinkListPlus/linklist.h
+++ b/plugins/HistoryLinkListPlus/src/linklist.h
diff --git a/plugins/HistoryLinkListPlus/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
index 6e26d8538d..6e26d8538d 100644
--- a/plugins/HistoryLinkListPlus/linklist_dlg.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
diff --git a/plugins/HistoryLinkListPlus/linklist_dlg.h b/plugins/HistoryLinkListPlus/src/linklist_dlg.h
index 9fe31f73b2..9fe31f73b2 100644
--- a/plugins/HistoryLinkListPlus/linklist_dlg.h
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.h
diff --git a/plugins/HistoryLinkListPlus/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
index 4d73448865..4d73448865 100644
--- a/plugins/HistoryLinkListPlus/linklist_fct.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
diff --git a/plugins/HistoryLinkListPlus/linklist_fct.h b/plugins/HistoryLinkListPlus/src/linklist_fct.h
index b29c8f82db..b29c8f82db 100644
--- a/plugins/HistoryLinkListPlus/linklist_fct.h
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.h
diff --git a/plugins/HistoryLinkListPlus/resource.h b/plugins/HistoryLinkListPlus/src/resource.h
index 740b3d8479..740b3d8479 100644
--- a/plugins/HistoryLinkListPlus/resource.h
+++ b/plugins/HistoryLinkListPlus/src/resource.h
diff --git a/plugins/HistoryLinkListPlus/utils.cpp b/plugins/HistoryLinkListPlus/src/utils.cpp
index e21f75ee89..e21f75ee89 100644
--- a/plugins/HistoryLinkListPlus/utils.cpp
+++ b/plugins/HistoryLinkListPlus/src/utils.cpp
diff --git a/plugins/HistoryLinkListPlus/utils.h b/plugins/HistoryLinkListPlus/src/utils.h
index 5338981bd0..5338981bd0 100644
--- a/plugins/HistoryLinkListPlus/utils.h
+++ b/plugins/HistoryLinkListPlus/src/utils.h