11 files changed, 22 insertions, 34 deletions
diff --git a/plugins/NewEventNotify/!changelog.txt b/plugins/NewEventNotify/docs/!changelog.txt
index 5c755ee40c..5c755ee40c 100644
--- a/plugins/NewEventNotify/!changelog.txt
+++ b/plugins/NewEventNotify/docs/!changelog.txt
diff --git a/plugins/NewEventNotify/neweventnotify-translation.txt b/plugins/NewEventNotify/docs/neweventnotify-translation.txt
index 3df8e8a907..3df8e8a907 100644
--- a/plugins/NewEventNotify/neweventnotify-translation.txt
+++ b/plugins/NewEventNotify/docs/neweventnotify-translation.txt
diff --git a/plugins/NewEventNotify/neweventnotify.vcxproj b/plugins/NewEventNotify/neweventnotify.vcxproj
index d2e776cd08..7f7b394793 100644
--- a/plugins/NewEventNotify/neweventnotify.vcxproj
+++ b/plugins/NewEventNotify/neweventnotify.vcxproj
@@ -78,7 +78,7 @@
       <MinimalRebuild>true</MinimalRebuild>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NEWEVENTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
@@ -101,7 +101,7 @@
       <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NEWEVENTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
@@ -125,7 +125,7 @@
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NEWEVENTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <ResourceCompile>
@@ -151,7 +151,7 @@
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;NEWEVENTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <ResourceCompile>
@@ -170,21 +170,17 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="menuitem.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="popup.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\menuitem.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\popup.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="neweventnotify.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\neweventnotify.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="res\popup.ico" />
-    <CustomBuild Include="res\popup_no.ico" />
-  </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/NewEventNotify/neweventnotify.vcxproj.filters b/plugins/NewEventNotify/neweventnotify.vcxproj.filters
index 8e60643dca..533d2bbf39 100644
--- a/plugins/NewEventNotify/neweventnotify.vcxproj.filters
+++ b/plugins/NewEventNotify/neweventnotify.vcxproj.filters
@@ -15,38 +15,30 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="menuitem.cpp">
+    <ClCompile Include="src\menuitem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="popup.cpp">
+    <ClCompile Include="src\popup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="neweventnotify.h">
+    <ClInclude Include="src\neweventnotify.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="res\popup.ico">
-      <Filter>Resource Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="res\popup_no.ico">
-      <Filter>Resource Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/plugins/NewEventNotify/resource.rc b/plugins/NewEventNotify/res/resource.rc
index 8e18c89ae5..c3b672b955 100644
--- a/plugins/NewEventNotify/resource.rc
+++ b/plugins/NewEventNotify/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -152,7 +152,7 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -191,8 +191,8 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ENABLED             ICON                    "res\\popup.ico"
-IDI_DISABLED            ICON                    "res\\popup_no.ico"
+IDI_ENABLED             ICON                    "popup.ico"
+IDI_DISABLED            ICON                    "popup_no.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/NewEventNotify/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 850a01fa7a..850a01fa7a 100644
--- a/plugins/NewEventNotify/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
diff --git a/plugins/NewEventNotify/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp
index 6831c204a1..6831c204a1 100644
--- a/plugins/NewEventNotify/menuitem.cpp
+++ b/plugins/NewEventNotify/src/menuitem.cpp
diff --git a/plugins/NewEventNotify/neweventnotify.h b/plugins/NewEventNotify/src/neweventnotify.h
index 3818e410e9..3818e410e9 100644
--- a/plugins/NewEventNotify/neweventnotify.h
+++ b/plugins/NewEventNotify/src/neweventnotify.h
diff --git a/plugins/NewEventNotify/options.cpp b/plugins/NewEventNotify/src/options.cpp
index 2e22a9f5cd..2e22a9f5cd 100644
--- a/plugins/NewEventNotify/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
diff --git a/plugins/NewEventNotify/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 355ef6cc86..355ef6cc86 100644
--- a/plugins/NewEventNotify/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
diff --git a/plugins/NewEventNotify/resource.h b/plugins/NewEventNotify/src/resource.h
index 1146a3bfab..1146a3bfab 100644
--- a/plugins/NewEventNotify/resource.h
+++ b/plugins/NewEventNotify/src/resource.h