diff --git a/OnTopReplica/FullscreenMode.cs b/OnTopReplica/FullscreenMode.cs
deleted file mode 100644
index a6163de..0000000
--- a/OnTopReplica/FullscreenMode.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OnTopReplica {
-
-    /// <summary>
-    /// Describes a fullscreen mode used by OnTopReplica.
-    /// </summary>
-    public enum FullscreenMode {
-        /// <summary>
-        /// Normal non-topmost fullscreen mode.
-        /// </summary>
-        Normal,
-        /// <summary>
-        /// Topmost fullscreen mode.
-        /// </summary>
-        AlwaysOnTop,
-        /// <summary>
-        /// Clickthrough overlay mode.
-        /// </summary>
-        ClickThrough
-    }
-
-}
diff --git a/OnTopReplica/CommonControls.cs b/OnTopReplica/Native/CommonControls.cs
similarity index 92%
rename from OnTopReplica/CommonControls.cs
rename to OnTopReplica/Native/CommonControls.cs
index fa2af71..bf2123c 100644
--- a/OnTopReplica/CommonControls.cs
+++ b/OnTopReplica/Native/CommonControls.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace OnTopReplica {
+namespace OnTopReplica.Native {
     public static class CommonControls {
 
         [DllImport("comctl32.dll", EntryPoint = "InitCommonControlsEx", CallingConvention = CallingConvention.StdCall)]
diff --git a/OnTopReplica/WindowsSevenMethods.cs b/OnTopReplica/Native/WindowsSevenMethods.cs
similarity index 90%
rename from OnTopReplica/WindowsSevenMethods.cs
rename to OnTopReplica/Native/WindowsSevenMethods.cs
index c84bbb5..587bf95 100644
--- a/OnTopReplica/WindowsSevenMethods.cs
+++ b/OnTopReplica/Native/WindowsSevenMethods.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace OnTopReplica {
+namespace OnTopReplica.Native {
     
     static class WindowsSevenMethods {
 
diff --git a/OnTopReplica/OnTopReplica.csproj b/OnTopReplica/OnTopReplica.csproj
index 91df4f8..495da4f 100644
--- a/OnTopReplica/OnTopReplica.csproj
+++ b/OnTopReplica/OnTopReplica.csproj
@@ -163,10 +163,9 @@
       <DependentUpon>GroupSwitchPanel.cs</DependentUpon>
     </Compile>
     <Compile Include="StoredRegionComparer.cs" />
-    <Compile Include="WindowsSevenMethods.cs" />
-    <None Include="CommonControls.cs" />
+    <Compile Include="Native\WindowsSevenMethods.cs" />
+    <None Include="Native\CommonControls.cs" />
     <Compile Include="EnumerationExtensions.cs" />
-    <Compile Include="FullscreenMode.cs" />
     <Compile Include="MessagePumpProcessors\HotKeyManager.cs" />
     <Compile Include="PlatformSupport.cs" />
     <Compile Include="Platforms\Other.cs" />
diff --git a/OnTopReplica/Platforms/WindowsSeven.cs b/OnTopReplica/Platforms/WindowsSeven.cs
index 945e813..a9e0a11 100644
--- a/OnTopReplica/Platforms/WindowsSeven.cs
+++ b/OnTopReplica/Platforms/WindowsSeven.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Windows.Forms;
+using OnTopReplica.Native;
 using VistaControls.Dwm;
-using System.Windows.Forms;
 
 namespace OnTopReplica.Platforms {
     class WindowsSeven : WindowsVista {
diff --git a/OnTopReplica/WindowListHelper.cs b/OnTopReplica/WindowListHelper.cs
index e61c757..88f7964 100644
--- a/OnTopReplica/WindowListHelper.cs
+++ b/OnTopReplica/WindowListHelper.cs
@@ -12,7 +12,7 @@ namespace OnTopReplica {
             public StoredRegion Region { get; set; }
         }
 
-		const int cMaxWindowTitleLength = 55;
+		const int MaxWindowTitleLength = 55;
 
 		public static void PopulateMenu(Form ownerForm, WindowManager windowManager, ToolStrip menu,
                                         WindowHandle currentHandle, EventHandler clickHandler) {
@@ -37,8 +37,8 @@ namespace OnTopReplica {
 				var tsi = new ToolStripMenuItem();
 				
                 //Window title
-                if (h.Title.Length > cMaxWindowTitleLength) {
-					tsi.Text = h.Title.Substring(0, cMaxWindowTitleLength) + "...";
+                if (h.Title.Length > MaxWindowTitleLength) {
+					tsi.Text = h.Title.Substring(0, MaxWindowTitleLength) + "...";
 					tsi.ToolTipText = h.Title;
 				}
 				else