diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index c36fca2b8..525c60228 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -1304,16 +1304,26 @@
       </e>
       <e p="DiscImageChef.Gui" t="IncludeRecursive">
         <e p="ConsoleHandler.cs" t="Include" />
+        <e p="Dialogs" t="Include">
+          <e p="dlgEncodings.xeto" t="Include" />
+          <e p="dlgEncodings.xeto.cs" t="Include" />
+          <e p="dlgPlugins.xeto" t="Include" />
+          <e p="dlgPlugins.xeto.cs" t="Include" />
+        </e>
         <e p="DiscImageChef.Gui.csproj" t="IncludeRecursive" />
+        <e p="Forms" t="Include">
+          <e p="frmConsole.xeto" t="Include" />
+          <e p="frmConsole.xeto.cs" t="Include" />
+          <e p="frmMain.xeto" t="Include" />
+          <e p="frmMain.xeto.cs" t="Include" />
+        </e>
+        <e p="Panels" t="Include">
+          <e p="pnlDeviceInfo.xeto" t="Include" />
+          <e p="pnlDeviceInfo.xeto.cs" t="Include" />
+          <e p="pnlScsiInfo.xeto" t="Include" />
+          <e p="pnlScsiInfo.xeto.cs" t="Include" />
+        </e>
         <e p="bin" t="ExcludeRecursive" />
-        <e p="dlgEncodings.xeto" t="Include" />
-        <e p="dlgEncodings.xeto.cs" t="Include" />
-        <e p="dlgPlugins.xeto" t="Include" />
-        <e p="dlgPlugins.xeto.cs" t="Include" />
-        <e p="frmConsole.xeto" t="Include" />
-        <e p="frmConsole.xeto.cs" t="Include" />
-        <e p="frmMain.xeto" t="Include" />
-        <e p="frmMain.xeto.cs" t="Include" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="net461" t="Include">
@@ -1324,10 +1334,6 @@
             </e>
           </e>
         </e>
-        <e p="pnlDeviceInfo.xeto" t="Include" />
-        <e p="pnlDeviceInfo.xeto.cs" t="Include" />
-        <e p="pnlScsiInfo.xeto" t="Include" />
-        <e p="pnlScsiInfo.xeto.cs" t="Include" />
       </e>
       <e p="DiscImageChef.Gui.XamMac" t="IncludeRecursive">
         <e p="DiscImageChef.Gui.XamMac.csproj" t="IncludeRecursive" />
diff --git a/DiscImageChef.Gui.XamMac/Program.cs b/DiscImageChef.Gui.XamMac/Program.cs
index 4f33da0f0..628369428 100644
--- a/DiscImageChef.Gui.XamMac/Program.cs
+++ b/DiscImageChef.Gui.XamMac/Program.cs
@@ -30,6 +30,7 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 using AppKit;
+using DiscImageChef.Gui.Forms;
 using Eto.Forms;
 
 namespace DiscImageChef.Gui.XamMac
