From cd4dc102a32df8d183a58d896d0ea086530b09a8 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Tue, 21 Jun 2011 07:37:35 +0000
Subject: [PATCH] fixed package name to match plugin

---
 .../trunk/META-INF/MANIFEST.MF                | 28 +++++++++----------
 org.fortiss.tooling.base.ui/trunk/plugin.xml  |  4 +--
 .../base/ui/ToolingBaseUIActivator.java       |  2 +-
 .../ui/action/ModelElementsActionBase.java    |  2 +-
 .../base/ui/command/ConnectionCommand.java    |  6 ++--
 .../{kernel => }/base/ui/dnd/DragContext.java |  2 +-
 .../{kernel => }/base/ui/dnd/DropContext.java |  4 +--
 .../base/ui/dnd/DropTargetListener.java       |  4 +--
 .../base/ui/editor/TreeViewerEditorBase.java  |  2 +-
 .../base/ui/editor/gef/EditorBase.java        |  4 +--
 .../editor/gef/GraphicalViewerEditorBase.java |  6 ++--
 .../ui/editpart/ConnectorEditPartBase.java    |  2 +-
 .../GraphicalConnectionEditPartBase.java      |  2 +-
 .../ui/editpart/GraphicalEditPartBase.java    |  2 +-
 .../LayoutedConnectionEditPartBase.java       |  2 +-
 .../ui/editpart/LayoutedEditPartBase.java     |  2 +-
 .../base/ui/editpart/NodeEditPartBase.java    |  6 ++--
 .../ui/editpart/PositionedEditPartBase.java   |  2 +-
 .../base/ui/editpart/RootEditPartBase.java    |  2 +-
 .../base/ui/editpart/SnapToGridSupport.java   |  2 +-
 .../anchor/InsetChopBoxConnectionAnchor.java  |  2 +-
 .../RectangularConnectorEditPartBase.java     | 10 +++----
 .../base/ui/editpart/figure/EVisualStyle.java |  4 +--
 .../editpart/figure/PrettyInsetEllipse.java   |  2 +-
 .../figure/PrettyRoundedRectangle.java        |  4 +--
 .../ConnectionGraphicalNodeEditPolicy.java    |  6 ++--
 .../editpart/policy/LayoutEditPolicyBase.java |  4 +--
 .../ui/editpart/policy/RemoveEditPolicy.java  |  2 +-
 .../GEF2ToolingKernelCommandStack.java        |  2 +-
 .../base/ui/layout/IPointLayouter.java        |  2 +-
 .../layout/constants/LayoutKeyConstants.java  |  2 +-
 .../constants/RecommendedLayoutConstants.java |  2 +-
 .../ui/layout/util/EditPartLayoutUtils.java   |  8 +++---
 .../base/ui/layout/util/LayoutDataUtils.java  |  6 ++--
 .../base/ui/layout/util/OrientationUtils.java |  4 +--
 .../base/ui/layout/util/ZoomUtils.java        |  2 +-
 .../GraphicalViewerPreferencePage.java        |  6 ++--
 .../ui/preferences/MainPreferencePage.java    |  4 +--
 38 files changed, 79 insertions(+), 79 deletions(-)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/ToolingBaseUIActivator.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/action/ModelElementsActionBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/command/ConnectionCommand.java (93%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/dnd/DragContext.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/dnd/DropContext.java (95%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/dnd/DropTargetListener.java (96%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editor/TreeViewerEditorBase.java (99%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editor/gef/EditorBase.java (96%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editor/gef/GraphicalViewerEditorBase.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/ConnectorEditPartBase.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/GraphicalConnectionEditPartBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/GraphicalEditPartBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/LayoutedConnectionEditPartBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/LayoutedEditPartBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/NodeEditPartBase.java (96%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/PositionedEditPartBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/RootEditPartBase.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/SnapToGridSupport.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/connector/RectangularConnectorEditPartBase.java (93%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/figure/EVisualStyle.java (95%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/figure/PrettyInsetEllipse.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/figure/PrettyRoundedRectangle.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java (96%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/policy/LayoutEditPolicyBase.java (96%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/editpart/policy/RemoveEditPolicy.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/internal/command/GEF2ToolingKernelCommandStack.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/IPointLayouter.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/constants/LayoutKeyConstants.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/constants/RecommendedLayoutConstants.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/util/EditPartLayoutUtils.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/util/LayoutDataUtils.java (98%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/util/OrientationUtils.java (95%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/layout/util/ZoomUtils.java (97%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/preferences/GraphicalViewerPreferencePage.java (92%)
 rename org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/{kernel => }/base/ui/preferences/MainPreferencePage.java (94%)

diff --git a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
index 483cdc2cc..a5a08282e 100644
--- a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
@@ -3,22 +3,22 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Fortiss Tooling Kernel Base User Interface
 Bundle-SymbolicName: org.fortiss.tooling.base.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.fortiss.tooling.kernel.base.ui.ToolingBaseUIActivator
+Bundle-Activator: org.fortiss.tooling.base.ui.ToolingBaseUIActivator
 Require-Bundle: org.fortiss.tooling.base;bundle-version="1.0.0";visibility:=reexport,
  org.fortiss.tooling.kernel.ui;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: fortiss
-Export-Package: org.fortiss.tooling.kernel.base.ui,
- org.fortiss.tooling.kernel.base.ui.action,
- org.fortiss.tooling.kernel.base.ui.command,
- org.fortiss.tooling.kernel.base.ui.dnd,
- org.fortiss.tooling.kernel.base.ui.editor,
- org.fortiss.tooling.kernel.base.ui.editor.gef,
- org.fortiss.tooling.kernel.base.ui.editpart,
- org.fortiss.tooling.kernel.base.ui.editpart.anchor,
- org.fortiss.tooling.kernel.base.ui.editpart.figure,
- org.fortiss.tooling.kernel.base.ui.editpart.policy,
- org.fortiss.tooling.kernel.base.ui.layout,
- org.fortiss.tooling.kernel.base.ui.layout.constants,
- org.fortiss.tooling.kernel.base.ui.layout.util
+Export-Package: org.fortiss.tooling.base.ui,
+ org.fortiss.tooling.base.ui.action,
+ org.fortiss.tooling.base.ui.command,
+ org.fortiss.tooling.base.ui.dnd,
+ org.fortiss.tooling.base.ui.editor,
+ org.fortiss.tooling.base.ui.editor.gef,
+ org.fortiss.tooling.base.ui.editpart,
+ org.fortiss.tooling.base.ui.editpart.anchor,
+ org.fortiss.tooling.base.ui.editpart.figure,
+ org.fortiss.tooling.base.ui.editpart.policy,
+ org.fortiss.tooling.base.ui.layout,
+ org.fortiss.tooling.base.ui.layout.constants,
+ org.fortiss.tooling.base.ui.layout.util
diff --git a/org.fortiss.tooling.base.ui/trunk/plugin.xml b/org.fortiss.tooling.base.ui/trunk/plugin.xml
index 13e5e2632..adc112e16 100644
--- a/org.fortiss.tooling.base.ui/trunk/plugin.xml
+++ b/org.fortiss.tooling.base.ui/trunk/plugin.xml
@@ -4,13 +4,13 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="org.fortiss.tooling.kernel.base.ui.preferences.MainPreferencePage"
+            class="org.fortiss.tooling.base.ui.preferences.MainPreferencePage"
             id="org.fortiss.tooling.base.ui.preferences.main"
             name="Fortiss Tooling">
       </page>
       <page
             category="org.fortiss.tooling.base.ui.preferences.main"
-            class="org.fortiss.tooling.kernel.base.ui.preferences.GraphicalViewerPreferencePage"
+            class="org.fortiss.tooling.base.ui.preferences.GraphicalViewerPreferencePage"
             id="org.fortiss.tooling.base.ui.preference.graphical.viewer"
             name="Graphical Viewer">
       </page>
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/ToolingBaseUIActivator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/ToolingBaseUIActivator.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
index d8fb11540..b093ea263 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/ToolingBaseUIActivator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui;
+package org.fortiss.tooling.base.ui;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/action/ModelElementsActionBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/ModelElementsActionBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/action/ModelElementsActionBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/ModelElementsActionBase.java
index c0c32984a..8cb16cc5e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/action/ModelElementsActionBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/ModelElementsActionBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.action;
+package org.fortiss.tooling.base.ui.action;
 
 import java.util.Collection;
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/command/ConnectionCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java
similarity index 93%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/command/ConnectionCommand.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java
index 35b839ae8..51f70594e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/command/ConnectionCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java
@@ -15,14 +15,14 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.command;
+package org.fortiss.tooling.base.ui.command;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.commands.Command;
-import org.fortiss.tooling.kernel.base.ui.dnd.DragContext;
-import org.fortiss.tooling.kernel.base.ui.editpart.policy.ConnectionGraphicalNodeEditPolicy;
+import org.fortiss.tooling.base.ui.dnd.DragContext;
+import org.fortiss.tooling.base.ui.editpart.policy.ConnectionGraphicalNodeEditPolicy;
 import org.fortiss.tooling.kernel.services.IConnectorService;
 
 /**
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DragContext.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DragContext.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java
index 4432873cc..9b7dfb120 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DragContext.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DragContext.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.dnd;
+package org.fortiss.tooling.base.ui.dnd;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gef.EditPart;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropContext.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java
similarity index 95%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropContext.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java
index 5cf16d3f5..123d4083e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropContext.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropContext.java
@@ -15,11 +15,11 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.dnd;
+package org.fortiss.tooling.base.ui.dnd;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gef.EditPart;
-import org.fortiss.tooling.kernel.base.ui.editpart.RootEditPartBase;
+import org.fortiss.tooling.base.ui.editpart.RootEditPartBase;
 import org.fortiss.tooling.kernel.interfaces.ICompositionContext;
 
 /**
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropTargetListener.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
index 8905b1f5f..2071b695d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.dnd;
+package org.fortiss.tooling.base.ui.dnd;
 
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.Request;
@@ -26,7 +26,7 @@ import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.dnd.DND;
-import org.fortiss.tooling.kernel.base.ui.editor.gef.GraphicalViewerEditorBase;
+import org.fortiss.tooling.base.ui.editor.gef.GraphicalViewerEditorBase;
 
 /**
  * The drop listener used for {@link GraphicalViewerEditorBase}.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/TreeViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
similarity index 99%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/TreeViewerEditorBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
index d0ee86428..42e2924a0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/TreeViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editor;
+package org.fortiss.tooling.base.ui.editor;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/gef/EditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/gef/EditorBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
index 96381af1e..85357a588 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/gef/EditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editor.gef;
+package org.fortiss.tooling.base.ui.editor.gef;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
@@ -27,7 +27,7 @@ import org.eclipse.gef.commands.CommandStack;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
-import org.fortiss.tooling.kernel.base.ui.internal.command.GEF2ToolingKernelCommandStack;
+import org.fortiss.tooling.base.ui.internal.command.GEF2ToolingKernelCommandStack;
 import org.fortiss.tooling.kernel.services.IPersistencyService;
 
 /**
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/gef/GraphicalViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/gef/GraphicalViewerEditorBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
index 8588e041a..16e7b121a 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editor/gef/GraphicalViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editor.gef;
+package org.fortiss.tooling.base.ui.editor.gef;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,8 +49,8 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
-import org.fortiss.tooling.kernel.base.ui.action.ModelElementsActionBase;
-import org.fortiss.tooling.kernel.base.ui.dnd.DropTargetListener;
+import org.fortiss.tooling.base.ui.action.ModelElementsActionBase;
+import org.fortiss.tooling.base.ui.dnd.DropTargetListener;
 import org.fortiss.tooling.kernel.ui.services.IEditPartFactoryService;
 
 /**
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/ConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/ConnectorEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
index a7fe9b4bd..69ee1b656 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/ConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.fortiss.tooling.base.model.element.IConnector;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/GraphicalConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalConnectionEditPartBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/GraphicalConnectionEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalConnectionEditPartBase.java
index 8f33ace03..67702357e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/GraphicalConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalConnectionEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/GraphicalEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/GraphicalEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
index f1b5e296e..3ca726740 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/GraphicalEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedConnectionEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java
index 06d89433c..73f4a8703 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedEditPartBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedEditPartBase.java
index ed18a4971..201f9ca0c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/NodeEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/NodeEditPartBase.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/NodeEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/NodeEditPartBase.java
index da102ddda..349a3063d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/NodeEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/NodeEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import java.util.List;
 
@@ -29,8 +29,8 @@ import org.eclipse.gef.Request;
 import org.eclipse.gef.RequestConstants;
 import org.eclipse.swt.graphics.Color;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
-import org.fortiss.tooling.kernel.base.ui.layout.util.LayoutDataUtils;
+import org.fortiss.tooling.base.ui.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.base.ui.layout.util.LayoutDataUtils;
 import org.fortiss.tooling.kernel.model.INamedCommentedElement;
 import org.fortiss.tooling.kernel.ui.services.IModelElementService;
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/PositionedEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/PositionedEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
index d30889e71..e03ec393c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/PositionedEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.eclipse.draw2d.ConnectionAnchor;
 import org.eclipse.draw2d.geometry.Rectangle;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/RootEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/RootEditPartBase.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/RootEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/RootEditPartBase.java
index c30a0ae24..5ed368d18 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/RootEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/RootEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/SnapToGridSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/SnapToGridSupport.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java
index 8cf8f5dcc..f58530c6b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/SnapToGridSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SnapToGridSupport.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart;
+package org.fortiss.tooling.base.ui.editpart;
 
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.SnapToGrid;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
index bb6b13c02..d34e12d29 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.anchor;
+package org.fortiss.tooling.base.ui.editpart.anchor;
 
 import org.eclipse.draw2d.ChopboxAnchor;
 import org.eclipse.draw2d.IFigure;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/connector/RectangularConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/connector/RectangularConnectorEditPartBase.java
similarity index 93%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/connector/RectangularConnectorEditPartBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/connector/RectangularConnectorEditPartBase.java
index 0612689aa..56094dbf9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/connector/RectangularConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/connector/RectangularConnectorEditPartBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.connector;
+package org.fortiss.tooling.base.ui.editpart.connector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,10 +32,10 @@ import org.fortiss.tooling.base.model.element.IConnection;
 import org.fortiss.tooling.base.model.element.IConnector;
 import org.fortiss.tooling.base.model.element.IHierarchicElement;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
-import org.fortiss.tooling.kernel.base.ui.editpart.ConnectorEditPartBase;
-import org.fortiss.tooling.kernel.base.ui.editpart.policy.ConnectionGraphicalNodeEditPolicy;
-import org.fortiss.tooling.kernel.base.ui.editpart.policy.RemoveEditPolicy;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.base.ui.editpart.ConnectorEditPartBase;
+import org.fortiss.tooling.base.ui.editpart.policy.ConnectionGraphicalNodeEditPolicy;
+import org.fortiss.tooling.base.ui.editpart.policy.RemoveEditPolicy;
+import org.fortiss.tooling.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * The super class of the connector edit parts used with rectangular shapes.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/EVisualStyle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java
similarity index 95%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/EVisualStyle.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java
index 1d825a9f8..3de853223 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/EVisualStyle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/EVisualStyle.java
@@ -15,10 +15,10 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.figure;
+package org.fortiss.tooling.base.ui.editpart.figure;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.fortiss.tooling.kernel.base.ui.ToolingBaseUIActivator;
+import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
 
 /**
  * The visual style that {@link PrettyInsetEllipse} and
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/PrettyInsetEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/PrettyInsetEllipse.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
index fa7980b2b..4f3bfb10b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/PrettyInsetEllipse.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.figure;
+package org.fortiss.tooling.base.ui.editpart.figure;
 
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Graphics;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/PrettyRoundedRectangle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/PrettyRoundedRectangle.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
index f9c244ec2..011c02bb5 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/figure/PrettyRoundedRectangle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.figure;
+package org.fortiss.tooling.base.ui.editpart.figure;
 
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Graphics;
@@ -25,7 +25,7 @@ import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
-import org.fortiss.tooling.kernel.base.ui.ToolingBaseUIActivator;
+import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
 
 /**
  * This shape consists of a rounded rectangle that is surrounded by transparent
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java
index 83ed4fe8f..04a0a90d2 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.policy;
+package org.fortiss.tooling.base.ui.editpart.policy;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.NodeEditPart;
@@ -24,8 +24,8 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
 import org.eclipse.gef.requests.CreateConnectionRequest;
 import org.eclipse.gef.requests.ReconnectRequest;
-import org.fortiss.tooling.kernel.base.ui.command.ConnectionCommand;
-import org.fortiss.tooling.kernel.base.ui.dnd.DragContext;
+import org.fortiss.tooling.base.ui.command.ConnectionCommand;
+import org.fortiss.tooling.base.ui.dnd.DragContext;
 
 /**
  * This is the edit policy to be installed on edit parts that allow creation of
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/LayoutEditPolicyBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/LayoutEditPolicyBase.java
similarity index 96%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/LayoutEditPolicyBase.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/LayoutEditPolicyBase.java
index bbfa94375..206405650 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/LayoutEditPolicyBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/LayoutEditPolicyBase.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.policy;
+package org.fortiss.tooling.base.ui.editpart.policy;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.ecore.EObject;
@@ -23,7 +23,7 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.fortiss.tooling.kernel.base.ui.dnd.DropContext;
+import org.fortiss.tooling.base.ui.dnd.DropContext;
 import org.fortiss.tooling.kernel.interfaces.ICompositionContext;
 import org.fortiss.tooling.kernel.services.ICompositorService;
 import org.fortiss.tooling.kernel.ui.util.DragAndDropUtils;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/RemoveEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/RemoveEditPolicy.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
index f15104bf4..239c69335 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/RemoveEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.editpart.policy;
+package org.fortiss.tooling.base.ui.editpart.policy;
 
 import java.util.List;
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/internal/command/GEF2ToolingKernelCommandStack.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
index 834e81c8e..4c36ba957 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.internal.command;
+package org.fortiss.tooling.base.ui.internal.command;
 
 import java.util.EventObject;
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/IPointLayouter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/IPointLayouter.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java
index d5863b128..9b03ec8f0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/IPointLayouter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IPointLayouter.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout;
+package org.fortiss.tooling.base.ui.layout;
 
 import org.fortiss.tooling.base.model.layout.Point;
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/LayoutKeyConstants.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/constants/LayoutKeyConstants.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/LayoutKeyConstants.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/constants/LayoutKeyConstants.java
index a10ffded1..0669cca06 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/LayoutKeyConstants.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/constants/LayoutKeyConstants.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout.constants;
+package org.fortiss.tooling.base.ui.layout.constants;
 
 /**
  * Layout constants defining keys for the commonly used layout objects, like
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/RecommendedLayoutConstants.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/constants/RecommendedLayoutConstants.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/RecommendedLayoutConstants.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/constants/RecommendedLayoutConstants.java
index bb4bae830..288f63863 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/RecommendedLayoutConstants.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/constants/RecommendedLayoutConstants.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout.constants;
+package org.fortiss.tooling.base.ui.layout.constants;
 
 import org.conqat.ide.commons.ui.swt.FontUtils;
 import org.eclipse.draw2d.geometry.Dimension;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/EditPartLayoutUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/EditPartLayoutUtils.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java
index 7fa0cd679..f80cc4662 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/EditPartLayoutUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/EditPartLayoutUtils.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout.util;
+package org.fortiss.tooling.base.ui.layout.util;
 
 import java.awt.Polygon;
 
@@ -26,9 +26,9 @@ import org.eclipse.draw2d.geometry.Rectangle;
 import org.fortiss.tooling.base.model.layout.EOrientation;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
 import org.fortiss.tooling.base.model.layout.OffsetOrientation;
-import org.fortiss.tooling.kernel.base.ui.dnd.DropContext;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.LayoutKeyConstants;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.base.ui.dnd.DropContext;
+import org.fortiss.tooling.base.ui.layout.constants.LayoutKeyConstants;
+import org.fortiss.tooling.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * Utility class collecting EditPart layout methods.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/LayoutDataUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java
similarity index 98%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/LayoutDataUtils.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java
index 68a7c801e..310c20212 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/LayoutDataUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/LayoutDataUtils.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout.util;
+package org.fortiss.tooling.base.ui.layout.util;
 
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.ecore.EObject;
@@ -30,8 +30,8 @@ import org.fortiss.tooling.base.model.layout.Offset;
 import org.fortiss.tooling.base.model.layout.Orientation;
 import org.fortiss.tooling.base.model.layout.Point;
 import org.fortiss.tooling.base.model.layout.Points;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.LayoutKeyConstants;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.base.ui.layout.constants.LayoutKeyConstants;
+import org.fortiss.tooling.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * Utility methods for {@link ILayoutedModelElement} and {@link ILayoutData}.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/OrientationUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/OrientationUtils.java
similarity index 95%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/OrientationUtils.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/OrientationUtils.java
index 9fd5bd76a..d1dc078c8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/OrientationUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/OrientationUtils.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout.util;
+package org.fortiss.tooling.base.ui.layout.util;
 
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
@@ -24,7 +24,7 @@ import org.fortiss.tooling.base.model.layout.LayoutFactory;
 import org.fortiss.tooling.base.model.layout.Offset;
 import org.fortiss.tooling.base.model.layout.OffsetOrientation;
 import org.fortiss.tooling.base.model.layout.Orientation;
-import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * Class for handling orientation relative coordinates.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/ZoomUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/ZoomUtils.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/ZoomUtils.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/ZoomUtils.java
index 5111f47e9..8d44ce72d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/ZoomUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/util/ZoomUtils.java
@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.layout.util;
+package org.fortiss.tooling.base.ui.layout.util;
 
 import org.eclipse.gef.RootEditPart;
 import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/preferences/GraphicalViewerPreferencePage.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java
similarity index 92%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/preferences/GraphicalViewerPreferencePage.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java
index d32751fb6..e36e2cdd6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/preferences/GraphicalViewerPreferencePage.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/GraphicalViewerPreferencePage.java
@@ -15,14 +15,14 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.preferences;
+package org.fortiss.tooling.base.ui.preferences;
 
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.fortiss.tooling.kernel.base.ui.ToolingBaseUIActivator;
-import org.fortiss.tooling.kernel.base.ui.editpart.figure.EVisualStyle;
+import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
+import org.fortiss.tooling.base.ui.editpart.figure.EVisualStyle;
 
 /**
  * Main preference page for graphical viewer editors.
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/preferences/MainPreferencePage.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
similarity index 94%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/preferences/MainPreferencePage.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
index b47171378..071052383 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/preferences/MainPreferencePage.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
@@ -15,12 +15,12 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base.ui.preferences;
+package org.fortiss.tooling.base.ui.preferences;
 
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.fortiss.tooling.kernel.base.ui.ToolingBaseUIActivator;
+import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
 
 /**
  * Main preference page for Fortiss Tooling. This does not provide preferences
-- 
GitLab