29 files changed, 55 insertions, 55 deletions
diff --git a/plugins/Alarms/alarms_10.vcxproj b/plugins/Alarms/alarms_10.vcxproj
index 635bd9be35..5de3bdabaf 100644
--- a/plugins/Alarms/alarms_10.vcxproj
+++ b/plugins/Alarms/alarms_10.vcxproj
@@ -176,40 +176,40 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="alarm_win.cpp" />
-    <ClCompile Include="alarmlist.cpp" />
-    <ClCompile Include="alarms.cpp">
+    <ClCompile Include="src\alarm_win.cpp" />
+    <ClCompile Include="src\alarmlist.cpp" />
+    <ClCompile Include="src\alarms.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="frame.cpp" />
-    <ClCompile Include="icons.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="time_utils.cpp" />
-    <ClCompile Include="trigger.cpp" />
+    <ClCompile Include="src\frame.cpp" />
+    <ClCompile Include="src\icons.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\time_utils.cpp" />
+    <ClCompile Include="src\trigger.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="alarm_win.h" />
-    <ClInclude Include="alarmlist.h" />
-    <ClInclude Include="alarms.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="frame.h" />
-    <ClInclude Include="icons.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="time_utils.h" />
-    <ClInclude Include="trigger.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="src\alarm_win.h" />
+    <ClInclude Include="src\alarmlist.h" />
+    <ClInclude Include="src\alarms.h" />
+    <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\frame.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\time_utils.h" />
+    <ClInclude Include="src\trigger.h" />
+    <ClInclude Include="src\Version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="clock.ico" />
-    <None Include="green.ico" />
-    <None Include="iconttbdown.ico" />
-    <None Include="iconttbup.ico" />
-    <None Include="yellow.ico" />
+    <None Include="res\clock.ico" />
+    <None Include="res\green.ico" />
+    <None Include="res\iconttbdown.ico" />
+    <None Include="res\iconttbup.ico" />
+    <None Include="res\yellow.ico" />
   </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/Alarms/alarms_10.vcxproj.filters b/plugins/Alarms/alarms_10.vcxproj.filters
index 113441daf8..8f6b010b84 100644
--- a/plugins/Alarms/alarms_10.vcxproj.filters
+++ b/plugins/Alarms/alarms_10.vcxproj.filters
@@ -15,88 +15,88 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="alarm_win.cpp">
+    <ClCompile Include="src\alarm_win.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="alarmlist.cpp">
+    <ClCompile Include="src\alarmlist.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="alarms.cpp">
+    <ClCompile Include="src\alarms.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="frame.cpp">
+    <ClCompile Include="src\frame.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="icons.cpp">
+    <ClCompile Include="src\icons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="time_utils.cpp">
+    <ClCompile Include="src\time_utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="trigger.cpp">
+    <ClCompile Include="src\trigger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="alarm_win.h">
+    <ClInclude Include="src\alarm_win.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="alarmlist.h">
+    <ClInclude Include="src\alarmlist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="alarms.h">
+    <ClInclude Include="src\alarms.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common.h">
+    <ClInclude Include="src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="frame.h">
+    <ClInclude Include="src\frame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="time_utils.h">
+    <ClInclude Include="src\time_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="trigger.h">
+    <ClInclude Include="src\trigger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Version.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="clock.ico">
+    <None Include="res\clock.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="green.ico">
+    <None Include="res\green.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="iconttbdown.ico">
+    <None Include="res\iconttbdown.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="iconttbup.ico">
+    <None Include="res\iconttbup.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="yellow.ico">
+    <None Include="res\yellow.ico">
       <Filter>Resource Files</Filter>
     </None>
   </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>
