Index: Application/Application.Ringtoets/Uml/DelftTools.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Application/Application.Ringtoets/Uml/DelftTools.cd	(.../DelftTools.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Uml/DelftTools.cd	(.../DelftTools.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Core.Project">
+  <Class Name="Core.Common.Core.Project">
     <Position X="8.25" Y="1.25" Width="2" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
@@ -9,7 +9,7 @@
     <TypeIdentifier />
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="DelftTools.Shell.Core.IApplication">
+  <Interface Name="Core.Common.Core.IApplication">
     <Position X="5" Y="0.75" Width="2.25" />
     <TypeIdentifier />
     <ShowAsAssociation>
@@ -19,30 +19,30 @@
       <Property Name="DataItemService" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IPlugin">
+  <Interface Name="Core.Common.Core.IPlugin">
     <Position X="8.25" Y="4.5" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepository">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepository">
     <Position X="16.25" Y="4" Width="2" />
     <Compartments>
       <Compartment Name="Properties" Collapsed="true" />
     </Compartments>
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Utils.Data.IObjectRepository&lt;T, ID&gt;">
+  <Interface Name="Core.Common.BaseDelftTools.Data.IObjectRepository&lt;T, ID&gt;">
     <Position X="16.25" Y="2" Width="2" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IDataItemService" Collapsed="true">
+  <Interface Name="Core.Common.Core.Services.IDataItemService" Collapsed="true">
     <Position X="2" Y="2.75" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IModelService" Collapsed="true">
+  <Interface Name="Core.Common.Core.Services.IModelService" Collapsed="true">
     <Position X="2" Y="2" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IProjectService" Collapsed="true">
+  <Interface Name="Core.Common.Core.Services.IProjectService" Collapsed="true">
     <Position X="2" Y="1.25" Width="1.5" />
     <TypeIdentifier />
   </Interface>
Index: Application/Application.Ringtoets/Uml/Gui.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Application/Application.Ringtoets/Uml/Gui.cd	(.../Gui.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Uml/Gui.cd	(.../Gui.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -44,27 +44,27 @@
     <TypeIdentifier />
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Interface Name="DelftTools.Shell.Gui.IGuiCommandHandler">
+  <Interface Name="Core.Common.Gui.IGuiCommandHandler">
     <Position X="3" Y="0.5" Width="3" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IApplication">
+  <Interface Name="Core.Common.Core.IApplication">
     <Position X="11" Y="0.5" Width="4" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IProjectService">
+  <Interface Name="Core.Common.Core.Services.IProjectService">
     <Position X="2.5" Y="6.5" Width="4" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IModelService">
+  <Interface Name="Core.Common.Core.Services.IModelService">
     <Position X="6.75" Y="12.75" Width="5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IDataItemService">
+  <Interface Name="Core.Common.Core.Services.IDataItemService">
     <Position X="6.75" Y="15" Width="4.75" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IGui">
+  <Interface Name="Core.Common.Gui.IGui">
     <Position X="16.25" Y="0.5" Width="3.75" />
     <TypeIdentifier />
     <ShowAsAssociation>
Index: Core/Common/src/Core.Common.Base/Uml/ProjectService.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Base/Uml/ProjectService.cd	(.../ProjectService.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Base/Uml/ProjectService.cd	(.../ProjectService.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -31,15 +31,15 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="DelftTools.Shell.Core.IApplication">
+  <Interface Name="Core.Common.Core.IApplication">
     <Position X="0.5" Y="0.75" Width="2.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepositoryFactory">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepositoryFactory">
     <Position X="6.25" Y="0.75" Width="2.25" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IProjectService">
+  <Interface Name="Core.Common.Core.Services.IProjectService">
     <Position X="4.75" Y="1.25" Width="1.5" />
     <TypeIdentifier />
   </Interface>
Index: Core/Common/src/Core.Common.BaseDelftTools/Uml/Core.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.BaseDelftTools/Uml/Core.cd	(.../Core.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.BaseDelftTools/Uml/Core.cd	(.../Core.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Core.Project">
+  <Class Name="Core.Common.Core.Project">
     <Position X="9.25" Y="16.5" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
-    <AssociationLine Name="RootFolder" Type="DelftTools.Shell.Core.Folder" FixedFromPoint="true">
+    <AssociationLine Name="RootFolder" Type="Core.Common.Core.Folder" FixedFromPoint="true">
       <Path>
         <Point X="11.75" Y="17.5" />
         <Point X="12.75" Y="17.5" />
@@ -20,12 +20,12 @@
     </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Folder">
+  <Class Name="Core.Common.Core.Folder">
     <Position X="12.75" Y="14.75" Width="3.25" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
-    <AssociationLine Name="Folders" Type="DelftTools.Shell.Core.Folder" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="Folders" Type="Core.Common.Core.Folder" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="15.278" Y="14.75" />
         <Point X="15.278" Y="14.168" />
@@ -47,48 +47,48 @@
     </ShowAsCollectionAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.ApplicationPlugin" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Core.ApplicationPlugin" BaseTypeListCollapsed="true">
     <Position X="11.5" Y="4.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>IAAAAAAAIBBgAAFAEAEAAAQAAQAAwBAAAAAQAAAAAAA=</HashCode>
       <FileName>ApplicationPlugin.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.ModelInfo">
+  <Class Name="Core.Common.Core.ModelInfo">
     <Position X="13.75" Y="4.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAABAAAAAAAAAAAAAAAAAQAAgAAABAAAAAAAAAACAA=</HashCode>
       <FileName>ModelInfo.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Core.DataItemInfo">
+  <Class Name="Core.Common.Core.DataItemInfo">
     <Position X="13.75" Y="6.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAABAAAAAAAAAAAAAAAAAQAAAAAABAAAAAQAAAAGAI=</HashCode>
       <FileName>DataItemInfo.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Core.DataItemInfo&lt;TValue&gt;">
+  <Class Name="Core.Common.Core.DataItemInfo&lt;TValue&gt;">
     <Position X="7" Y="22.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAABAAAAAAAAAAAAAAAAAQAAAAAABAABAAQAAAAGAI=</HashCode>
       <FileName>DataItemInfo.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="DelftTools.Shell.Core.Services.IProjectService">
+  <Interface Name="Core.Common.Core.Services.IProjectService">
     <Position X="5" Y="12" Width="2.5" />
-    <AssociationLine Name="ProjectRepository" Type="DelftTools.Shell.Core.Dao.IProjectRepository">
+    <AssociationLine Name="ProjectRepository" Type="Core.Common.Core.Dao.IProjectRepository">
       <MemberNameLabel ManuallyPlaced="true">
         <Position X="0.146" Y="0.095" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="ProjectFileBasedItemRepository" Type="DelftTools.Shell.Core.Dao.IProjectFileBasedItemRepository">
+    <AssociationLine Name="ProjectFileBasedItemRepository" Type="Core.Common.Core.Dao.IProjectFileBasedItemRepository">
       <MemberNameLabel ManuallyPlaced="true">
         <Position X="-1.98" Y="0.198" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="ProjectRepositoryFactory" Type="DelftTools.Shell.Core.Dao.IProjectRepositoryFactory">
+    <AssociationLine Name="ProjectRepositoryFactory" Type="Core.Common.Core.Dao.IProjectRepositoryFactory">
       <MemberNameLabel ManuallyPlaced="true">
         <Position X="-1.572" Y="0.154" />
       </MemberNameLabel>
@@ -103,53 +103,53 @@
       <Property Name="ProjectRepositoryFactory" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IModelService">
+  <Interface Name="Core.Common.Core.Services.IModelService">
     <Position X="5.25" Y="7.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AgAAAAAAAgAAAAAAAAACAAgAgGAAAAAIAABAAAAAAAA=</HashCode>
       <FileName>Services\IModelService.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Services.IDataItemService">
+  <Interface Name="Core.Common.Core.Services.IDataItemService">
     <Position X="5.25" Y="10" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAABAEAAAEAAAAAAgCAAAAAA=</HashCode>
       <FileName>Services\IDataItemService.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IApplication">
+  <Interface Name="Core.Common.Core.IApplication">
     <Position X="9.25" Y="8.75" Width="2.5" />
-    <AssociationLine Name="Project" Type="DelftTools.Shell.Core.Project">
+    <AssociationLine Name="Project" Type="Core.Common.Core.Project">
       <MemberNameLabel ManuallyPlaced="true">
         <Position X="0.192" Y="0.181" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="ActivityRunner" Type="DelftTools.Utils.Threading.IActivityRunner" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="ActivityRunner" Type="Core.Common.BaseDelftTools.Threading.IActivityRunner" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="10.062" Y="8.75" />
         <Point X="10.062" Y="3.615" />
         <Point X="7.25" Y="3.615" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ProjectService" Type="DelftTools.Shell.Core.Services.IProjectService" FixedFromPoint="true">
+    <AssociationLine Name="ProjectService" Type="Core.Common.Core.Services.IProjectService" FixedFromPoint="true">
       <Path>
         <Point X="9.25" Y="13.062" />
         <Point X="7.5" Y="13.062" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ModelService" Type="DelftTools.Shell.Core.Services.IModelService" FixedFromPoint="true">
+    <AssociationLine Name="ModelService" Type="Core.Common.Core.Services.IModelService" FixedFromPoint="true">
       <Path>
         <Point X="9.25" Y="9.25" />
         <Point X="7.5" Y="9.25" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="DataItemService" Type="DelftTools.Shell.Core.Services.IDataItemService" FixedToPoint="true">
+    <AssociationLine Name="DataItemService" Type="Core.Common.Core.Services.IDataItemService" FixedToPoint="true">
       <Path>
         <Point X="9.25" Y="11.125" />
         <Point X="7.5" Y="11.125" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ScriptRunner" Type="DelftTools.Shell.Core.IScriptRunner" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="ScriptRunner" Type="Core.Common.Core.IScriptRunner" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="9.625" Y="8.75" />
         <Point X="9.625" Y="6.375" />
@@ -172,42 +172,42 @@
       <Property Name="Plugins" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepositoryFactory">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepositoryFactory">
     <Position X="4.25" Y="19.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAQgAAAACAAgAAAAAAAAAAACA=</HashCode>
       <FileName>Dao\IProjectRepositoryFactory.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepository">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepository">
     <Position X="4" Y="16.25" Width="2" />
     <TypeIdentifier>
       <HashCode>IAAAAAgQAAAAIAIAAAAAAAAAAAAAAEAAAhAwAACAAAA=</HashCode>
       <FileName>Dao\IProjectRepository.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IPlugin">
+  <Interface Name="Core.Common.Core.IPlugin">
     <Position X="11" Y="1.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>IAAAAAAAIABgAAFAEAAAAAQAAAAAgBAAAAAAAAAAAAA=</HashCode>
       <FileName>IPlugin.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IDataAccessListener">
+  <Interface Name="Core.Common.Core.Dao.IDataAccessListener">
     <Position X="17.5" Y="6.75" Width="2" />
     <TypeIdentifier>
       <HashCode>hAAAIAAQAAAAAAAAAAAAAAAAAAAJgAAAAAAAAAAAAgA=</HashCode>
       <FileName>Dao\IDataAccessListener.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IFileExporter">
+  <Interface Name="Core.Common.Core.IFileExporter">
     <Position X="19.75" Y="2" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAEEAEAAAA=</HashCode>
       <FileName>IFileExporter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IFileImporter">
+  <Interface Name="Core.Common.Core.IFileImporter">
     <Position X="17.5" Y="2" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAEAAAAAAEAgAAAAAAAAAQAABACABAAAAAEAAAACAA=</HashCode>
@@ -217,23 +217,23 @@
       <Property Name="ProgressChanged" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IProjectImporter">
+  <Interface Name="Core.Common.Core.IProjectImporter">
     <Position X="17.75" Y="5.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IProjectImporter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IProjectItem">
+  <Interface Name="Core.Common.Core.IProjectItem">
     <Position X="18.25" Y="14.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IProjectItem.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IProjectItemExporter">
+  <Interface Name="Core.Common.Core.IProjectItemExporter">
     <Position X="19.75" Y="4.5" Width="1.75" />
-    <InheritanceLine Type="DelftTools.Shell.Core.IFileExporter" FixedFromPoint="true" FixedToPoint="true">
+    <InheritanceLine Type="Core.Common.Core.IFileExporter" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="20.562" Y="3.992" />
         <Point X="20.562" Y="4.5" />
@@ -244,56 +244,56 @@
       <FileName>IProjectItemExporter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IScriptRunner">
+  <Interface Name="Core.Common.Core.IScriptRunner">
     <Position X="5" Y="5.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAABAAAAAAAAEAAAAAAAIAAAAAAAAIAAAAA=</HashCode>
       <FileName>IScriptRunner.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Utils.Threading.IActivityRunner">
+  <Interface Name="Core.Common.BaseDelftTools.Threading.IActivityRunner">
     <Position X="5" Y="2.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AABACAAAQAAAQAQAAAAAQAAAAAAAAAABAAAAAIAAAAA=</HashCode>
       <FileName>Workflow\IActivityRunner.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.IDataItem">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.IDataItem">
     <Position X="19" Y="17" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AJYAAEiAAAAgAAAAEAEEQCAEAAAAAAAABAAgIAAEEAA=</HashCode>
       <FileName>Workflow\DataItems\IDataItem.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.IModel">
+  <Interface Name="Core.Common.Core.Workflow.IModel">
     <Position X="16.25" Y="20.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AEAAAACAAAAAAARIAAAAACxAACAAAgCgIQAgAAQAACA=</HashCode>
       <FileName>Workflow\IModel.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.IActivity">
+  <Interface Name="Core.Common.Core.Workflow.IActivity">
     <Position X="17" Y="17" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAEQAEAAQQAAAAAAAAAAFAABAAAAAAAAEAAAAA=</HashCode>
       <FileName>Workflow\IActivity.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectFileBasedItemRepository">
+  <Interface Name="Core.Common.Core.Dao.IProjectFileBasedItemRepository">
     <Position X="6.25" Y="16.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAIAAAAAAAQAAAAAACACAAAAAAAgAABAAAACAAIA=</HashCode>
       <FileName>Dao\IProjectFileBasedItemRepository.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IProjectItemOwned">
+  <Interface Name="Core.Common.Core.IProjectItemOwned">
     <Position X="9.75" Y="22.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IProjectItemOwned.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Delegate Name="DelftTools.Shell.Core.ImportProgressChangedDelegate">
+  <Delegate Name="Core.Common.Core.ImportProgressChangedDelegate">
     <Position X="13.75" Y="2.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAABAACAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.BaseDelftTools/Uml/Dao.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.BaseDelftTools/Uml/Dao.cd	(.../Dao.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.BaseDelftTools/Uml/Dao.cd	(.../Dao.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Core.Dao.ProjectFileBasedItemRepository" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Core.Dao.ProjectFileBasedItemRepository" BaseTypeListCollapsed="true">
     <Position X="8.25" Y="3.5" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
       <Compartment Name="Nested Types" Collapsed="false" />
     </Compartments>
     <NestedTypes>
-      <Enum Name="DelftTools.Shell.Core.Dao.ProjectFileBasedItemRepository.FileBasedItemAction">
+      <Enum Name="Core.Common.Core.Dao.ProjectFileBasedItemRepository.FileBasedItemAction">
         <TypeIdentifier>
           <NewMemberFileName>Dao\ProjectFileBasedItemRepository.cs</NewMemberFileName>
         </TypeIdentifier>
       </Enum>
-      <Class Name="DelftTools.Shell.Core.Dao.ProjectFileBasedItemRepository.FileBasedItemCommand">
+      <Class Name="Core.Common.Core.Dao.ProjectFileBasedItemRepository.FileBasedItemCommand">
         <Compartments>
           <Compartment Name="Fields" Collapsed="true" />
         </Compartments>
@@ -27,64 +27,64 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Dao.LegacyLoader" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Core.Dao.LegacyLoader" BaseTypeListCollapsed="true">
     <Position X="7.75" Y="0.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAICAACAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>
       <FileName>Dao\ILegacyLoader.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Interface Name="DelftTools.Shell.Core.Dao.IDataAccessListener">
+  <Interface Name="Core.Common.Core.Dao.IDataAccessListener">
     <Position X="1.5" Y="2.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>hAAAIAAQAAAAAAAAAAAAAAAAAAAJgAAAAAAAAAAAAgA=</HashCode>
       <FileName>Dao\IDataAccessListener.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IDataAccessListenersProvider">
+  <Interface Name="Core.Common.Core.Dao.IDataAccessListenersProvider">
     <Position X="1.5" Y="5.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Dao\IDataAccessListenersProvider.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.ILegacyLoader">
+  <Interface Name="Core.Common.Core.Dao.ILegacyLoader">
     <Position X="5" Y="0.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAICAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>
       <FileName>Dao\ILegacyLoader.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectFileBasedItemRepository">
+  <Interface Name="Core.Common.Core.Dao.IProjectFileBasedItemRepository">
     <Position X="5" Y="2.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAIAAAAAAAQAAAAAACACAAAAAAAgAABAAAACAAIA=</HashCode>
       <FileName>Dao\IProjectFileBasedItemRepository.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepository">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepository">
     <Position X="14.25" Y="6.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>IAAAAAgQAAAAIAIAAAAAAAAAAAAAAEAAAhAQAACAAAA=</HashCode>
       <FileName>Dao\IProjectRepository.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepositoryFactory">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepositoryFactory">
     <Position X="11.25" Y="6.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAQgAAAACAAgAAAAAAAAAAACA=</HashCode>
       <FileName>Dao\IProjectRepositoryFactory.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectRepositoryListener">
+  <Interface Name="Core.Common.Core.Dao.IProjectRepositoryListener">
     <Position X="1.5" Y="0.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Dao\IProjectRepositoryListener.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Dao.IProjectTemplateFileBuilder">
+  <Interface Name="Core.Common.Core.Dao.IProjectTemplateFileBuilder">
     <Position X="14.25" Y="3.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAEAAAAAAAABAAAAAAACAAAAAAAAAAAAAAQAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.BaseDelftTools/Uml/DataItems.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.BaseDelftTools/Uml/DataItems.cd	(.../DataItems.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.BaseDelftTools/Uml/DataItems.cd	(.../DataItems.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Core.Workflow.DataItems.DataItem">
+  <Class Name="Core.Common.Core.Workflow.DataItems.DataItem">
     <Position X="12.75" Y="1.25" Width="3" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -11,13 +11,13 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.DataItems.DataItemsEventedListAdapter&lt;T&gt;" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Core.Workflow.DataItems.DataItemsEventedListAdapter&lt;T&gt;" BaseTypeListCollapsed="true">
     <Position X="8.25" Y="5.5" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
     <NestedTypes>
-      <Class Name="DelftTools.Shell.Core.Workflow.DataItems.DataItemsEventedListAdapter&lt;T&gt;.ConvertedEnumerator&lt;TTarget, TSource&gt;" Collapsed="true">
+      <Class Name="Core.Common.Core.Workflow.DataItems.DataItemsEventedListAdapter&lt;T&gt;.ConvertedEnumerator&lt;TTarget, TSource&gt;" Collapsed="true">
         <TypeIdentifier>
           <NewMemberFileName>Workflow\DataItems\DataItemEventedListAdapter.cs</NewMemberFileName>
         </TypeIdentifier>
@@ -30,12 +30,12 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.DataItems.DataItemSet">
+  <Class Name="Core.Common.Core.Workflow.DataItems.DataItemSet">
     <Position X="11.75" Y="12.75" Width="2.25" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
-    <InheritanceLine Type="DelftTools.Shell.Core.Workflow.DataItems.DataItem" FixedFromPoint="true" FixedToPoint="true">
+    <InheritanceLine Type="Core.Common.Core.Workflow.DataItems.DataItem" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="13.625" Y="12.07" />
         <Point X="13.625" Y="12.75" />
@@ -47,7 +47,7 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.DataItems.LinkingUnlinkingEventArgs&lt;T&gt;">
+  <Class Name="Core.Common.Core.Workflow.DataItems.LinkingUnlinkingEventArgs&lt;T&gt;">
     <Position X="16.5" Y="4" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -57,7 +57,7 @@
       <FileName>Workflow\DataItems\ILinkable.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.DataItems.LinkedUnlinkedEventArgs&lt;T&gt;">
+  <Class Name="Core.Common.Core.Workflow.DataItems.LinkedUnlinkedEventArgs&lt;T&gt;">
     <Position X="16.5" Y="1.25" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -67,12 +67,12 @@
       <FileName>Workflow\DataItems\ILinkable.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.DataItems.ModelDataItem">
+  <Class Name="Core.Common.Core.Workflow.DataItems.ModelDataItem">
     <Position X="14.5" Y="12.75" Width="2.75" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
-    <InheritanceLine Type="DelftTools.Shell.Core.Workflow.DataItems.DataItem" FixedFromPoint="true" FixedToPoint="true">
+    <InheritanceLine Type="Core.Common.Core.Workflow.DataItems.DataItem" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="14.938" Y="12.07" />
         <Point X="14.938" Y="12.75" />
@@ -83,9 +83,9 @@
       <FileName>Workflow\DataItems\ModelDataItem.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.IDataItem">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.IDataItem">
     <Position X="3" Y="4.5" Width="1.5" />
-    <AssociationLine Name="Role" Type="DelftTools.Shell.Core.Workflow.DataItems.DataItemRole" FixedFromPoint="true">
+    <AssociationLine Name="Role" Type="Core.Common.Core.Workflow.DataItems.DataItemRole" FixedFromPoint="true">
       <Path>
         <Point X="3" Y="5.375" />
         <Point X="2" Y="5.375" />
@@ -100,30 +100,30 @@
       <Property Name="ValueConverter" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.IDataItemOwner">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.IDataItemOwner">
     <Position X="5" Y="7.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAEAIAAAACAA=</HashCode>
       <FileName>Workflow\DataItems\IDataItemOwner.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.IDataItemSet">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.IDataItemSet">
     <Position X="3" Y="10.25" Width="1.5" />
-    <InheritanceLine Type="DelftTools.Shell.Core.Workflow.DataItems.IDataItem" FixedToPoint="true">
+    <InheritanceLine Type="Core.Common.Core.Workflow.DataItems.IDataItem" FixedToPoint="true">
       <Path>
         <Point X="3.75" Y="9.236" />
         <Point X="3.75" Y="10.25" />
       </Path>
     </InheritanceLine>
-    <InheritanceLine Type="DelftTools.Shell.Core.Workflow.DataItems.IDataItemOwner" FixedToPoint="true">
+    <InheritanceLine Type="Core.Common.Core.Workflow.DataItems.IDataItemOwner" FixedToPoint="true">
       <Path>
         <Point X="5.75" Y="9.553" />
         <Point X="5.75" Y="9.875" />
         <Point X="4.062" Y="9.875" />
         <Point X="4.062" Y="10.25" />
       </Path>
     </InheritanceLine>
-    <AssociationLine Name="DataItems" Type="DelftTools.Shell.Core.Workflow.DataItems.IDataItem" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="DataItems" Type="Core.Common.Core.Workflow.DataItems.IDataItem" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="3" Y="10.938" />
         <Point X="2.198" Y="10.938" />
@@ -142,7 +142,7 @@
       <Property Name="DataItems" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.IDataItemsEventedListAdapter">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.IDataItemsEventedListAdapter">
     <Position X="8.25" Y="3.75" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAgA=</HashCode>
@@ -152,21 +152,21 @@
       <Property Name="DataItems" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.ILinkable&lt;T&gt;">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.ILinkable&lt;T&gt;">
     <Position X="3" Y="1" Width="1.5" />
     <TypeIdentifier>
       <HashCode>ABAAAEAAAAAAEABCAAACAAAAAAAAAAAAAgAFAAAAAAA=</HashCode>
       <FileName>Workflow\DataItems\ILinkable.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.DataItems.IValueConverter">
+  <Interface Name="Core.Common.Core.Workflow.DataItems.IValueConverter">
     <Position X="5.75" Y="5.25" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAQAAAAIAAAAAAAQAAAACAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Workflow\DataItems\IValueConverter.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="DelftTools.Shell.Core.Workflow.DataItems.DataItemRole">
+  <Enum Name="Core.Common.Core.Workflow.DataItems.DataItemRole">
     <Position X="0.5" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>QAAAAAAAAAAAAAAAAAAIAAAAEAAAEAAAAAAAAAEAAAA=</HashCode>
Index: Core/Common/src/Core.Common.BaseDelftTools/Uml/Workflow.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.BaseDelftTools/Uml/Workflow.cd	(.../Workflow.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.BaseDelftTools/Uml/Workflow.cd	(.../Workflow.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Core.Workflow.Activity">
+  <Class Name="Core.Common.Core.Workflow.Activity">
     <Position X="8.5" Y="0.5" Width="1.75" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -12,7 +12,7 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.CompositeActivity">
+  <Class Name="Core.Common.Core.Workflow.CompositeActivity">
     <Position X="8.5" Y="4" Width="1.75" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -24,21 +24,21 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.ParallelActivity">
+  <Class Name="Core.Common.Core.Workflow.ParallelActivity">
     <Position X="7.75" Y="6.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAIAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Workflow\ParallelActivity.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Core.Workflow.SequentialActivity">
+  <Class Name="Core.Common.Core.Workflow.SequentialActivity">
     <Position X="9.75" Y="6.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAIAAAAAAAEAAAAAAAAAAAAEEAACAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Workflow\SequentialActivity.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="DelftTools.Shell.Core.Workflow.IActivity">
+  <Interface Name="Core.Common.Core.Workflow.IActivity">
     <Position X="2" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAEQAEAAQQAAAAAAAAAAFAABAAAAAAAAEAAAAA=</HashCode>
@@ -48,9 +48,9 @@
       <Property Name="Status" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.ICompositeActivity">
+  <Interface Name="Core.Common.Core.Workflow.ICompositeActivity">
     <Position X="0.5" Y="4.5" Width="1.75" />
-    <AssociationLine Name="Activities" Type="DelftTools.Shell.Core.Workflow.IActivity" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="Activities" Type="Core.Common.Core.Workflow.IActivity" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="0.5" Y="4.937" />
         <Point X="0.26" Y="4.937" />
@@ -66,21 +66,21 @@
       <Property Name="Activities" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.ITimeDependentModel">
+  <Interface Name="Core.Common.Core.Workflow.ITimeDependentModel">
     <Position X="2.75" Y="9.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAgAAIIAAAAAAAAAAAkAAAABA=</HashCode>
       <FileName>Workflow\ITimeDependentModel.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.Workflow.IModel">
+  <Interface Name="Core.Common.Core.Workflow.IModel">
     <Position X="2.75" Y="4.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AEAAAACAAAAAAARIAAAAACxAACAAAgCgIQAgAAQAACA=</HashCode>
       <FileName>Workflow\IModel.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="DelftTools.Shell.Core.Workflow.ActivityStatus">
+  <Enum Name="Core.Common.Core.Workflow.ActivityStatus">
     <Position X="4.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>ACBAEAAAQCEAAAAAAAQAAAAAAAEAABAAABAAQAEAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Chart.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Chart.cd	(.../Chart.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Chart.cd	(.../Chart.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartSeries">
     <Position X="6.5" Y="4.5" Width="2" />
-    <AssociationLine Name="Chart" Type="DelftTools.Controls.Swf.Charting.IChart" FixedFromPoint="true">
+    <AssociationLine Name="Chart" Type="Core.Common.Controls.Swf.Charting.IChart" FixedFromPoint="true">
       <Path>
         <Point X="6.5" Y="5.835" />
         <Point X="4.75" Y="5.835" />
@@ -16,9 +16,9 @@
       <Property Name="Chart" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChart">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChart">
     <Position X="3.25" Y="4.5" Width="1.5" />
-    <AssociationLine Name="Legend" Type="DelftTools.Controls.Swf.Charting.IChartLegend" FixedToPoint="true">
+    <AssociationLine Name="Legend" Type="Core.Common.Controls.Swf.Charting.IChartLegend" FixedToPoint="true">
       <Path>
         <Point X="3.25" Y="5.75" />
         <Point X="2.25" Y="5.75" />
@@ -35,31 +35,31 @@
       <Property Name="Legend" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartAxis">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartAxis">
     <Position X="3.5" Y="8.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>gAAAACCAEAAAAEIAAAAAAIAAAAAIIAAIAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartAxis.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartLegend">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartLegend">
     <Position X="0.75" Y="5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAACAAAEABAAAIAAAICAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartLegend.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartView">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartView">
     <Position X="3.25" Y="0.5" Width="1.5" />
-    <AssociationLine Name="Zoom" Type="DelftTools.Controls.Swf.Charting.IChartViewZoom" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="Zoom" Type="Core.Common.Controls.Swf.Charting.IChartViewZoom" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="3.25" Y="1.938" />
         <Point X="2.875" Y="1.938" />
         <Point X="2.875" Y="1.938" />
         <Point X="2" Y="1.938" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ChartCoordinateService" Type="DelftTools.Controls.Swf.Charting.IChartCoordinateService" ManuallyRouted="true" FixedToPoint="true">
+    <AssociationLine Name="ChartCoordinateService" Type="Core.Common.Controls.Swf.Charting.IChartCoordinateService" ManuallyRouted="true" FixedToPoint="true">
       <Path>
         <Point X="4.75" Y="1.875" />
         <Point X="6.75" Y="1.875" />
@@ -78,37 +78,37 @@
       <Property Name="ChartCoordinateService" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Series.IAreaChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Series.IAreaChartSeries">
     <Position X="6.75" Y="10.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AQAAAAIAAAAAAAAAAwAggQAgAACAIAAAIAQIAAIUAAA=</HashCode>
       <FileName>Charting\Series\IAreaChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Series.ILineChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Series.ILineChartSeries">
     <Position X="9" Y="10.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AIiAAAAAAAAAAQAAAwAggEAAAAAACAEQIAAIAAMUAAA=</HashCode>
       <FileName>Charting\Series\ILineChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Series.IPointChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Series.IPointChartSeries">
     <Position X="11.25" Y="10.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AQAAAAIAAAAAgAAAAAAAAAAAAAAAAAAABAAAAAAAAAA=</HashCode>
       <FileName>Charting\Series\IPointChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartCoordinateService">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartCoordinateService">
     <Position X="6.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAEAAAAAAAAAACAAAAAAGAAAAAAAAAAAAAAAIAAGAQ=</HashCode>
       <FileName>Charting\IChartCoordinateService.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewTool">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewTool">
     <Position X="10" Y="3" Width="1.5" />
-    <AssociationLine Name="ChartView" Type="DelftTools.Controls.Swf.Charting.IChartView" FixedFromPoint="true">
+    <AssociationLine Name="ChartView" Type="Core.Common.Controls.Swf.Charting.IChartView" FixedFromPoint="true">
       <Path>
         <Point X="10" Y="3.312" />
         <Point X="4.75" Y="3.312" />
@@ -122,14 +122,14 @@
       <Property Name="ChartView" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewZoom">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewZoom">
     <Position X="0.5" Y="1.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAABAAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewZoom.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewSeriesTool">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewSeriesTool">
     <Position X="10" Y="6.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/UML/ChartTools.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Charting/UML/ChartTools.cd	(.../ChartTools.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/UML/ChartTools.cd	(.../ChartTools.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.AddPointTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.AddPointTool" Collapsed="true">
     <Position X="15" Y="7" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AECAAERABQAgAAEIAAAACAAACBAAAABAIAAAAECCACA=</HashCode>
       <FileName>Charting\Tools\AddPointTool.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.ZoomUsingMouseWheelTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.ZoomUsingMouseWheelTool" Collapsed="true">
     <Position X="7.25" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\ZoomUsingMouseWheelTool.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.ChartViewSeriesToolBase" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.ChartViewSeriesToolBase" Collapsed="true">
     <Position X="13" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAEgAQAACAAAAIQAAACAAAAAABABAAAAIEAAQAAiAAE=</HashCode>
       <FileName>Charting\Tools\ChartViewSeriesToolBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.CursorLineTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.CursorLineTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="15.25" Y="5.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAgAAIAgAEUAMAABACABAgAAAACEAAgAAAAIACAAgA=</HashCode>
       <FileName>Charting\Tools\CursorLineTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.EditPointTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.EditPointTool" Collapsed="true">
     <Position X="13" Y="7" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEEAAAABECIAAAABCAAICAAYAhAEUBBAIAEQIQOCAiA=</HashCode>
       <FileName>Charting\Tools\EditPointTool.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.ExportChartAsImageChartTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.ExportChartAsImageChartTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="18" Y="12.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAIAAAADAAAAAAAAAAAAgAAAAAAAAAIA=</HashCode>
       <FileName>Charting\Tools\ExportChartAsImageChartTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.GeoApiHelper" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.GeoApiHelper" Collapsed="true">
     <Position X="1" Y="0.75" Width="1.5" />
     <NestedTypes>
-      <Class Name="DelftTools.Controls.Swf.Charting.Tools.GeoApiHelper.GeometryFactory" Collapsed="true">
+      <Class Name="Core.Common.Controls.Swf.Charting.Tools.GeoApiHelper.GeometryFactory" Collapsed="true">
         <TypeIdentifier>
           <NewMemberFileName>Charting\Tools\GeoApiHelper.cs</NewMemberFileName>
         </TypeIdentifier>
@@ -59,45 +59,45 @@
       <FileName>Charting\Tools\GeoApiHelper.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.HistoryTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.HistoryTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="5.5" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAogAAAAEAABAIAACACAAAgAADAAAAAgEAAAAAAAABA=</HashCode>
       <FileName>Charting\Tools\HistoryTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.MarkerTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.MarkerTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="9.25" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAQgAAAkAQAAAIAAEACAAgAAAEAAEAAgAgAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\MarkerTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.PointEventArgs" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.PointEventArgs" Collapsed="true">
     <Position X="1" Y="1.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAE=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.RectangleTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.RectangleTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="19.75" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>FBQiQCEQIUAgCIQMRAiAGAAEAAASBAAAAIAAAJBCAYo=</HashCode>
       <FileName>Charting\Tools\RectangleTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.SelectPoint" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.SelectPoint" Collapsed="true">
     <Position X="8.25" Y="7" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.SelectPointTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.SelectPointTool" Collapsed="true">
     <Position X="11" Y="7" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AACACBQAEQByiQsIBIAAiAAQAhCEQADABEAQQACCAgA=</HashCode>
@@ -108,15 +108,15 @@
     </ShowAsCollectionAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.SeriesBandTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.SeriesBandTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="17.5" Y="5.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAIAAAACAAAAQAABAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\Tools\SeriesBandTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.WaterLevelTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.WaterLevelTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="11" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>gAKAAgACAABwCIIABACACAYQAACAAAAAABAAAgAgAAE=</HashCode>
@@ -145,119 +145,119 @@
     <TypeIdentifier />
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.ISeriesBandTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.ISeriesBandTool" Collapsed="true">
     <Position X="9.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\Tools\IBandTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.IBandTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IBandTool" Collapsed="true">
     <Position X="0.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\IBandTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.ICursorLineTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.ICursorLineTool" Collapsed="true">
     <Position X="7.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAIAAAAUAEAAAAAABAAAAAAAEAAAAAAAIACAAAA=</HashCode>
       <FileName>Charting\Tools\ICursorLineTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.IHistoryTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IHistoryTool" Collapsed="true">
     <Position X="12" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAIAAAAAAAABAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\IHistoryTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.IMarkerTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IMarkerTool" Collapsed="true">
     <Position X="14" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAQAAAAAAQAAAAAAEAAAAAAAAEAAEAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\IMarkerTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.IRectangleTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IRectangleTool" Collapsed="true">
     <Position X="15.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>EAACAAAAAAAAAAQAAAAAGEAAAAAAAAAACAAAAAAAAIA=</HashCode>
       <FileName>Charting\Tools\IRectangleTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.ISelectPointTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.ISelectPointTool" Collapsed="true">
     <Position X="5.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAACAAEAQAAAAAAAAAAgAAAAgAAAABABAAAQAAAAgA=</HashCode>
       <FileName>Charting\Tools\ISelectPointTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Tools.IWaterLevelTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Tools.IWaterLevelTool" Collapsed="true">
     <Position X="0.75" Y="12.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAQAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\IWaterLevelTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewTool" Collapsed="true">
     <Position X="9.75" Y="8.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewSeriesTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewSeriesTool" Collapsed="true">
     <Position X="3" Y="10.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\IChartViewSeriesTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewContextMenuTool" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewContextMenuTool" Collapsed="true">
     <Position X="17.75" Y="10.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewContextMenuTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="DelftTools.Controls.Swf.Charting.Tools.NearestPointStyles" Collapsed="true">
+  <Enum Name="Core.Common.Controls.Swf.Charting.Tools.NearestPointStyles" Collapsed="true">
     <Position X="1" Y="6.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAggAgAAAAAAAAEAAAA=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
   </Enum>
-  <Delegate Name="DelftTools.Controls.Swf.Charting.Tools.SelectionChangedEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.SelectionChangedEventHandler" Collapsed="true">
     <Position X="1" Y="4" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAIQAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="DelftTools.Controls.Swf.Charting.Tools.RectangleToolDraggingEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolDraggingEventHandler" Collapsed="true">
     <Position X="1" Y="3.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\RectangleTool.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="DelftTools.Controls.Swf.Charting.Tools.RectangleToolResizingEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolResizingEventHandler" Collapsed="true">
     <Position X="1" Y="6" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\RectangleTool.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="DelftTools.Controls.Swf.Charting.Tools.RectangleToolResizedEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolResizedEventHandler" Collapsed="true">
     <Position X="1" Y="5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\RectangleTool.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="DelftTools.Controls.Swf.Charting.Tools.RectangleToolDraggedEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Controls.Swf.Charting.Tools.RectangleToolDraggedEventHandler" Collapsed="true">
     <Position X="1" Y="2.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd	(.../Charting.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/UML/Charting.cd	(.../Charting.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Chart" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Chart" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="17.75" Y="1" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAQAAAAAAAAAAAAAIAAQAAAAEAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\Chart.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.ChartView" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.ChartView" BaseTypeListCollapsed="true">
     <Position X="24.5" Y="3.25" Width="1.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -19,66 +19,66 @@
     </TypeIdentifier>
     <Lollipop Position="0.385" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.ColorBlend" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.ColorBlend" Collapsed="true">
     <Position X="21.25" Y="1" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAgIAgEAAAAggAAAAAAAAAgAAASAQIAAgBAgCAA=</HashCode>
       <FileName>Charting\ColorBlend.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.NotifyChartSeriesValueChangedArgs" Collapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.NotifyChartSeriesValueChangedArgs" Collapsed="true">
     <Position X="19.5" Y="2" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartSeriesValueProvider.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.TeeChartHelper" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.TeeChartHelper" Collapsed="true">
     <Position X="19.5" Y="3" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAgAAAAA=</HashCode>
       <FileName>Charting\TeeChartHelper.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tracker" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tracker" Collapsed="true">
     <Position X="17.75" Y="4" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAQAAAQEBgAAAAIgAAQAIAAEAAAAAAAEAAEABAAA=</HashCode>
       <FileName>Charting\Tracker.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.AreaSeries" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Series.AreaSeries" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="3.75" Y="9" Width="1.5" />
     <TypeIdentifier>
       <HashCode>CAAAQACIAAAAggAAAAAAAAIEAAAAAAAAAAACAAQgAAA=</HashCode>
       <FileName>Charting\Series\AreaSeries.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.LineSeries" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Series.LineSeries" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6" Y="9" Width="1.5" />
     <TypeIdentifier>
       <HashCode>CAAAQACIAAAAggAAAgAACAAEAAAIAAAAAAACAAQgAAA=</HashCode>
       <FileName>Charting\Series\LineSeries.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.LineSeriesProperties" Collapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Series.LineSeriesProperties" Collapsed="true">
     <Position X="17.75" Y="2" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAQAAAAAAAAAAAAAACEAAAAAAAAAAIAAAAAAAAAA=</HashCode>
       <FileName>Charting\Series\LineSeriesProperties.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.PointSeries" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Series.PointSeries" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="8.25" Y="9" Width="1.5" />
     <TypeIdentifier>
       <HashCode>CAAAQACIAAAAgAAAAAAAAAAEAAAAAAAAAAACAAQgAAA=</HashCode>
       <FileName>Charting\Series\PointSeries.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Series.TeeChartSeriesDecorator" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Series.TeeChartSeriesDecorator" BaseTypeListCollapsed="true">
     <Position X="14.25" Y="14.75" Width="2" />
     <AssociationLine Name="series" Type="Steema.TeeChart.Styles.CustomPoint" FixedFromPoint="true" FixedToPoint="true">
       <Path>
@@ -96,85 +96,85 @@
     </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.AddPointTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.AddPointTool" Collapsed="true">
     <Position X="4.25" Y="4.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEGgAERAAQAgAIEIAACACEAQCBAAAABAIAAAAECCAAA=</HashCode>
       <FileName>Charting\Tools\AddPointTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.CursorLineTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Tools.CursorLineTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="4" Y="3.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAgAAAAgCEQgAAAAAAABEgAAAACEIAhBAAAgACAAgA=</HashCode>
       <FileName>Charting\Tools\CursorLineTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.EditPointTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.EditPointTool" Collapsed="true">
     <Position X="8.75" Y="4.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEEgAAIAGRIAAIAACACICAAQABAEAABAIAAQQQOCAgE=</HashCode>
       <FileName>Charting\Tools\EditPointTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.HistoryTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.HistoryTool" Collapsed="true">
     <Position X="11" Y="4.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAoAAAAAEAAAAIAAAECAAAgAACAAAAAgAAAAAIAAABA=</HashCode>
       <FileName>Charting\Tools\HistoryTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.MarkerTool" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.MarkerTool" Collapsed="true">
     <Position X="6.5" Y="4.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>ARQwAAAEEQCAEIAAEACAAAAABEAAEAAhAgAAAAEAAAA=</HashCode>
       <FileName>Charting\Tools\MarkerTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.PointEventArgs" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.PointEventArgs" Collapsed="true">
     <Position X="21.25" Y="2" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAA=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.SelectorTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Tools.SelectorTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="14.5" Y="3.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=</HashCode>
       <FileName>Charting\Tools\SelectorTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Tools.SelectPointTool" Collapsed="true" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Tools.SelectPointTool" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="2.25" Y="4.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AACgABQAGABwiYoABICAAAAQAgCEQAAABEAQQACgAgA=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.SeriesChartTool" Collapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Tools.SeriesChartTool" Collapsed="true">
     <Position X="6.5" Y="3.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAgACCEAAAAgBAwBAAAAQAQAAAAAAAgBACAAICEAgE=</HashCode>
       <FileName>Charting\Tools\SeriesChartTool.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.TeeChartMouseEventArgs" Collapsed="true">
+  <Class Name="Core.Common.Gui.Swf.Controls.Charting.Tools.TeeChartMouseEventArgs" Collapsed="true">
     <Position X="21.25" Y="3" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAQAAAAAAQBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\SeriesChartTool.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Series.AreaSeries" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Series.AreaSeries" BaseTypeListCollapsed="true">
     <Position X="17.75" Y="16.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>CAQgQEKIACIEg0oAAwAgAAIEAAgAACAAAAAAgBQkAAI=</HashCode>
@@ -185,15 +185,15 @@
     </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Series.LineSeries" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Series.LineSeries" BaseTypeListCollapsed="true">
     <Position X="22" Y="16.75" Width="2" />
     <TypeIdentifier>
       <HashCode>CIIgQAAIAAAEg0AAAwAgCAAEAAAIACgAAAAIAAQkAAM=</HashCode>
       <FileName>Charting\Series\LineSeries.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Charting.Series.PointSeries" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Charting.Series.PointSeries" BaseTypeListCollapsed="true">
     <Position X="19.5" Y="16.75" Width="2" />
     <TypeIdentifier>
       <HashCode>CAIAQAAIAAAAgQAAAQAAAAAEAAAAACAAAAAAAAQgAAI=</HashCode>
@@ -229,77 +229,77 @@
     <Position X="18.5" Y="13.75" Width="1.5" />
     <TypeIdentifier />
   </Class>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.IChart" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.IChart" Collapsed="true">
     <Position X="16" Y="5.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
       <FileName>Charting\IChart.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartSeries">
     <Position X="7.5" Y="11.25" Width="2" />
     <TypeIdentifier>
       <HashCode>CAAAQCAAAAAAg0AAAAAAAAAEAAAAACAIAAAAAAQgAAI=</HashCode>
       <FileName>Charting\IChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartSeriesValueProvider" Collapsed="true">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartSeriesValueProvider" Collapsed="true">
     <Position X="17.75" Y="5.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAYAAAAAAAAQAEABAACAYAgAAAAAAAA=</HashCode>
       <FileName>Charting\IChartSeriesValueProvider.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.IChartTool" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.IChartTool" Collapsed="true">
     <Position X="5.25" Y="1" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.IChartView">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.IChartView">
     <Position X="26.25" Y="3.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAgEAAIAAAAAAAAAAAAAAAQCAAAAAgQAE=</HashCode>
       <FileName>Charting\IChartView.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.IAreaChartSeries" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.Series.IAreaChartSeries" Collapsed="true">
     <Position X="3.75" Y="7.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Series\IAreaChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.ILineChartSeries" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.Series.ILineChartSeries" Collapsed="true">
     <Position X="6" Y="7.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Series\ILineChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Series.IPointChartSeries" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.Series.IPointChartSeries" Collapsed="true">
     <Position X="8.25" Y="7.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Charting\Series\IPointChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.ICursorLineTool" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.Tools.ICursorLineTool" Collapsed="true">
     <Position X="4" Y="2.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAAAAiAAAQAAABAIAAAAAAKABBAAAAACAAgA=</HashCode>
       <FileName>Charting\Tools\ICursorLineTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Swf.Controls.Charting.ISeriesChartTool" Collapsed="true">
+  <Interface Name="Core.Common.Gui.Swf.Controls.Charting.ISeriesChartTool" Collapsed="true">
     <Position X="6.25" Y="2.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAEAAAAgBAgAAAAAQAAAAAAAAAAAAAAAIAEAAE=</HashCode>
       <FileName>Charting\ISeriesChartTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChart">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChart">
     <Position X="11.5" Y="11" Width="1.5" />
     <TypeIdentifier>
       <HashCode>BAAAIAAAAAAAQEAAAAAAACAAACAAABABAEAAEABBAAE=</HashCode>
@@ -309,7 +309,7 @@
       <Property Name="Series" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartView">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartView">
     <Position X="14.5" Y="9" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAIAAAAAgAAAMAAAAAAAAAAACAAAQCAAAAQgQIA=</HashCode>
@@ -322,63 +322,63 @@
       <Property Name="Tools" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Series.IAreaChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Series.IAreaChartSeries">
     <Position X="5.5" Y="15.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAQwAEKAACIEgEoAAwAgAAIAAAgAACAAAAAAgBBEAAA=</HashCode>
       <FileName>Charting\Series\IAreaChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Series.IPointChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Series.IPointChartSeries">
     <Position X="10" Y="15.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAIAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Charting\Series\IPointChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.Series.ILineChartSeries">
+  <Interface Name="Core.Common.Controls.Swf.Charting.Series.ILineChartSeries">
     <Position X="7.75" Y="15.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>CIIgAAAAAAAEAUCAgwAgAAAAAAAAAAAAAgAIAAEEAAE=</HashCode>
       <FileName>Charting\Series\ILineChartSeries.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartBrush">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartBrush">
     <Position X="3.25" Y="16.75" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAIBAAAgAAAAAA=</HashCode>
       <FileName>Charting\IChartBrush.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.Swf.Charting.IChartViewTool">
+  <Interface Name="Core.Common.Controls.Swf.Charting.IChartViewTool">
     <Position X="11.75" Y="8.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAIAAAACAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>Charting\IChartViewTool.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="DelftTools.Controls.Swf.Charting.Tools.NearestPointStyles" Collapsed="true">
+  <Enum Name="Core.Common.Controls.Swf.Charting.Tools.NearestPointStyles" Collapsed="true">
     <Position X="16" Y="6.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAggAgAAAAAAAAEAAAA=</HashCode>
       <FileName>Charting\Tools\SelectPointTool.cs</FileName>
     </TypeIdentifier>
   </Enum>
-  <Delegate Name="DelftTools.Shell.Gui.Swf.Controls.Charting.NotifyChartSeriesValueChanged" Collapsed="true">
+  <Delegate Name="Core.Common.Gui.Swf.Controls.Charting.NotifyChartSeriesValueChanged" Collapsed="true">
     <Position X="16" Y="7.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAgAAAAAAA=</HashCode>
       <FileName>Charting\IChartSeriesValueProvider.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.SelectionChangedEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Gui.Swf.Controls.Charting.Tools.SelectionChangedEventHandler" Collapsed="true">
     <Position X="17.75" Y="7.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAACAAAAAAAAAA=</HashCode>
       <FileName>Charting\Tools\PointEventArgs.cs</FileName>
     </TypeIdentifier>
   </Delegate>
-  <Delegate Name="DelftTools.Shell.Gui.Swf.Controls.Charting.Tools.SelectorSelectedEventHandler" Collapsed="true">
+  <Delegate Name="Core.Common.Gui.Swf.Controls.Charting.Tools.SelectorSelectedEventHandler" Collapsed="true">
     <Position X="19.5" Y="7.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Controls.Swf/FileSystemTreeView.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/FileSystemTreeView.cs	(.../FileSystemTreeView.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/FileSystemTreeView.cs	(.../FileSystemTreeView.cs)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -10,7 +10,7 @@
 namespace Core.Common.Controls.Swf
 {
     /// <summary>
-    /// TODO: migrate to DelftTools.Controls.Swf
+    /// TODO: migrate to Core.Common.Controls.Swf
     /// </summary>
     public partial class FileSystemTreeView : TreeView
     {
Index: Core/Common/src/Core.Common.Controls.Swf/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,6 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("DelftTools.Controls.Swf")]
-[assembly: AssemblyProduct("DelftTools.Controls.Swf")]
+[assembly: AssemblyTitle("Core.Common.Controls.Swf")]
+[assembly: AssemblyProduct("Core.Common.Controls.Swf")]
 [assembly: Guid("9af557fb-00b2-4bdb-b8bc-2c23da6125bc")]
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -206,7 +206,7 @@
                         at System.ComponentModel.Component.Dispose()
                         at System.Windows.Forms.Control.Dispose(Boolean disposing)
                         at System.Windows.Forms.ContainerControl.Dispose(Boolean disposing)
-                        at DelftTools.Controls.Swf.Table.TableView.Dispose(Boolean disposing) in TableView.Designer.cs: line 22
+                        at Core.Common.Controls.Swf.Table.TableView.Dispose(Boolean disposing) in TableView.Designer.cs: line 22
                  */
                 base.Dispose(disposing);
             }
Index: Core/Common/src/Core.Common.Controls.Swf/Uml/TableView.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Uml/TableView.cd	(.../TableView.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Uml/TableView.cd	(.../TableView.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Controls.Swf.Table.TableView" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Table.TableView" BaseTypeListCollapsed="true">
     <Position X="1.25" Y="7" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
     <NestedTypes>
-      <Enum Name="DelftTools.Controls.Swf.Table.TableView.ValidationExceptionMode" Collapsed="true">
+      <Enum Name="Core.Common.Controls.Swf.Table.TableView.ValidationExceptionMode" Collapsed="true">
         <TypeIdentifier>
           <NewMemberFileName>Table\TableView.cs</NewMemberFileName>
         </TypeIdentifier>
@@ -24,29 +24,29 @@
     </ShowAsCollectionAssociation>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewArgumentBasedPasteController">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewArgumentBasedPasteController">
     <Position X="0.75" Y="2" Width="3" />
     <TypeIdentifier>
       <HashCode>AAAAQIAAAAAAQAAKAAAAEMAEACAAMAAAAIAAAQAACAg=</HashCode>
       <FileName>Table\TableViewArgumentBasedPasteController.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewCellFormatterProvider" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewCellFormatterProvider" BaseTypeListCollapsed="true">
     <Position X="10.5" Y="3.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Table\TableViewCellFormatterProvider.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewCellStyle">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewCellStyle">
     <Position X="11.5" Y="8" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAQAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAABAAI=</HashCode>
       <FileName>Table\TableViewCellStyle.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewColumn" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewColumn" BaseTypeListCollapsed="true">
     <Position X="8" Y="5.75" Width="1.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
@@ -58,52 +58,52 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewColumnMenuItem">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewColumnMenuItem">
     <Position X="6.5" Y="11.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AIAABAAAAAAAEAAAABAAAAAAAAAAABAACAAQAAAAAgA=</HashCode>
       <FileName>Table\TableViewColumnMenuItem.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewComboBoxItem" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewComboBoxItem" BaseTypeListCollapsed="true">
     <Position X="13.75" Y="5.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAABAAIAAAAAAAMEAAAAQAAEAAAAAAAgANggogYQAAI=</HashCode>
       <FileName>Table\TableViewComboBoxItem.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewExceptionMessageController">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewExceptionMessageController">
     <Position X="10" Y="1.25" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Table\TableViewExceptionMessageController.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.TableViewPasteController" Collapsed="true">
+  <Class Name="Core.Common.Controls.Swf.Table.TableViewPasteController" Collapsed="true">
     <Position X="1" Y="0.75" Width="2" />
     <TypeIdentifier>
       <HashCode>BCAAQAAAAECAgAAMAiQACEACAAgABQAgBCAAIEACAog=</HashCode>
       <FileName>Table\TableViewPasteController.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.XtraGridRepositoryItemBuilder">
+  <Class Name="Core.Common.Controls.Swf.Table.XtraGridRepositoryItemBuilder">
     <Position X="4.25" Y="0.75" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAIAAQAEAAAAAAAAAAAAAABBgIEAAAAAAAACAIAAE=</HashCode>
       <FileName>Table\XtraGridRepositoryItemBuilder.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.Validation.RowValidationResult">
+  <Class Name="Core.Common.Controls.Swf.Table.Validation.RowValidationResult">
     <Position X="7.5" Y="1.25" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAEAAAAAAAAAAAACAAAAAAAAAAAAAABAAAAAA=</HashCode>
       <FileName>Table\Validation\RowValidationResult.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.Table.Validation.TableViewValidator">
+  <Class Name="Core.Common.Controls.Swf.Table.Validation.TableViewValidator">
     <Position X="5.25" Y="6.25" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAEAAAAgBAYAAAAAABAAnBAAGBAAAQAAACAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Controls.Swf/Uml/TreeView.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls.Swf/Uml/TreeView.cd	(.../TreeView.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Uml/TreeView.cd	(.../TreeView.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Controls.Swf.TreeViewControls.TreeView" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.TreeViewControls.TreeView" BaseTypeListCollapsed="true">
     <Position X="16" Y="1.75" Width="2" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
     <NestedTypes>
-      <Enum Name="DelftTools.Controls.Swf.TreeViewControls.TreeView.PlaceholderLocation" Collapsed="true">
+      <Enum Name="Core.Common.Controls.Swf.TreeViewControls.TreeView.PlaceholderLocation" Collapsed="true">
         <TypeIdentifier>
           <NewMemberFileName>TreeViewControls\TreeView.cs</NewMemberFileName>
         </TypeIdentifier>
@@ -27,7 +27,7 @@
     <TypeIdentifier />
     <Lollipop Position="0.2" Collapsed="true" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.TreeViewControls.TreeNodeList" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.TreeViewControls.TreeNodeList" BaseTypeListCollapsed="true">
     <Position X="13.25" Y="2.75" Width="1.5" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
@@ -46,9 +46,9 @@
     </ShowAsCollectionAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.TreeViewControls.TreeNode" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.TreeViewControls.TreeNode" BaseTypeListCollapsed="true">
     <Position X="10.75" Y="2.75" Width="1.75" />
-    <AssociationLine Name="nodes" Type="DelftTools.Controls.Swf.TreeViewControls.TreeNodeList" FixedToPoint="true">
+    <AssociationLine Name="nodes" Type="Core.Common.Controls.Swf.TreeViewControls.TreeNodeList" FixedToPoint="true">
       <Path>
         <Point X="12.5" Y="3.5" />
         <Point X="13.25" Y="3.5" />
@@ -63,17 +63,17 @@
     </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Controls.Swf.TreeViewControls.TreeViewNodePresenterBase&lt;T&gt;" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Controls.Swf.TreeViewControls.TreeViewNodePresenterBase&lt;T&gt;" BaseTypeListCollapsed="true">
     <Position X="18.75" Y="0.75" Width="3" />
     <TypeIdentifier>
       <HashCode>AoAAABQACgAIAAAAIAgAAAkACAABABAIEEKIACIGoAE=</HashCode>
       <FileName>TreeViewControls\TreeViewNodePresenterBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="DelftTools.Controls.ITreeNode">
+  <Interface Name="Core.Common.Controls.ITreeNode">
     <Position X="0.5" Y="2.25" Width="1.5" />
-    <AssociationLine Name="Nodes" Type="DelftTools.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="Nodes" Type="Core.Common.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="2" Y="5.601" />
         <Point X="2.25" Y="5.601" />
@@ -84,7 +84,7 @@
         <Position X="0.481" Y="-0.267" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="PreviousNode" Type="DelftTools.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="PreviousNode" Type="Core.Common.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="2" Y="6.054" />
         <Point X="2.25" Y="6.054" />
@@ -95,7 +95,7 @@
         <Position X="0.429" Y="-0.28" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="PreviousVisibleNode" Type="DelftTools.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="PreviousVisibleNode" Type="Core.Common.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="2" Y="7.088" />
         <Point X="2.25" Y="7.088" />
@@ -106,7 +106,7 @@
         <Position X="0.439" Y="-0.338" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="NextNode" Type="DelftTools.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="NextNode" Type="Core.Common.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="2" Y="6.565" />
         <Point X="2.25" Y="6.565" />
@@ -117,7 +117,7 @@
         <Position X="0.391" Y="-0.304" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="NextVisibleNode" Type="DelftTools.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="NextVisibleNode" Type="Core.Common.Controls.ITreeNode" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="2" Y="7.692" />
         <Point X="2.5" Y="7.692" />
@@ -140,14 +140,14 @@
       <Property Name="Nodes" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.ITreeNodePresenter">
+  <Interface Name="Core.Common.Controls.ITreeNodePresenter">
     <Position X="7.75" Y="1.75" Width="2" />
     <TypeIdentifier />
     <ShowAsAssociation>
       <Property Name="TreeView" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.ITreeView">
+  <Interface Name="Core.Common.Controls.ITreeView">
     <Position X="4.5" Y="2" Width="1.75" />
     <TypeIdentifier />
     <ShowAsAssociation>
@@ -159,7 +159,7 @@
       <Property Name="AllLoadedNodes" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.IView" Collapsed="true">
+  <Interface Name="Core.Common.Controls.IView" Collapsed="true">
     <Position X="4.5" Y="0.5" Width="1.75" />
     <TypeIdentifier />
   </Interface>
Index: Core/Common/src/Core.Common.Controls/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,6 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("DelftTools.Controls")]
-[assembly: AssemblyProduct("DelftTools.Controls")]
+[assembly: AssemblyTitle("Core.Common.Controls")]
+[assembly: AssemblyProduct("Core.Common.Controls")]
 [assembly: Guid("36047e2d-cb54-483d-94ab-00f7a3173a2a")]
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/UML/ITableView.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Controls/UML/ITableView.cd	(.../ITableView.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls/UML/ITableView.cd	(.../ITableView.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Controls.TableViewCell">
+  <Class Name="Core.Common.Controls.TableViewCell">
     <Position X="5" Y="8.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAgAAAAAAAAAA=</HashCode>
       <FileName>TableViewCell.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Controls.TableSelectionChangedEventArgs">
+  <Class Name="Core.Common.Controls.TableSelectionChangedEventArgs">
     <Position X="8.75" Y="10" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>TableSelectionChangedEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Interface Name="DelftTools.Controls.ITableView">
+  <Interface Name="Core.Common.Controls.ITableView">
     <Position X="0.75" Y="0.75" Width="2.25" />
     <TypeIdentifier>
       <HashCode>owgAAAAAUIAAYKASAIAAAERAkAAgKABgAAAIQJhIAqE=</HashCode>
@@ -28,28 +28,28 @@
       <Property Name="SelectedCells" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Controls.ITableViewColumn">
+  <Interface Name="Core.Common.Controls.ITableViewColumn">
     <Position X="5" Y="0.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAABAAAAAAgAAIAYAEAAMwAAABAARAICAAIAYAAAAA=</HashCode>
       <FileName>ITableViewColumn.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.ITableViewPasteController">
+  <Interface Name="Core.Common.Controls.ITableViewPasteController">
     <Position X="5" Y="6.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAIA=</HashCode>
       <FileName>ITableViewPasteController.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.IRowValidationResult">
+  <Interface Name="Core.Common.Controls.IRowValidationResult">
     <Position X="5" Y="4.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAEAAAAAAAAAAAACAAAAAAAAAAAAAABAAAAAA=</HashCode>
       <FileName>IRowValidationResult.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="DelftTools.Controls.TableViewPasteBehaviourOptions">
+  <Enum Name="Core.Common.Controls.TableViewPasteBehaviourOptions">
     <Position X="5" Y="10.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Gui/Uml/Gui.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Gui/Uml/Gui.cd	(.../Gui.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/Uml/Gui.cd	(.../Gui.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Gui.SelectedItemChangedEventArgs">
+  <Class Name="Core.Common.Gui.SelectedItemChangedEventArgs">
     <Position X="11" Y="20.75" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>ItemEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.SelectedItemChangedEventArgs&lt;T&gt;">
+  <Class Name="Core.Common.Gui.SelectedItemChangedEventArgs&lt;T&gt;">
     <Position X="11" Y="22.5" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>ItemEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.guiPluginPlugin" BaseTypeListCollapsed="true">
+  <Class Name="Core.Common.Gui.guiPluginPlugin" BaseTypeListCollapsed="true">
     <Position X="14.75" Y="18.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAIAAAAAAAAAEAAAAAAAAAAAAAAA=</HashCode>
       <FileName>GuiPluginConfiguration.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.ViewEventArgs">
+  <Class Name="Core.Common.Gui.ViewEventArgs">
     <Position X="11" Y="24.25" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAgAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
       <FileName>ViewEventArgs.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="DelftTools.Shell.Gui.GuiPlugin" Collapsed="true">
+  <Class Name="Core.Common.Gui.GuiPlugin" Collapsed="true">
     <Position X="9.5" Y="8.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>YEAAQAAAJCRgEAFAECAIAEQAAAABgBAAEACBAAAACEA=</HashCode>
       <FileName>GuiPlugin.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="DelftTools.Shell.Gui.IGui">
+  <Interface Name="Core.Common.Gui.IGui">
     <Position X="6.75" Y="8" Width="1.75" />
-    <AssociationLine Name="CompositeViewProvider" Type="DelftTools.Shell.Gui.ICompositeViewProvider" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="CompositeViewProvider" Type="Core.Common.Gui.ICompositeViewProvider" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="8.5" Y="9.312" />
         <Point X="9.174" Y="9.312" />
@@ -49,7 +49,7 @@
         <Position X="0.212" Y="0.155" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="CopyPasteHandler" Type="DelftTools.Shell.Gui.IProjectItemCopyPasteHandler" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="CopyPasteHandler" Type="Core.Common.Gui.IProjectItemCopyPasteHandler" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="6.75" Y="9.345" />
         <Point X="5.882" Y="9.345" />
@@ -60,29 +60,29 @@
         <Position X="0.098" Y="0.29" />
       </MemberNameLabel>
     </AssociationLine>
-    <AssociationLine Name="DocumentViews" Type="DelftTools.Shell.Gui.IViewManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="DocumentViews" Type="Core.Common.Gui.IViewManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="6.75" Y="9.057" />
         <Point X="5.476" Y="9.057" />
         <Point X="5.476" Y="13.587" />
         <Point X="3" Y="13.587" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="MainWindow" Type="DelftTools.Shell.Gui.Forms.IMainWindow" FixedFromPoint="true">
+    <AssociationLine Name="MainWindow" Type="Core.Common.Gui.Forms.IMainWindow" FixedFromPoint="true">
       <Path>
         <Point X="6.75" Y="8.576" />
         <Point X="3" Y="8.576" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="ToolWindowViews" Type="DelftTools.Shell.Gui.IViewManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="ToolWindowViews" Type="Core.Common.Gui.IViewManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="6.75" Y="8.816" />
         <Point X="5.052" Y="8.816" />
         <Point X="5.052" Y="12.512" />
         <Point X="3" Y="12.512" />
       </Path>
     </AssociationLine>
-    <AssociationLine Name="UndoRedoManager" Type="DelftTools.Utils.UndoRedo.IUndoRedoManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <AssociationLine Name="UndoRedoManager" Type="Core.Common.BaseDelftTools.UndoRedo.IUndoRedoManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="6.75" Y="9.489" />
         <Point X="6.51" Y="9.489" />
@@ -110,100 +110,100 @@
       <Property Name="Plugins" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IGuiCommandHandler">
+  <Interface Name="Core.Common.Gui.IGuiCommandHandler">
     <Position X="8" Y="17.25" Width="1.75" />
     <TypeIdentifier>
       <HashCode>ACAACAAREAAqAKQQFAoiACAAZgAkAiQAMEAhKIAAgBA=</HashCode>
       <FileName>IGuiCommandHandler.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Forms.IMainWindow">
+  <Interface Name="Core.Common.Gui.Forms.IMainWindow">
     <Position X="1.25" Y="7.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAIAAAAAAIIAAEAAAQAAAAAAAAAEAAgIAAAAAAGAAIA=</HashCode>
       <FileName>Forms\IMainWindow.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Core.IApplication" Collapsed="true">
+  <Interface Name="Core.Common.Core.IApplication" Collapsed="true">
     <Position X="9.25" Y="6" Width="1.75" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.ICompositeViewProvider">
+  <Interface Name="Core.Common.Gui.ICompositeViewProvider">
     <Position X="11.75" Y="9.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>ICompositeViewProvider.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IProjectItemCopyPasteHandler">
+  <Interface Name="Core.Common.Gui.IProjectItemCopyPasteHandler">
     <Position X="1.25" Y="16.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AQQRBAAAAAQAAAAAAAAAAAAAAgAAAAAAQEAAAAAACAA=</HashCode>
       <FileName>IProjectItemCopyPasteHandler.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IViewManager">
+  <Interface Name="Core.Common.Gui.IViewManager">
     <Position X="1.25" Y="11.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AIIAEIAAAAAAAAAAQAAACUACCAAAAMAAAAAAAABACAA=</HashCode>
       <FileName>IViewManager.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Utils.UndoRedo.IUndoRedoManager">
+  <Interface Name="Core.Common.BaseDelftTools.UndoRedo.IUndoRedoManager">
     <Position X="1.25" Y="19.25" Width="1.75" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IViewProvider">
+  <Interface Name="Core.Common.Gui.IViewProvider">
     <Position X="11.75" Y="6.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAQAAAAABAAEAAAAAAAIAAIAgAAAAAAAAAAA=</HashCode>
       <FileName>IViewProvider.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.ICommand">
+  <Interface Name="Core.Common.Controls.ICommand">
     <Position X="11.75" Y="11" Width="2.25" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.Forms.IProjectExplorer">
+  <Interface Name="Core.Common.Gui.Forms.IProjectExplorer">
     <Position X="1.25" Y="4.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEIAAAA=</HashCode>
       <FileName>Forms\IProjectExplorer.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IGuiContextManager">
+  <Interface Name="Core.Common.Gui.IGuiContextManager">
     <Position X="11.5" Y="15" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAABAAAAAQAAAAAAAAAAAAAAAAAAAAACAAAAAAAEAAA=</HashCode>
       <FileName>IGuiContextManager.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IConfigureDialog">
+  <Interface Name="Core.Common.Gui.IConfigureDialog">
     <Position X="11" Y="18.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IConfigureDialog.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IGuiView">
+  <Interface Name="Core.Common.Gui.IGuiView">
     <Position X="4.25" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IGuiView.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.ISelectionContainer">
+  <Interface Name="Core.Common.Gui.ISelectionContainer">
     <Position X="6.5" Y="3.25" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAEAAAQAAAQAA=</HashCode>
       <FileName>ISelectionContainer.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.IView">
+  <Interface Name="Core.Common.Controls.IView">
     <Position X="2.75" Y="0.5" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IGuiCommand" Collapsed="true">
+  <Interface Name="Core.Common.Gui.IGuiCommand" Collapsed="true">
     <Position X="9.5" Y="11.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Gui/Uml/Properties.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Gui/Uml/Properties.cd	(.../Properties.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/Uml/Properties.cd	(.../Properties.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DelftTools.Shell.Gui.ObjectProperties&lt;T&gt;">
+  <Class Name="Core.Common.Gui.ObjectProperties&lt;T&gt;">
     <Position X="0.5" Y="2.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAAAA=</HashCode>
       <FileName>ObjectProperties.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.PropertyInfo&lt;TObject, TProperty&gt;">
+  <Class Name="Core.Common.Gui.PropertyInfo&lt;TObject, TProperty&gt;">
     <Position X="3.75" Y="3.25" Width="3" />
     <TypeIdentifier>
       <HashCode>ASAgIAAAAAAAAAAAAAAABAAAAAAAAAQAAIACEAAAAAA=</HashCode>
       <FileName>PropertyInfo.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DelftTools.Shell.Gui.DynamicObjectProperties">
+  <Class Name="Core.Common.Gui.DynamicObjectProperties">
     <Position X="0.5" Y="4.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAAAA=</HashCode>
       <FileName>DynamicObjectProperties.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Interface Name="DelftTools.Shell.Gui.IObjectProperties">
+  <Interface Name="Core.Common.Gui.IObjectProperties">
     <Position X="0.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAA=</HashCode>
       <FileName>IObjectProperties.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IPropertyInfo">
+  <Interface Name="Core.Common.Gui.IPropertyInfo">
     <Position X="3.75" Y="0.5" Width="2" />
     <TypeIdentifier>
       <HashCode>ASAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAIACEAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Gui/Uml/ViewManager.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Gui/Uml/ViewManager.cd	(.../ViewManager.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/Uml/ViewManager.cd	(.../ViewManager.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Interface Name="DelftTools.Shell.Gui.IGuiView">
+  <Interface Name="Core.Common.Gui.IGuiView">
     <Position X="7" Y="6" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IGuiView.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.ICompositeViewProvider">
+  <Interface Name="Core.Common.Gui.ICompositeViewProvider">
     <Position X="1.25" Y="4.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA=</HashCode>
       <FileName>ICompositeViewProvider.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IConfigureDialog">
+  <Interface Name="Core.Common.Gui.IConfigureDialog">
     <Position X="9.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IConfigureDialog.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IViewManager">
+  <Interface Name="Core.Common.Gui.IViewManager">
     <Position X="5" Y="1" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AIIAEIAAAAAAIAAAAAAACUACDAAAAMAAAAAAAABACAA=</HashCode>
@@ -35,38 +35,38 @@
       <Property Name="AllViews" />
     </ShowAsCollectionAssociation>
   </Interface>
-  <Interface Name="DelftTools.Shell.Gui.IViewProvider">
+  <Interface Name="Core.Common.Gui.IViewProvider">
     <Position X="1" Y="1.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AEAAAAAAAQAAAAABIAEAAAAAAAAAAIAgAAAAAAAAAAA=</HashCode>
       <FileName>IViewProvider.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="DelftTools.Controls.IView">
+  <Interface Name="Core.Common.Controls.IView">
     <Position X="9.5" Y="2.25" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Controls.IView&lt;T&gt;">
+  <Interface Name="Core.Common.Controls.IView&lt;T&gt;">
     <Position X="11.5" Y="6" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Controls.ICompositeView">
+  <Interface Name="Core.Common.Controls.ICompositeView">
     <Position X="13.75" Y="6" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Controls.IContextAwareView">
+  <Interface Name="Core.Common.Controls.IContextAwareView">
     <Position X="9" Y="6" Width="2" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Controls.ISuspendibleView">
+  <Interface Name="Core.Common.Controls.ISuspendibleView">
     <Position X="12" Y="2.75" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="DelftTools.Controls.IReusableView">
+  <Interface Name="Core.Common.Controls.IReusableView">
     <Position X="15.75" Y="6" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Enum Name="DelftTools.Shell.Gui.ViewLocation">
+  <Enum Name="Core.Common.Gui.ViewLocation">
     <Position X="3" Y="6.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAUAAAAAAAIAAACCACAAAAAAAA=</HashCode>
Index: Core/Common/src/Core.Common.Utils/Uml/Workflow.cd
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Common/src/Core.Common.Utils/Uml/Workflow.cd	(.../Workflow.cd)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Utils/Uml/Workflow.cd	(.../Workflow.cd)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Interface Name="DelftTools.Utils.Workflow.IActivity">
+  <Interface Name="Core.Common.BaseDelftTools.Workflow.IActivity">
     <Position X="1.25" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAEQAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
@@ -10,14 +10,14 @@
       <Property Name="Status" />
     </ShowAsAssociation>
   </Interface>
-  <Interface Name="DelftTools.Utils.Workflow.Generics.IProgressingActivity&lt;T, TStep&gt;">
+  <Interface Name="Core.Common.BaseDelftTools.Workflow.Generics.IProgressingActivity&lt;T, TStep&gt;">
     <Position X="0.75" Y="3" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAEAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAAEAA=</HashCode>
       <FileName>Workflow\Generics\IProgressingActivity.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Enum Name="DelftTools.Utils.Workflow.ActivityStatus">
+  <Enum Name="Core.Common.BaseDelftTools.Workflow.ActivityStatus">
     <Position X="4" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AABAEAAAQCAAAAAAAAQAAAAAAAAAAAAIABAAAAEAAAA=</HashCode>
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.resx	(.../ChartLegendView.resx)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.resx	(.../ChartLegendView.resx)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -217,7 +217,7 @@
     <value>treeView</value>
   </data>
   <data name="&gt;&gt;treeView.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.TreeViewControls.TreeView, DelftTools.Controls.Swf, Version=1.0.4.31422, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d</value>
+    <value>Core.Common.Controls.Swf.TreeViewControls.TreeView, Core.Common.Controls.Swf, Version=1.0.4.31422, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d</value>
   </data>
   <data name="&gt;&gt;treeView.Parent" xml:space="preserve">
     <value>$this</value>
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.resx	(.../TextDocumentView.resx)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.resx	(.../TextDocumentView.resx)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -175,7 +175,7 @@
     <value>findAndReplaceControl1</value>
   </data>
   <data name="&gt;&gt;findAndReplaceControl1.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.FindAndReplaceControl, DelftTools.Controls.Swf, Version=1.0.4.31420, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d</value>
+    <value>Core.Common.Controls.Swf.FindAndReplaceControl, Core.Common.Controls.Swf, Version=1.0.4.31420, Culture=neutral, PublicKeyToken=cef13554f3ca1f2d</value>
   </data>
   <data name="&gt;&gt;findAndReplaceControl1.Parent" xml:space="preserve">
     <value>$this</value>
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r7ba405dea8ce47a0076e9dd61838b80cc4b2febb
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.resx	(.../ProjectTreeView.resx)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.resx	(.../ProjectTreeView.resx)	(revision 7ba405dea8ce47a0076e9dd61838b80cc4b2febb)
@@ -218,13 +218,13 @@
     <value>buttonFolderAdd</value>
   </data>
   <data name="&gt;&gt;buttonFolderAdd.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;buttonFolderAddNewItem.Name" xml:space="preserve">
     <value>buttonFolderAddNewItem</value>
   </data>
   <data name="&gt;&gt;buttonFolderAddNewItem.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;toolStripSeparator4.Name" xml:space="preserve">
     <value>toolStripSeparator4</value>
@@ -236,7 +236,7 @@
     <value>buttonFolderImportFolder</value>
   </data>
   <data name="&gt;&gt;buttonFolderImportFolder.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;buttonFolderExportFolder.Name" xml:space="preserve">
     <value>buttonFolderExportFolder</value>
@@ -272,13 +272,13 @@
     <value>buttonFolderExpandAll</value>
   </data>
   <data name="&gt;&gt;buttonFolderExpandAll.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;buttonFolderCollapseAll.Name" xml:space="preserve">
     <value>buttonFolderCollapseAll</value>
   </data>
   <data name="&gt;&gt;buttonFolderCollapseAll.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;toolStripSeparator7.Name" xml:space="preserve">
     <value>toolStripSeparator7</value>
@@ -290,7 +290,7 @@
     <value>buttonFolderProperties</value>
   </data>
   <data name="&gt;&gt;buttonFolderProperties.Type" xml:space="preserve">
-    <value>DelftTools.Controls.Swf.ClonableToolStripMenuItem, DelftTools.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.Swf.ClonableToolStripMenuItem, Core.Common.Controls.Swf, Version=0.5.0.345, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ProjectTreeView</value>