22 files changed, 50 insertions, 51 deletions
diff --git a/plugins/AutoShutdown/resource.rc b/plugins/AutoShutdown/res/resource.rc
index e35d776ac1..4215911002 100644
--- a/plugins/AutoShutdown/resource.rc
+++ b/plugins/AutoShutdown/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -29,13 +29,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 
 1 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
-    "resource.h\0"
+    "..\src\resource.h\0"
 END
 
 2 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
     "#include <winres.h>\r\n"
-    "#include <m_utils.h>\r\n"
     "\0"
 END
 
@@ -232,9 +231,9 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ACTIVE              ICON    DISCARDABLE     "res/active.ico"
-IDI_HEADER              ICON    DISCARDABLE     "res/header.ico"
-IDI_INACTIVE            ICON    DISCARDABLE     "res/inactive.ico"
+IDI_ACTIVE              ICON    DISCARDABLE     "active.ico"
+IDI_HEADER              ICON    DISCARDABLE     "header.ico"
+IDI_INACTIVE            ICON    DISCARDABLE     "inactive.ico"
 #endif    // Englisch (GB) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/AutoShutdown/version.rc b/plugins/AutoShutdown/res/version.rc
index 55d209f055..6b5b369218 100644
--- a/plugins/AutoShutdown/version.rc
+++ b/plugins/AutoShutdown/res/version.rc
@@ -1,4 +1,4 @@
-#include "version.h"
+#include "..\src\version.h"
 
 ///////////////////////////////////////////////////////////////////////////// 
 //                                                                            
diff --git a/plugins/AutoShutdown/shutdown.vcxproj b/plugins/AutoShutdown/shutdown.vcxproj
index 72cbdb3c79..491a4b91ad 100644
--- a/plugins/AutoShutdown/shutdown.vcxproj
+++ b/plugins/AutoShutdown/shutdown.vcxproj
@@ -186,28 +186,28 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="cpuusage.cpp" />
-    <ClCompile Include="frame.cpp" />
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\cpuusage.cpp" />
+    <ClCompile Include="src\frame.cpp" />
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="settingsdlg.cpp" />
-    <ClCompile Include="shutdownsvc.cpp" />
-    <ClCompile Include="utils.cpp" />
-    <ClCompile Include="watcher.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\settingsdlg.cpp" />
+    <ClCompile Include="src\shutdownsvc.cpp" />
+    <ClCompile Include="src\utils.cpp" />
+    <ClCompile Include="src\watcher.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="common.h" />
-    <ClInclude Include="cpuusage.h" />
-    <ClInclude Include="frame.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="settingsdlg.h" />
-    <ClInclude Include="shutdownsvc.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="watcher.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\cpuusage.h" />
+    <ClInclude Include="src\frame.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\settingsdlg.h" />
+    <ClInclude Include="src\shutdownsvc.h" />
+    <ClInclude Include="src\utils.h" />
+    <ClInclude Include="src\watcher.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="res\active.ico" />
@@ -217,12 +217,12 @@
     <CustomBuild Include="docs\Shutdown-License.txt" />
     <CustomBuild Include="docs\Shutdown-Readme.txt" />
     <CustomBuild Include="docs\Shutdown-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="version.rc" />
+    <ResourceCompile Include="res\resource.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/AutoShutdown/shutdown.vcxproj.filters b/plugins/AutoShutdown/shutdown.vcxproj.filters
index a71c6cd42b..52b2e5ecfe 100644
--- a/plugins/AutoShutdown/shutdown.vcxproj.filters
+++ b/plugins/AutoShutdown/shutdown.vcxproj.filters
@@ -19,68 +19,68 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="cpuusage.cpp">
+    <ClCompile Include="src\cpuusage.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="frame.cpp">
+    <ClCompile Include="src\frame.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="settingsdlg.cpp">
+    <ClCompile Include="src\settingsdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shutdownsvc.cpp">
+    <ClCompile Include="src\shutdownsvc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="watcher.cpp">
+    <ClCompile Include="src\watcher.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="common.h">
+    <ClInclude Include="src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cpuusage.h">
+    <ClInclude Include="src\cpuusage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="frame.h">
+    <ClInclude Include="src\frame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="settingsdlg.h">
+    <ClInclude Include="src\settingsdlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="shutdownsvc.h">
+    <ClInclude Include="src\shutdownsvc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
+    <ClInclude Include="src\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="watcher.h">
+    <ClInclude Include="src\watcher.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>
-    <ResourceCompile Include="version.rc">
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
@@ -106,10 +106,10 @@
     <CustomBuild Include="docs\Shutdown-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/AutoShutdown/common.h b/plugins/AutoShutdown/src/common.h