diff --git a/plugins/Alarms/alarms-translation.txt b/plugins/Alarms/docs/alarms-translation.txt
index 8a292d3238..8a292d3238 100644
--- a/plugins/Alarms/alarms-translation.txt
+++ b/plugins/Alarms/docs/alarms-translation.txt
diff --git a/plugins/Alarms/Version.rc b/plugins/Alarms/res/Version.rc
index e637f0cb33..700fecb1fc 100644
--- a/plugins/Alarms/Version.rc
+++ b/plugins/Alarms/res/Version.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/Alarms/clock.ico b/plugins/Alarms/res/clock.ico
index 300ca7c052..300ca7c052 100644
--- a/plugins/Alarms/clock.ico
+++ b/plugins/Alarms/res/clock.ico
diff --git a/plugins/Alarms/green.ico b/plugins/Alarms/res/green.ico
index 82ce348616..82ce348616 100644
--- a/plugins/Alarms/green.ico
+++ b/plugins/Alarms/res/green.ico
diff --git a/plugins/Alarms/iconttbdown.ico b/plugins/Alarms/res/iconttbdown.ico
index bcee978747..bcee978747 100644
--- a/plugins/Alarms/iconttbdown.ico
+++ b/plugins/Alarms/res/iconttbdown.ico
diff --git a/plugins/Alarms/iconttbup.ico b/plugins/Alarms/res/iconttbup.ico
index 4269d0ca8a..4269d0ca8a 100644
--- a/plugins/Alarms/iconttbup.ico
+++ b/plugins/Alarms/res/iconttbup.ico
diff --git a/plugins/Alarms/resource.rc b/plugins/Alarms/res/resource.rc
index 4ebce37ec5..ae8dbfd0d5 100644
--- a/plugins/Alarms/resource.rc
+++ b/plugins/Alarms/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -177,7 +177,7 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\src\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/Alarms/yellow.ico b/plugins/Alarms/res/yellow.ico
index 94f62a201d..94f62a201d 100644
--- a/plugins/Alarms/yellow.ico
+++ b/plugins/Alarms/res/yellow.ico
diff --git a/plugins/Alarms/Version.h b/plugins/Alarms/src/Version.h
index a57e674b6d..a57e674b6d 100644
--- a/plugins/Alarms/Version.h
+++ b/plugins/Alarms/src/Version.h
diff --git a/plugins/Alarms/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp
index 11a29e42b5..11a29e42b5 100644
--- a/plugins/Alarms/alarm_win.cpp
+++ b/plugins/Alarms/src/alarm_win.cpp
diff --git a/plugins/Alarms/alarm_win.h b/plugins/Alarms/src/alarm_win.h
index 19576050c6..19576050c6 100644
--- a/plugins/Alarms/alarm_win.h
+++ b/plugins/Alarms/src/alarm_win.h
diff --git a/plugins/Alarms/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index d7b712dee7..d7b712dee7 100644
--- a/plugins/Alarms/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
diff --git a/plugins/Alarms/alarmlist.h b/plugins/Alarms/src/alarmlist.h
index af8e90b666..af8e90b666 100644
--- a/plugins/Alarms/alarmlist.h
+++ b/plugins/Alarms/src/alarmlist.h
diff --git a/plugins/Alarms/alarms.cpp b/plugins/Alarms/src/alarms.cpp
index c9305afce2..c9305afce2 100644
--- a/plugins/Alarms/alarms.cpp
+++ b/plugins/Alarms/src/alarms.cpp
diff --git a/plugins/Alarms/alarms.h b/plugins/Alarms/src/alarms.h
index 94b171d867..94b171d867 100644
--- a/plugins/Alarms/alarms.h
+++ b/plugins/Alarms/src/alarms.h
diff --git a/plugins/Alarms/common.h b/plugins/Alarms/src/common.h
index 36ac58ea3b..36ac58ea3b 100644
--- a/plugins/Alarms/common.h
+++ b/plugins/Alarms/src/common.h
diff --git a/plugins/Alarms/frame.cpp b/plugins/Alarms/src/frame.cpp
index 6ebb459026..6ebb459026 100644
--- a/plugins/Alarms/frame.cpp
+++ b/plugins/Alarms/src/frame.cpp
diff --git a/plugins/Alarms/frame.h b/plugins/Alarms/src/frame.h
index 9333c31b7d..9333c31b7d 100644
--- a/plugins/Alarms/frame.h
+++ b/plugins/Alarms/src/frame.h
diff --git a/plugins/Alarms/icons.cpp b/plugins/Alarms/src/icons.cpp
index 5a07541e27..5a07541e27 100644
--- a/plugins/Alarms/icons.cpp
+++ b/plugins/Alarms/src/icons.cpp
diff --git a/plugins/Alarms/icons.h b/plugins/Alarms/src/icons.h
index d47228f952..d47228f952 100644
--- a/plugins/Alarms/icons.h
+++ b/plugins/Alarms/src/icons.h
diff --git a/plugins/Alarms/options.cpp b/plugins/Alarms/src/options.cpp
index 96dbf664fd..96dbf664fd 100644
--- a/plugins/Alarms/options.cpp
+++ b/plugins/Alarms/src/options.cpp
diff --git a/plugins/Alarms/options.h b/plugins/Alarms/src/options.h
index 030ccb77ba..030ccb77ba 100644
--- a/plugins/Alarms/options.h
+++ b/plugins/Alarms/src/options.h
diff --git a/plugins/Alarms/resource.h b/plugins/Alarms/src/resource.h
index bff9b1a19c..bff9b1a19c 100644
--- a/plugins/Alarms/resource.h
+++ b/plugins/Alarms/src/resource.h
diff --git a/plugins/Alarms/time_utils.cpp b/plugins/Alarms/src/time_utils.cpp
index 69f45612f8..69f45612f8 100644
--- a/plugins/Alarms/time_utils.cpp
+++ b/plugins/Alarms/src/time_utils.cpp
diff --git a/plugins/Alarms/time_utils.h b/plugins/Alarms/src/time_utils.h
index 9bae092b63..9bae092b63 100644
--- a/plugins/Alarms/time_utils.h
+++ b/plugins/Alarms/src/time_utils.h
diff --git a/plugins/Alarms/trigger.cpp b/plugins/Alarms/src/trigger.cpp
index 532b98920c..532b98920c 100644
--- a/plugins/Alarms/trigger.cpp
+++ b/plugins/Alarms/src/trigger.cpp
diff --git a/plugins/Alarms/trigger.h b/plugins/Alarms/src/trigger.h
index 3b326e78a4..3b326e78a4 100644
--- a/plugins/Alarms/trigger.h
+++ b/plugins/Alarms/src/trigger.h