diff --git a/VAR.Toolbox/UI/IToolForm.cs b/VAR.Toolbox/UI/IToolForm.cs
new file mode 100644
index 0000000..17d7977
--- /dev/null
+++ b/VAR.Toolbox/UI/IToolForm.cs
@@ -0,0 +1,7 @@
+namespace VAR.Toolbox.UI
+{
+    public interface IToolForm
+    {
+        string ToolName { get; }
+    }
+}
diff --git a/VAR.Toolbox/UI/IToolPanel.cs b/VAR.Toolbox/UI/IToolPanel.cs
new file mode 100644
index 0000000..a5b0fed
--- /dev/null
+++ b/VAR.Toolbox/UI/IToolPanel.cs
@@ -0,0 +1,6 @@
+namespace VAR.Toolbox.UI
+{
+    public interface IToolPanel
+    {
+    }
+}
diff --git a/VAR.Toolbox/UI/FrmCoder.Designer.cs b/VAR.Toolbox/UI/Tools/FrmCoder.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmCoder.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmCoder.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmCoder.cs b/VAR.Toolbox/UI/Tools/FrmCoder.cs
similarity index 93%
rename from VAR.Toolbox/UI/FrmCoder.cs
rename to VAR.Toolbox/UI/Tools/FrmCoder.cs
index 98e36c3..225d02d 100644
--- a/VAR.Toolbox/UI/FrmCoder.cs
+++ b/VAR.Toolbox/UI/Tools/FrmCoder.cs
@@ -4,8 +4,10 @@ using VAR.Toolbox.Code;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class FrmCoder : Form
+    public partial class FrmCoder : Form, IToolForm
     {
+        public string ToolName { get { return "Coder"; } }
+
         public FrmCoder()
         {
             InitializeComponent();
diff --git a/VAR.Toolbox/UI/FrmCover.cs b/VAR.Toolbox/UI/Tools/FrmCover.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmCover.cs
rename to VAR.Toolbox/UI/Tools/FrmCover.cs
diff --git a/VAR.Toolbox/UI/FrmIPScan.Designer.cs b/VAR.Toolbox/UI/Tools/FrmIPScan.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmIPScan.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmIPScan.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmIPScan.cs b/VAR.Toolbox/UI/Tools/FrmIPScan.cs
similarity index 96%
rename from VAR.Toolbox/UI/FrmIPScan.cs
rename to VAR.Toolbox/UI/Tools/FrmIPScan.cs
index 7dd1150..9b4258a 100644
--- a/VAR.Toolbox/UI/FrmIPScan.cs
+++ b/VAR.Toolbox/UI/Tools/FrmIPScan.cs
@@ -7,8 +7,10 @@ using System.Windows.Forms;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class FrmIPScan : Form
+    public partial class FrmIPScan : Form, IToolForm
     {
+        public string ToolName { get { return "IPScan"; } }
+
         public FrmIPScan()
         {
             InitializeComponent();
diff --git a/VAR.Toolbox/UI/FrmNetworkInfo.Designer.cs b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmNetworkInfo.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmNetworkInfo.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmNetworkInfo.cs b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs
similarity index 97%
rename from VAR.Toolbox/UI/FrmNetworkInfo.cs
rename to VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs
index 3ae7802..9c01256 100644
--- a/VAR.Toolbox/UI/FrmNetworkInfo.cs
+++ b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs
@@ -6,8 +6,10 @@ using System.Windows.Forms;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class FrmNetworkInfo : Form
+    public partial class FrmNetworkInfo : Form, IToolForm
     {
+        public string ToolName { get { return "NetworkInfo"; } }
+
         public FrmNetworkInfo()
         {
             InitializeComponent();
diff --git a/VAR.Toolbox/UI/FrmProxyCmd.Designer.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmd.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmProxyCmd.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmProxyCmd.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmProxyCmd.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs
similarity index 97%
rename from VAR.Toolbox/UI/FrmProxyCmd.cs
rename to VAR.Toolbox/UI/Tools/FrmProxyCmd.cs
index 0cb18ab..2d28171 100644
--- a/VAR.Toolbox/UI/FrmProxyCmd.cs
+++ b/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs
@@ -6,8 +6,10 @@ using VAR.Toolbox.Code;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class FrmProxyCmd : Form, IOutputHandler
+    public partial class FrmProxyCmd : Form, IOutputHandler, IToolForm
     {
+        public string ToolName { get { return "ProxyCmd"; } }
+
         #region Declarations
 
         private object _executionLock = new object();
diff --git a/VAR.Toolbox/UI/FrmProxyCmdConfig.Designer.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmProxyCmdConfig.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmProxyCmdConfig.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmProxyCmdConfig.cs
rename to VAR.Toolbox/UI/Tools/FrmProxyCmdConfig.cs
diff --git a/VAR.Toolbox/UI/FrmScreenshooter.Designer.cs b/VAR.Toolbox/UI/Tools/FrmScreenshooter.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmScreenshooter.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmScreenshooter.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmScreenshooter.cs b/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs
similarity index 92%
rename from VAR.Toolbox/UI/FrmScreenshooter.cs
rename to VAR.Toolbox/UI/Tools/FrmScreenshooter.cs
index 17dbe03..412f5bb 100644
--- a/VAR.Toolbox/UI/FrmScreenshooter.cs
+++ b/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs
@@ -6,8 +6,10 @@ using VAR.Toolbox.Code;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class FrmScreenshooter : Form
+    public partial class FrmScreenshooter : Form, IToolForm
     {
+        public string ToolName { get { return "Screenshooter"; } }
+
         private bool _repetitiveScreenshots = false;
         private Timer timTicker;
         private Bitmap bmpScreen = null;
diff --git a/VAR.Toolbox/UI/FrmTestWebService.Designer.cs b/VAR.Toolbox/UI/Tools/FrmTestWebService.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmTestWebService.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmTestWebService.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmTestWebService.cs b/VAR.Toolbox/UI/Tools/FrmTestWebService.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmTestWebService.cs
rename to VAR.Toolbox/UI/Tools/FrmTestWebService.cs
diff --git a/VAR.Toolbox/UI/FrmTunnelTCP.Designer.cs b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/FrmTunnelTCP.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmTunnelTCP.Designer.cs
diff --git a/VAR.Toolbox/UI/FrmTunnelTCP.cs b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs
similarity index 98%
rename from VAR.Toolbox/UI/FrmTunnelTCP.cs
rename to VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs
index ac9478e..b179053 100644
--- a/VAR.Toolbox/UI/FrmTunnelTCP.cs
+++ b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs
@@ -6,8 +6,10 @@ using System.Windows.Forms;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class FrmTunnelTCP : Form
+    public partial class FrmTunnelTCP : Form, IToolForm
     {
+        public string ToolName { get { return "TunnelTCP"; } }
+
         private bool _running = false;
 
         private class ConnectedClient
diff --git a/VAR.Toolbox/UI/FrmWebcam.Designer.cs b/VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs
similarity index 99%
rename from VAR.Toolbox/UI/FrmWebcam.Designer.cs
rename to VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs
index 9200086..b1c4416 100644
--- a/VAR.Toolbox/UI/FrmWebcam.Designer.cs
+++ b/VAR.Toolbox/UI/Tools/FrmWebcam.Designer.cs
@@ -1,4 +1,4 @@
-namespace VAR.Toolbox
+namespace VAR.Toolbox.UI
 {
     partial class FrmWebcam
     {
diff --git a/VAR.Toolbox/UI/FrmWebcam.cs b/VAR.Toolbox/UI/Tools/FrmWebcam.cs
similarity index 94%
rename from VAR.Toolbox/UI/FrmWebcam.cs
rename to VAR.Toolbox/UI/Tools/FrmWebcam.cs
index 050e657..b843be7 100644
--- a/VAR.Toolbox/UI/FrmWebcam.cs
+++ b/VAR.Toolbox/UI/Tools/FrmWebcam.cs
@@ -4,10 +4,12 @@ using System.Drawing;
 using System.Windows.Forms;
 using VAR.Toolbox.Code;
 
-namespace VAR.Toolbox
+namespace VAR.Toolbox.UI
 {
-    public partial class FrmWebcam : Form
+    public partial class FrmWebcam : Form, IToolForm
     {
+        public string ToolName { get { return "Webcam"; } }
+
         private Webcam webcam = null;
 
         public FrmWebcam()
diff --git a/VAR.Toolbox/UI/PnlCover.Designer.cs b/VAR.Toolbox/UI/Tools/PnlCover.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/PnlCover.Designer.cs
rename to VAR.Toolbox/UI/Tools/PnlCover.Designer.cs
diff --git a/VAR.Toolbox/UI/PnlCover.cs b/VAR.Toolbox/UI/Tools/PnlCover.cs
similarity index 96%
rename from VAR.Toolbox/UI/PnlCover.cs
rename to VAR.Toolbox/UI/Tools/PnlCover.cs
index 07c5cf4..8214f25 100644
--- a/VAR.Toolbox/UI/PnlCover.cs
+++ b/VAR.Toolbox/UI/Tools/PnlCover.cs
@@ -4,7 +4,7 @@ using VAR.Toolbox.Code.Windows;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class PnlCover : UserControl
+    public partial class PnlCover : UserControl, IToolPanel
     {
         public PnlCover()
         {
diff --git a/VAR.Toolbox/UI/PnlSuspension.Designer.cs b/VAR.Toolbox/UI/Tools/PnlSuspension.Designer.cs
similarity index 100%
rename from VAR.Toolbox/UI/PnlSuspension.Designer.cs
rename to VAR.Toolbox/UI/Tools/PnlSuspension.Designer.cs
diff --git a/VAR.Toolbox/UI/PnlSuspension.cs b/VAR.Toolbox/UI/Tools/PnlSuspension.cs
similarity index 98%
rename from VAR.Toolbox/UI/PnlSuspension.cs
rename to VAR.Toolbox/UI/Tools/PnlSuspension.cs
index 779a57e..2834fba 100644
--- a/VAR.Toolbox/UI/PnlSuspension.cs
+++ b/VAR.Toolbox/UI/Tools/PnlSuspension.cs
@@ -4,7 +4,7 @@ using VAR.Toolbox.Code.Windows;
 
 namespace VAR.Toolbox.UI
 {
-    public partial class PnlSuspension : UserControl
+    public partial class PnlSuspension : UserControl, IToolPanel
     {
         private Random rnd = new Random();
 
diff --git a/VAR.Toolbox/VAR.Toolbox.csproj b/VAR.Toolbox/VAR.Toolbox.csproj
index 041f7f4..c4bb427 100644
--- a/VAR.Toolbox/VAR.Toolbox.csproj
+++ b/VAR.Toolbox/VAR.Toolbox.csproj
@@ -128,55 +128,56 @@
     <Compile Include="Controls\CtrOutput.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="UI\FrmCoder.cs">
+    <Compile Include="UI\IToolPanel.cs" />
+    <Compile Include="UI\Tools\FrmCoder.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmCoder.Designer.cs">
+    <Compile Include="UI\Tools\FrmCoder.Designer.cs">
       <DependentUpon>FrmCoder.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmCover.cs">
+    <Compile Include="UI\Tools\FrmCover.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmIPScan.cs">
+    <Compile Include="UI\Tools\FrmIPScan.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmIPScan.Designer.cs">
+    <Compile Include="UI\Tools\FrmIPScan.Designer.cs">
       <DependentUpon>FrmIPScan.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmNetworkInfo.cs">
+    <Compile Include="UI\Tools\FrmNetworkInfo.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmNetworkInfo.Designer.cs">
+    <Compile Include="UI\Tools\FrmNetworkInfo.Designer.cs">
       <DependentUpon>FrmNetworkInfo.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmProxyCmd.cs">
+    <Compile Include="UI\Tools\FrmProxyCmd.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmProxyCmd.Designer.cs">
+    <Compile Include="UI\Tools\FrmProxyCmd.Designer.cs">
       <DependentUpon>FrmProxyCmd.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmProxyCmdConfig.cs">
+    <Compile Include="UI\Tools\FrmProxyCmdConfig.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmProxyCmdConfig.Designer.cs">
+    <Compile Include="UI\Tools\FrmProxyCmdConfig.Designer.cs">
       <DependentUpon>FrmProxyCmdConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmScreenshooter.cs">
+    <Compile Include="UI\Tools\FrmScreenshooter.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmScreenshooter.Designer.cs">
+    <Compile Include="UI\Tools\FrmScreenshooter.Designer.cs">
       <DependentUpon>FrmScreenshooter.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmTestWebService.cs">
+    <Compile Include="UI\Tools\FrmTestWebService.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmTestWebService.Designer.cs">
+    <Compile Include="UI\Tools\FrmTestWebService.Designer.cs">
       <DependentUpon>FrmTestWebService.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\FrmTunnelTCP.cs">
+    <Compile Include="UI\Tools\FrmTunnelTCP.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmTunnelTCP.Designer.cs">
+    <Compile Include="UI\Tools\FrmTunnelTCP.Designer.cs">
       <DependentUpon>FrmTunnelTCP.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\FrmToolbox.cs">
@@ -187,23 +188,24 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\FrmWebcam.cs">
+    <Compile Include="UI\Tools\FrmWebcam.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\FrmWebcam.Designer.cs">
+    <Compile Include="UI\Tools\FrmWebcam.Designer.cs">
       <DependentUpon>FrmWebcam.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\IFormWithIcon.cs" />
-    <Compile Include="UI\PnlCover.cs">
+    <Compile Include="UI\IToolForm.cs" />
+    <Compile Include="UI\Tools\PnlCover.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UI\PnlCover.Designer.cs">
+    <Compile Include="UI\Tools\PnlCover.Designer.cs">
       <DependentUpon>PnlCover.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\PnlSuspension.cs">
+    <Compile Include="UI\Tools\PnlSuspension.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UI\PnlSuspension.Designer.cs">
+    <Compile Include="UI\Tools\PnlSuspension.Designer.cs">
       <DependentUpon>PnlSuspension.cs</DependentUpon>
     </Compile>
   </ItemGroup>