index d0ee925bdc..d0ee925bdc 100644
--- a/plugins/AutoShutdown/common.h
+++ b/plugins/AutoShutdown/src/common.h
diff --git a/plugins/AutoShutdown/cpuusage.cpp b/plugins/AutoShutdown/src/cpuusage.cpp
index d99be4a6fe..d99be4a6fe 100644
--- a/plugins/AutoShutdown/cpuusage.cpp
+++ b/plugins/AutoShutdown/src/cpuusage.cpp
diff --git a/plugins/AutoShutdown/cpuusage.h b/plugins/AutoShutdown/src/cpuusage.h
index 681a2c8213..681a2c8213 100644
--- a/plugins/AutoShutdown/cpuusage.h
+++ b/plugins/AutoShutdown/src/cpuusage.h
diff --git a/plugins/AutoShutdown/frame.cpp b/plugins/AutoShutdown/src/frame.cpp
index 425edb3831..425edb3831 100644
--- a/plugins/AutoShutdown/frame.cpp
+++ b/plugins/AutoShutdown/src/frame.cpp
diff --git a/plugins/AutoShutdown/frame.h b/plugins/AutoShutdown/src/frame.h
index 1b0bffdafd..1b0bffdafd 100644
--- a/plugins/AutoShutdown/frame.h
+++ b/plugins/AutoShutdown/src/frame.h
diff --git a/plugins/AutoShutdown/main.cpp b/plugins/AutoShutdown/src/main.cpp
index 31b4bbb7d7..31b4bbb7d7 100644
--- a/plugins/AutoShutdown/main.cpp
+++ b/plugins/AutoShutdown/src/main.cpp
diff --git a/plugins/AutoShutdown/options.cpp b/plugins/AutoShutdown/src/options.cpp
index c173a169a9..c173a169a9 100644
--- a/plugins/AutoShutdown/options.cpp
+++ b/plugins/AutoShutdown/src/options.cpp
diff --git a/plugins/AutoShutdown/options.h b/plugins/AutoShutdown/src/options.h
index 8b8e63f04f..8b8e63f04f 100644
--- a/plugins/AutoShutdown/options.h
+++ b/plugins/AutoShutdown/src/options.h
diff --git a/plugins/AutoShutdown/resource.h b/plugins/AutoShutdown/src/resource.h
index 4d8370f00a..4d8370f00a 100644
--- a/plugins/AutoShutdown/resource.h
+++ b/plugins/AutoShutdown/src/resource.h
diff --git a/plugins/AutoShutdown/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp
index 2871c65e33..2871c65e33 100644
--- a/plugins/AutoShutdown/settingsdlg.cpp
+++ b/plugins/AutoShutdown/src/settingsdlg.cpp
diff --git a/plugins/AutoShutdown/settingsdlg.h b/plugins/AutoShutdown/src/settingsdlg.h
index 2f7bf8ea84..2f7bf8ea84 100644
--- a/plugins/AutoShutdown/settingsdlg.h
+++ b/plugins/AutoShutdown/src/settingsdlg.h
diff --git a/plugins/AutoShutdown/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp
index 57c12c65a2..57c12c65a2 100644
--- a/plugins/AutoShutdown/shutdownsvc.cpp
+++ b/plugins/AutoShutdown/src/shutdownsvc.cpp
diff --git a/plugins/AutoShutdown/shutdownsvc.h b/plugins/AutoShutdown/src/shutdownsvc.h
index 639d02a7fa..639d02a7fa 100644
--- a/plugins/AutoShutdown/shutdownsvc.h
+++ b/plugins/AutoShutdown/src/shutdownsvc.h
diff --git a/plugins/AutoShutdown/utils.cpp b/plugins/AutoShutdown/src/utils.cpp
index c0128f80d6..c0128f80d6 100644
--- a/plugins/AutoShutdown/utils.cpp
+++ b/plugins/AutoShutdown/src/utils.cpp
diff --git a/plugins/AutoShutdown/utils.h b/plugins/AutoShutdown/src/utils.h
index d70dd980d7..d70dd980d7 100644
--- a/plugins/AutoShutdown/utils.h
+++ b/plugins/AutoShutdown/src/utils.h
diff --git a/plugins/AutoShutdown/version.h b/plugins/AutoShutdown/src/version.h
index 70dd82fe01..70dd82fe01 100644
--- a/plugins/AutoShutdown/version.h
+++ b/plugins/AutoShutdown/src/version.h
diff --git a/plugins/AutoShutdown/watcher.cpp b/plugins/AutoShutdown/src/watcher.cpp
index 3121248cba..3121248cba 100644
--- a/plugins/AutoShutdown/watcher.cpp
+++ b/plugins/AutoShutdown/src/watcher.cpp
diff --git a/plugins/AutoShutdown/watcher.h b/plugins/AutoShutdown/src/watcher.h
index 962378b811..962378b811 100644
--- a/plugins/AutoShutdown/watcher.h
+++ b/plugins/AutoShutdown/src/watcher.h