diff --git a/DiscImageChef.Gui/dlgEncodings.xeto b/DiscImageChef.Gui/Dialogs/dlgEncodings.xeto
similarity index 100%
rename from DiscImageChef.Gui/dlgEncodings.xeto
rename to DiscImageChef.Gui/Dialogs/dlgEncodings.xeto
diff --git a/DiscImageChef.Gui/dlgEncodings.xeto.cs b/DiscImageChef.Gui/Dialogs/dlgEncodings.xeto.cs
similarity index 99%
rename from DiscImageChef.Gui/dlgEncodings.xeto.cs
rename to DiscImageChef.Gui/Dialogs/dlgEncodings.xeto.cs
index 6d8387a5f..9070f31af 100644
--- a/DiscImageChef.Gui/dlgEncodings.xeto.cs
+++ b/DiscImageChef.Gui/Dialogs/dlgEncodings.xeto.cs
@@ -38,7 +38,7 @@ using System.Text;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 
-namespace DiscImageChef.Gui
+namespace DiscImageChef.Gui.Dialogs
 {
     public class dlgEncodings : Dialog
     {
diff --git a/DiscImageChef.Gui/dlgPlugins.xeto b/DiscImageChef.Gui/Dialogs/dlgPlugins.xeto
similarity index 100%
rename from DiscImageChef.Gui/dlgPlugins.xeto
rename to DiscImageChef.Gui/Dialogs/dlgPlugins.xeto
diff --git a/DiscImageChef.Gui/dlgPlugins.xeto.cs b/DiscImageChef.Gui/Dialogs/dlgPlugins.xeto.cs
similarity index 99%
rename from DiscImageChef.Gui/dlgPlugins.xeto.cs
rename to DiscImageChef.Gui/Dialogs/dlgPlugins.xeto.cs
index af6522c31..df91b1fa2 100644
--- a/DiscImageChef.Gui/dlgPlugins.xeto.cs
+++ b/DiscImageChef.Gui/Dialogs/dlgPlugins.xeto.cs
@@ -39,7 +39,7 @@ using DiscImageChef.Partitions;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 
-namespace DiscImageChef.Gui
+namespace DiscImageChef.Gui.Dialogs
 {
     public class dlgPlugins : Dialog
     {
diff --git a/DiscImageChef.Gui/frmConsole.xeto b/DiscImageChef.Gui/Forms/frmConsole.xeto
similarity index 100%
rename from DiscImageChef.Gui/frmConsole.xeto
rename to DiscImageChef.Gui/Forms/frmConsole.xeto
diff --git a/DiscImageChef.Gui/frmConsole.xeto.cs b/DiscImageChef.Gui/Forms/frmConsole.xeto.cs
similarity index 99%
rename from DiscImageChef.Gui/frmConsole.xeto.cs
rename to DiscImageChef.Gui/Forms/frmConsole.xeto.cs
index 351d7c5e2..1b806156e 100644
--- a/DiscImageChef.Gui/frmConsole.xeto.cs
+++ b/DiscImageChef.Gui/Forms/frmConsole.xeto.cs
@@ -29,6 +29,7 @@
 // ----------------------------------------------------------------------------
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
+
 using System;
 using System.ComponentModel;
 using System.IO;
@@ -41,7 +42,7 @@ using Eto.Serialization.Xaml;
 using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID;
 using Version = DiscImageChef.CommonTypes.Interop.Version;
 
-namespace DiscImageChef.Gui
+namespace DiscImageChef.Gui.Forms
 {
     public class frmConsole : Form
     {
diff --git a/DiscImageChef.Gui/frmMain.xeto b/DiscImageChef.Gui/Forms/frmMain.xeto
similarity index 100%
rename from DiscImageChef.Gui/frmMain.xeto
rename to DiscImageChef.Gui/Forms/frmMain.xeto
diff --git a/DiscImageChef.Gui/frmMain.xeto.cs b/DiscImageChef.Gui/Forms/frmMain.xeto.cs
similarity index 99%
rename from DiscImageChef.Gui/frmMain.xeto.cs
rename to DiscImageChef.Gui/Forms/frmMain.xeto.cs
index 997ad29a3..e81cd4b44 100644
--- a/DiscImageChef.Gui/frmMain.xeto.cs
+++ b/DiscImageChef.Gui/Forms/frmMain.xeto.cs
@@ -36,10 +36,12 @@ using System.Linq;
 using DiscImageChef.Console;
 using DiscImageChef.Core.Media.Info;
 using DiscImageChef.Devices;
+using DiscImageChef.Gui.Dialogs;
+using DiscImageChef.Gui.Panels;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 
-namespace DiscImageChef.Gui
+namespace DiscImageChef.Gui.Forms
 {
     public class frmMain : Form
     {
diff --git a/DiscImageChef.Gui/pnlDeviceInfo.xeto b/DiscImageChef.Gui/Panels/pnlDeviceInfo.xeto
similarity index 100%
rename from DiscImageChef.Gui/pnlDeviceInfo.xeto
rename to DiscImageChef.Gui/Panels/pnlDeviceInfo.xeto
diff --git a/DiscImageChef.Gui/pnlDeviceInfo.xeto.cs b/DiscImageChef.Gui/Panels/pnlDeviceInfo.xeto.cs
similarity index 99%
rename from DiscImageChef.Gui/pnlDeviceInfo.xeto.cs
rename to DiscImageChef.Gui/Panels/pnlDeviceInfo.xeto.cs
index 6d4e189c1..d33b73193 100644
--- a/DiscImageChef.Gui/pnlDeviceInfo.xeto.cs
+++ b/DiscImageChef.Gui/Panels/pnlDeviceInfo.xeto.cs
@@ -46,7 +46,7 @@ using Eto.Serialization.Xaml;
 using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo;
 using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple;
 
-namespace DiscImageChef.Gui
+namespace DiscImageChef.Gui.Panels
 {
     public class pnlDeviceInfo : Panel
     {
diff --git a/DiscImageChef.Gui/pnlScsiInfo.xeto b/DiscImageChef.Gui/Panels/pnlScsiInfo.xeto
similarity index 100%
rename from DiscImageChef.Gui/pnlScsiInfo.xeto
rename to DiscImageChef.Gui/Panels/pnlScsiInfo.xeto
diff --git a/DiscImageChef.Gui/pnlScsiInfo.xeto.cs b/DiscImageChef.Gui/Panels/pnlScsiInfo.xeto.cs
similarity index 99%
rename from DiscImageChef.Gui/pnlScsiInfo.xeto.cs
rename to DiscImageChef.Gui/Panels/pnlScsiInfo.xeto.cs
index 1881ed7ac..65591da4d 100644
--- a/DiscImageChef.Gui/pnlScsiInfo.xeto.cs
+++ b/DiscImageChef.Gui/Panels/pnlScsiInfo.xeto.cs
@@ -50,7 +50,7 @@ using DDS = DiscImageChef.Decoders.DVD.DDS;
 using DMI = DiscImageChef.Decoders.Xbox.DMI;
 using Spare = DiscImageChef.Decoders.DVD.Spare;
 
-namespace DiscImageChef.Gui
+namespace DiscImageChef.Gui.Panels
 {
     public class pnlScsiInfo : Panel
     {
diff --git a/DiscImageChef/Main.cs b/DiscImageChef/Main.cs
index 5f523b0e3..43d361dd4 100644
--- a/DiscImageChef/Main.cs
+++ b/DiscImageChef/Main.cs
@@ -36,6 +36,7 @@ using CommandLine;
 using DiscImageChef.Commands;
 using DiscImageChef.Console;
 using DiscImageChef.Gui;
+using DiscImageChef.Gui.Forms;
 using DiscImageChef.Settings;
 using Eto;
 using Eto.Forms;