Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -12,7 +12,7 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Forms;
 using Core.Common.Base.Plugin;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Plugins.Charting;
Index: Core/Common/src/Core.Common.Controls.Charting/IChartView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls.Charting/IChartView.cs	(.../IChartView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls.Charting/IChartView.cs	(.../IChartView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Controls.Charting
 {
Index: Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs	(.../ITreeView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs	(.../ITreeView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Controls.TreeView
 {
Index: Core/Common/src/Core.Common.Controls/Commands/ICommand.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Commands/ICommand.cs	(.../ICommand.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Commands/ICommand.cs	(.../ICommand.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,4 @@
-namespace Core.Common.Forms.Commands
+namespace Core.Common.Controls.Commands
 {
     /// <summary>
     /// Interface for defining the behavior of (Ribbon) buttons and/or menu items.
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -7,8 +7,8 @@
     <ProjectGuid>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Core.Common.Forms</RootNamespace>
-    <AssemblyName>Core.Common.Forms</AssemblyName>
+    <RootNamespace>Core.Common.Controls</RootNamespace>
+    <AssemblyName>Core.Common.Controls</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>false</SignAssembly>
Index: Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.Designer.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.Designer.cs	(.../DialogBase.Designer.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.Designer.cs	(.../DialogBase.Designer.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,4 @@
-namespace Core.Common.Forms.Dialogs
+namespace Core.Common.Controls.Dialogs
 {
     partial class DialogBase
     {
Index: Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs	(.../DialogBase.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs	(.../DialogBase.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace Core.Common.Forms.Dialogs
+namespace Core.Common.Controls.Dialogs
 {
     /// <summary>
     /// Base class for dialogs which should be derived in order to get a consistent look and feel.
Index: Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs	(.../ExceptionDialog.Designer.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs	(.../ExceptionDialog.Designer.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,4 @@
-namespace Core.Common.Forms.Dialogs
+namespace Core.Common.Controls.Dialogs
 {
     partial class ExceptionDialog
     {
Index: Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using Core.Common.Forms.Properties;
+using Core.Common.Controls.Properties;
 
-namespace Core.Common.Forms.Dialogs
+namespace Core.Common.Controls.Dialogs
 {
     /// <summary>
     /// Class for showing an exception dialog.
Index: Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Core.Common.Forms.Properties {
+namespace Core.Common.Controls.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Forms.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Controls.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
Index: Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using Core.Common.Utils;
 
-namespace Core.Common.Forms.Views
+namespace Core.Common.Controls.Views
 {
     /// <summary>
     /// Class for showing a html page based on an <see cref="Url"/>.
Index: Core/Common/src/Core.Common.Controls/Views/IView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 
-namespace Core.Common.Forms.Views
+namespace Core.Common.Controls.Views
 {
     /// <summary>
     /// Interface for graphical user interface views.
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -4,7 +4,8 @@
 using System.Linq;
 using System.Windows.Forms;
 using System.Windows.Forms.VisualStyles;
-using Core.Common.Forms.Views;
+using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Swf.Properties;
 using Core.Common.Utils.Validation;
 
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,8 @@
 using System.Diagnostics;
 using System.Windows.Forms;
 using Core.Common.Base.IO;
-using Core.Common.Forms.Views;
+using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Utils.Validation;
 
 namespace Core.Common.Gui.Swf.Validation
Index: Core/Common/src/Core.Common.Gui/ActiveViewChangeEventArgs.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/ActiveViewChangeEventArgs.cs	(.../ActiveViewChangeEventArgs.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/ActiveViewChangeEventArgs.cs	(.../ActiveViewChangeEventArgs.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,5 @@
 using Core.Common.Controls.TreeView;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/IPropertyGrid.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/IPropertyGrid.cs	(.../IPropertyGrid.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/IPropertyGrid.cs	(.../IPropertyGrid.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,5 @@
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Fluent;
 
 namespace Core.Common.Gui.Forms
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(.../IMessageWindow.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(.../IMessageWindow.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using log4net.Core;
 
 namespace Core.Common.Gui.Forms.MessageWindow
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.cs	(.../MessageWindowDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.cs	(.../MessageWindowDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,5 @@
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms.MessageWindow
Index: Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs	(.../OptionsDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs	(.../OptionsDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 using Core.Common.Gui.Theme;
 using Core.Common.Utils.Reflection;
Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs	(.../ActivityProgressDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs	(.../ActivityProgressDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Core.Common.Base.Service;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Appenders;
 using Core.Common.Gui.Properties;
 
Index: Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs	(.../SelectItemDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs	(.../SelectItemDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms
Index: Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs	(.../SelectViewDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs	(.../SelectViewDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs	(.../AvalonDockDockingManager.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs	(.../AvalonDockDockingManager.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -11,7 +11,7 @@
 using System.Windows.Forms.Integration;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
 using Xceed.Wpf.AvalonDock;
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/DockTabClosingEventArgs.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/DockTabClosingEventArgs.cs	(.../DockTabClosingEventArgs.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/DockTabClosingEventArgs.cs	(.../DockTabClosingEventArgs.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/IDockingManager.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/IDockingManager.cs	(.../IDockingManager.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/IDockingManager.cs	(.../IDockingManager.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -3,7 +3,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -4,7 +4,7 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Events;
 
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionContextMenuController.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionContextMenuController.cs	(.../ViewSelectionContextMenuController.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionContextMenuController.cs	(.../ViewSelectionContextMenuController.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionMouseController.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionMouseController.cs	(.../ViewSelectionMouseController.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionMouseController.cs	(.../ViewSelectionMouseController.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms.ViewManager
Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -11,7 +11,7 @@
 using Core.Common.Base.IO;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Forms.ViewManager;
 using Core.Common.Gui.Properties;
Index: Core/Common/src/Core.Common.Gui/GuiExportHandler.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -5,7 +5,7 @@
 using System.Windows.Forms;
 using Core.Common.Base.IO;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Properties;
 using log4net;
Index: Core/Common/src/Core.Common.Gui/IGuiCommand.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/IGuiCommand.cs	(.../IGuiCommand.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/IGuiCommand.cs	(.../IGuiCommand.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,4 @@
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Gui/IViewList.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/IViewList.cs	(.../IViewList.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/IViewList.cs	(.../IViewList.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Utils.Events;
 
 namespace Core.Common.Gui
Index: Core/Common/src/Core.Common.Gui/IViewResolver.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/IViewResolver.cs	(.../IViewResolver.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/IViewResolver.cs	(.../IViewResolver.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 
 namespace Core.Common.Gui
Index: Core/Common/src/Core.Common.Gui/Plugin/ViewInfo.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/Plugin/ViewInfo.cs	(.../ViewInfo.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/Plugin/ViewInfo.cs	(.../ViewInfo.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using System.Drawing;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Plugin
 {
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -12,7 +12,7 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls.TreeView;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.Forms.MessageWindow;
Index: Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs	(.../DialogBaseTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs	(.../DialogBaseTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 
Index: Core/Common/test/Core.Common.Gui.Test/GuiCommandHandlerTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Gui.Test/GuiCommandHandlerTest.cs	(.../GuiCommandHandlerTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCommandHandlerTest.cs	(.../GuiCommandHandlerTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
-using Core.Common.Forms.Views;
+
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms.PropertyGridView;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs	(.../AvalonDockDockingManagerTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/AvalonDockDockingManagerTest.cs	(.../AvalonDockDockingManagerTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,5 @@
-using Core.Common.Gui;
+using Core.Common.Controls;
+using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 using Core.Common.Test.TestObjects;
 using Core.Common.Utils.Reflection;
Index: Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,6 @@
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Test.Gui
 {
Index: Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 using Core.Common.Gui.Plugin;
Index: Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,6 @@
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Test.TestObjects
 {
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.cs	(.../SelectCoordinateSystemDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.cs	(.../SelectCoordinateSystemDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.SharpMap.UI.Properties;
 
Index: Core/Plugins/src/Core.Plugins.Charting/Forms/ChartLegendView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.Charting/Forms/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.Charting/Forms/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -4,7 +4,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Charting;
 using Core.Common.Controls.Charting.Series;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 
 namespace Core.Plugins.Charting.Forms
Index: Core/Plugins/src/Core.Plugins.Charting/Ribbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.Charting/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.Charting/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Windows;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Core.Plugins.Charting.Commands;
 
Index: Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Core.Common.Base.Data;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Plugin;
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Windows;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Fluent;
 
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs	(.../ChartDataView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs	(.../ChartDataView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,5 @@
 using System.Windows.Forms;
+using Core.Common.Controls.Views;
 using Core.Components.OxyPlot;
 using Core.Components.OxyPlot.Data;
 
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Forms/IChartView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.OxyPlot/Forms/IChartView.cs	(.../IChartView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Forms/IChartView.cs	(.../IChartView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,4 @@
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Plugins.OxyPlot.Forms
 {
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -3,7 +3,7 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls.TreeView;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Plugins.ProjectExplorer.NodePresenters;
 using TreeView = Core.Common.Controls.TreeView.TreeView;
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Core.Plugins.ProjectExplorer.Commands;
 
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs	(.../CanvasCommand.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs	(.../CanvasCommand.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,4 +1,4 @@
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Plugins.SharpMapGis.Gui.Forms;
 
 namespace Core.Plugins.SharpMapGis.Gui.Commands
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls.TreeView;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.SharpMap.Api.Layers;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.cs	(.../OpenUrlDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.cs	(.../OpenUrlDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Plugins.SharpMapGis.Gui.Properties;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Geometries;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/GisGuiService.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/GisGuiService.cs	(.../GisGuiService.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/GisGuiService.cs	(.../GisGuiService.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.SharpMap.Api;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Core.GIS.SharpMap.UI.Tools.Decorations;
 using Core.Plugins.SharpMapGis.Gui.Commands;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs	(.../ImageResolutionDialog.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs	(.../ImageResolutionDialog.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Forms.Dialogs;
+using Core.Common.Controls.Dialogs;
 using Core.Plugins.SharpMapGis.Properties;
 
 namespace Core.Plugins.SharpMapGis.Tools
Index: Core/Plugins/test/Core.Plugins.Charting.Test/TestObjects/TestDockingManager.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/test/Core.Plugins.Charting.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/test/Core.Plugins.Charting.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 
Index: Core/Plugins/test/Core.Plugins.Charting.Test/TestObjects/TestView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/test/Core.Plugins.Charting.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/test/Core.Plugins.Charting.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,5 +1,5 @@
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 
 namespace Core.Plugins.Charting.Test.TestObjects
 {
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs	(.../CommonToolsGuiPluginTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs	(.../CommonToolsGuiPluginTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Swf;
 using Core.Common.Utils;
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Components.OxyPlot.Data;
 using Core.Plugins.OxyPlot.Forms;
Index: Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Windows;
 
-using Core.Common.Forms.Commands;
+using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Fluent;
 using Ringtoets.Demo.Commands;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Forms.Views;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Integration.Data.Contribution;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
 using Core.Common.Controls;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Fluent;
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs
===================================================================
diff -u -r84af0a01ee252286393a573b291c65fb38963125 -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision 84af0a01ee252286393a573b291c65fb38963125)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Core.Common.Controls;
-using Core.Common.Forms.Commands;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Fluent;