diff --git a/src/AddIn/RegistryUtil.cs b/src/AddIn/RegistryUtil.cs
index 3ec6f6a..dabd74d 100644
--- a/src/AddIn/RegistryUtil.cs
+++ b/src/AddIn/RegistryUtil.cs
@@ -1,5 +1,5 @@
 using Microsoft.Win32;
-using RehauSku.Forms;
+using RehauSku.Interface;
 using System;
 using System.IO;
 using System.Windows.Forms;
diff --git a/src/Forms/Dialog.cs b/src/Interface/Dialog.cs
similarity index 98%
rename from src/Forms/Dialog.cs
rename to src/Interface/Dialog.cs
index cc1c29a..c888703 100644
--- a/src/Forms/Dialog.cs
+++ b/src/Interface/Dialog.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace RehauSku.Forms
+namespace RehauSku.Interface
 {
     static class Dialog
     {
diff --git a/src/Ribbon/RibbonController.cs b/src/Interface/RibbonController.cs
similarity index 98%
rename from src/Ribbon/RibbonController.cs
rename to src/Interface/RibbonController.cs
index 7a514bd..cd7058d 100644
--- a/src/Ribbon/RibbonController.cs
+++ b/src/Interface/RibbonController.cs
@@ -1,11 +1,10 @@
 using ExcelDna.Integration.CustomUI;
-using RehauSku.Forms;
 using RehauSku.PriceListTools;
 using System;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace RehauSku.Ribbon
+namespace RehauSku.Interface
 {
     [ComVisible(true)]
     public class RibbonController : ExcelRibbon
diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs
index da29e4d..e637fef 100644
--- a/src/PriceListTools/CombineTool.cs
+++ b/src/PriceListTools/CombineTool.cs
@@ -25,7 +25,7 @@ namespace RehauSku.PriceListTools
 
             FilterByAmount();
 
-            Forms.Dialog.SaveWorkbookAs();
+            Interface.Dialog.SaveWorkbookAs();
         }
     }
 }
diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs
index f37bfe2..d43b30d 100644
--- a/src/PriceListTools/ConvertTool.cs
+++ b/src/PriceListTools/ConvertTool.cs
@@ -1,4 +1,5 @@
-using System;
+using RehauSku.Interface;
+using System;
 
 namespace RehauSku.PriceListTools
 {
@@ -31,7 +32,7 @@ namespace RehauSku.PriceListTools
 
             FilterByAmount();
 
-            Forms.Dialog.SaveWorkbookAs();
+            Dialog.SaveWorkbookAs();
         }
     }
 }
\ No newline at end of file
diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs
index bfb3d8a..119a289 100644
--- a/src/PriceListTools/ExportTool.cs
+++ b/src/PriceListTools/ExportTool.cs
@@ -31,7 +31,7 @@ namespace RehauSku.PriceListTools
 
             FilterByAmount();
 
-            Forms.Dialog.SaveWorkbookAs();
+            Interface.Dialog.SaveWorkbookAs();
         }
 
         private void GetSelected()
diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs
index e196b3a..895740c 100644
--- a/src/PriceListTools/MergeTool.cs
+++ b/src/PriceListTools/MergeTool.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using RehauSku.Interface;
+using System.Collections.Generic;
 
 namespace RehauSku.PriceListTools
 {
@@ -16,7 +17,7 @@ namespace RehauSku.PriceListTools
 
             FilterByAmount();
 
-            Forms.Dialog.SaveWorkbookAs();
+            Dialog.SaveWorkbookAs();
         }
     }
 }
diff --git a/src/RehauSku.Assist.csproj b/src/RehauSku.Assist.csproj
index b2e14b7..f1a7725 100644
--- a/src/RehauSku.Assist.csproj
+++ b/src/RehauSku.Assist.csproj
@@ -115,7 +115,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Forms\Dialog.cs" />
+    <Compile Include="Interface\Dialog.cs" />
     <Compile Include="AddIn\RegistryUtil.cs" />
     <Compile Include="AddIn\MemoryCacheUtil.cs" />
     <Compile Include="Assistant\ParseUtil.cs" />
@@ -129,7 +129,7 @@
     <Compile Include="PriceListTools\PriceList.cs" />
     <Compile Include="PriceListTools\Source.cs" />
     <Compile Include="PriceListTools\Target.cs" />
-    <Compile Include="Ribbon\RibbonController.cs" />
+    <Compile Include="Interface\RibbonController.cs" />
     <Compile Include="Assistant\HttpClientUtil.cs" />
     <Compile Include="Assistant\StoreResponse.cs" />
     <Compile Include="PriceListTools\ExportTool.cs" />