diff --git a/JiraTimeBotForm/JiraTimeBotForm.csproj b/JiraTimeBotForm/JiraTimeBotForm.csproj
index 974bb82..60e1b01 100644
--- a/JiraTimeBotForm/JiraTimeBotForm.csproj
+++ b/JiraTimeBotForm/JiraTimeBotForm.csproj
@@ -81,7 +81,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DI\ContainerBuilder.cs" />
-    <Compile Include="Extensions\Extensions.cs" />
     <Compile Include="JiraIntegration\IJiraDescriptionSource.cs" />
     <Compile Include="JiraIntegration\JiraDescriptionSource.cs" />
     <Compile Include="Job.cs" />
@@ -109,6 +108,8 @@
     <Compile Include="TaskTime\ITaskTimeDiscoverer.cs" />
     <Compile Include="TaskTime\TaskTimeDiscoverer.cs" />
     <Compile Include="TaskTime\TaskTimeItem.cs" />
+    <Compile Include="UI\ITrayMenu.cs" />
+    <Compile Include="UI\RestoreFromTray.cs" />
     <Compile Include="UI\TrayMenu.cs" />
     <EmbeddedResource Include="UI\frmMain.resx">
       <DependentUpon>frmMain.cs</DependentUpon>
diff --git a/JiraTimeBotForm/UI/ITrayMenu.cs b/JiraTimeBotForm/UI/ITrayMenu.cs
new file mode 100644
index 0000000..34a0f87
--- /dev/null
+++ b/JiraTimeBotForm/UI/ITrayMenu.cs
@@ -0,0 +1,11 @@
+using System.Windows.Forms;
+
+namespace JiraTimeBotForm.UI
+{
+    public interface ITrayMenu
+    {
+        NotifyIcon Create(frmMain form);
+        void Show();
+        void Hide();
+    }
+}
\ No newline at end of file
diff --git a/JiraTimeBotForm/Extensions/Extensions.cs b/JiraTimeBotForm/UI/RestoreFromTray.cs
similarity index 85%
rename from JiraTimeBotForm/Extensions/Extensions.cs
rename to JiraTimeBotForm/UI/RestoreFromTray.cs
index 45f849b..51b2a30 100644
--- a/JiraTimeBotForm/Extensions/Extensions.cs
+++ b/JiraTimeBotForm/UI/RestoreFromTray.cs
@@ -2,10 +2,9 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.Extensions
+namespace JiraTimeBotForm.UI
 {
-    public static class Extensions
-    {
+    public static class RestoreFromTray {
         [DllImport( "user32.dll" )]
         private static extern int ShowWindow( IntPtr hWnd, uint Msg );
 
@@ -19,4 +18,4 @@ namespace JiraTimeBotForm.Extensions
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/JiraTimeBotForm/UI/TrayMenu.cs b/JiraTimeBotForm/UI/TrayMenu.cs
index 944f71a..c729779 100644
--- a/JiraTimeBotForm/UI/TrayMenu.cs
+++ b/JiraTimeBotForm/UI/TrayMenu.cs
@@ -48,14 +48,7 @@ namespace JiraTimeBotForm.UI
             form.Visible = true;
             form.Activate();
             form.BringToFront();
-            Extensions.Extensions.Restore(form);
+            RestoreFromTray.Restore(form);
         }
     }
-
-    public interface ITrayMenu
-    {
-        NotifyIcon Create(frmMain form);
-        void Show();
-        void Hide();
-    }
 }