diff --git a/Doxyfile b/Doxyfile
index 56d8ef6..90b1e8d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -790,6 +790,7 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = \
+	EventMonitor\res \
 	lib\EAPBase_UI\res \
 	lib\EapHost_UI\res \
 	lib\TLS_UI\res \
diff --git a/EventMonitor/EventMonitor.vcxproj b/EventMonitor/EventMonitor.vcxproj
index bbcef6e..47fd917 100644
--- a/EventMonitor/EventMonitor.vcxproj
+++ b/EventMonitor/EventMonitor.vcxproj
@@ -91,7 +91,7 @@
     <ClInclude Include="Frame.h" />
     <ClInclude Include="LogPanel.h" />
     <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="wxEventMonitor_UI.h" />
+    <ClInclude Include="res\wxEventMonitor_UI.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="App.cpp" />
@@ -104,7 +104,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="wxEventMonitor_UI.cpp" />
+    <ClCompile Include="res\wxEventMonitor_UI.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
@@ -120,7 +120,7 @@
   <ItemGroup>
     <None Include="locale\EventMonitor.pot" />
     <None Include="res\EventMonitor.ico" />
-    <None Include="wxEventMonitor_UI.fbp" />
+    <None Include="res\wxEventMonitor_UI.fbp" />
   </ItemGroup>
   <ItemGroup>
     <POCompile Include="locale\bg_BG.po" />
diff --git a/EventMonitor/EventMonitor.vcxproj.filters b/EventMonitor/EventMonitor.vcxproj.filters
index 31c876f..c7d73f9 100644
--- a/EventMonitor/EventMonitor.vcxproj.filters
+++ b/EventMonitor/EventMonitor.vcxproj.filters
@@ -30,7 +30,7 @@
     <ClInclude Include="App.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="wxEventMonitor_UI.h">
+    <ClInclude Include="res\wxEventMonitor_UI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Frame.h">
@@ -50,7 +50,7 @@
     <ClCompile Include="App.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="wxEventMonitor_UI.cpp">
+    <ClCompile Include="res\wxEventMonitor_UI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Frame.cpp">
@@ -64,7 +64,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="wxEventMonitor_UI.fbp">
+    <None Include="res\wxEventMonitor_UI.fbp">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="locale\EventMonitor.pot">
diff --git a/EventMonitor/Frame.h b/EventMonitor/Frame.h
index 9e45563..8838639 100644
--- a/EventMonitor/Frame.h
+++ b/EventMonitor/Frame.h
@@ -32,8 +32,6 @@ class wxPersistentEventMonitorFrame;
 
 #include "LogPanel.h"
 
-#include "wxEventMonitor_UI.h"
-
 #include <wx/frame.h>
 #include <wx/menu.h>
 #include <wx/statusbr.h>
diff --git a/EventMonitor/LogPanel.h b/EventMonitor/LogPanel.h
index 108223d..3bb1219 100644
--- a/EventMonitor/LogPanel.h
+++ b/EventMonitor/LogPanel.h
@@ -30,7 +30,7 @@ class wxPersistentEventMonitorLogPanel;
 
 #pragma once
 
-#include "wxEventMonitor_UI.h"
+#include "res/wxEventMonitor_UI.h"
 #include <wx/persist/window.h>
 
 
diff --git a/EventMonitor/wxEventMonitor_UI.cpp b/EventMonitor/res/wxEventMonitor_UI.cpp
similarity index 95%
rename from EventMonitor/wxEventMonitor_UI.cpp
rename to EventMonitor/res/wxEventMonitor_UI.cpp
index a7b2248..99a35d8 100644
--- a/EventMonitor/wxEventMonitor_UI.cpp
+++ b/EventMonitor/res/wxEventMonitor_UI.cpp
@@ -7,7 +7,7 @@
 
 #include "StdAfx.h"
 
-#include "ETWLog.h"
+#include "../ETWLog.h"
 
 #include "wxEventMonitor_UI.h"
 
diff --git a/EventMonitor/wxEventMonitor_UI.fbp b/EventMonitor/res/wxEventMonitor_UI.fbp
similarity index 98%
rename from EventMonitor/wxEventMonitor_UI.fbp
rename to EventMonitor/res/wxEventMonitor_UI.fbp
index f48cab7..1dc6762 100644
--- a/EventMonitor/wxEventMonitor_UI.fbp
+++ b/EventMonitor/res/wxEventMonitor_UI.fbp
@@ -133,7 +133,7 @@
                         <property name="show">1</property>
                         <property name="size"></property>
                         <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL</property>
-                        <property name="subclass">wxETWListCtrl; ETWLog.h</property>
+                        <property name="subclass">wxETWListCtrl; ../ETWLog.h</property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="validator_data_type"></property>
diff --git a/EventMonitor/wxEventMonitor_UI.h b/EventMonitor/res/wxEventMonitor_UI.h
similarity index 100%
rename from EventMonitor/wxEventMonitor_UI.h
rename to EventMonitor/res/wxEventMonitor_UI.h