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 483cdc2cc63ce3c6db5a98cce2b437aa8659bfa2..a5a08282e75ba3b8c74454549b62cd7b41e2ef30 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 13e5e2632f2f363d705be8e4997ff56d78867e95..adc112e1647b25969212302c19e687b40f2ffcc8 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 d8fb11540bcff4dd18ceeaeeb8205eb9181517e2..b093ea26383489082fa7245b7085f28453bc54a1 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 c0c32984a830afdc0ddb26c0f1bde153e4ad141c..8cb16cc5ec46094ba740ea21096d657095b98a67 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 35b839ae83bbfed9c8dd3b1a7775c450d1f2ca65..51f70594e1a6c4ff109e17937ba29ad112bdc6f5 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 4432873cc4d5b60f752eb653cc2dc3144571e43b..9b7dfb120f105136194094a5bf5d2b2a503ec543 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 5cf16d3f5e32df2a5b54a0d5d0b290479b1bf950..123d4083e939840aaf1c3bb1d9cc9f47cae8a426 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 8905b1f5f8306d06b076dcf425c258511d93346d..2071b695db5ef308766645e81d114f1300520a70 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 d0ee86428fa37f2e4d89b7a0cd5b577c1a9cc2ce..42e2924a0be535e429c333bd15ff8705f4dfe465 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 96381af1efebc3aaa0f7960292ea08f98b45aad2..85357a588973bfbde4b144bf9d5833e0530ae730 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 8588e041aedb1bb75fe7704f5cb0bc7ba052670a..16e7b121aa3d94441492fce50a19fe7220f929cb 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 a7fe9b4bdc863fff0cffdff7511466ccc920fdad..69ee1b65653f12aff993c409fed5be81873a2ef1 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 8f33ace0310033971722291ae8e4915ebf3c540d..67702357e560894ab85a5c1bd0cd7a24065edb49 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 f1b5e296e2aea4433a4323a4e3f94ef561de98b0..3ca726740d4204adac33c7c6c69d8c75f5c3ff52 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 06d89433c9ef23f8160c5c49e0a35e3736a17f45..73f4a87036ee800ce8a8e1b870973bce13f8594a 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 ed18a49715e4be4a26116ef5dc55815312efecb2..201f9ca0c2b84870182aebb23aa5a8e4c522a760 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 da102ddda7c586ed27ef83c476283f07a72edb71..349a3063df60650e9c2ed5e5c5a7fda08843d008 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 d30889e71c89e894d22ce243ca9deb3e82fcc254..e03ec393c958b6dca966f567106f0a7d00695d82 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 c30a0ae2432c3ca3c3b9252dd1a4dd2c16d66fcc..5ed368d18606f33c1ab5282f5b7b018c6169d100 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 8cf8f5dcc8e60a047e1aadebb7159abea2d4b790..f58530c6b5de903cd9aed52fbd59c021ec87fc58 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 bb6b13c02446be4d71e66e3ad361a9703b8f44dd..d34e12d292547ef766ae7d26adbabe18ab5d15e3 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 0612689aac486f6ede58dc02f47fae76a8ffe237..56094dbf9b132968ab6ba6751d81cd1071021a22 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 1d825a9f875b03a41bba0e7b56780c2aaecc927f..3de85322384741f88204cc936b67ef3aa9ece8db 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 fa7980b2bff4654e116f4186f04d1954cb123476..4f3bfb10b7f990a5db9c27706f74681b66dfac3d 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 f9c244ec271276da82f3cce52daf6fb811ab6fb3..011c02bb55128508095fbff20ac7493bd0dc2ab1 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 83ed4fe8f902ab653a95f6d850f6474490230a00..04a0a90d21d5fd1eee36aac06f98d4a5f8f4f4e2 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 bbfa94375ca8e549f7b72978dda1bab87af32b64..2064056506a88ca9a78d54f553ba73cffa999149 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 f15104bf46e5f7eab5065581b1d2762f0d8ac167..239c69335707c3cf198a94dcae8e646ba1c03740 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 834e81c8e31e7d4b9128114345f7db0aa29395b5..4c36ba957298ef34f606a6f03cf468ba82e0fc7f 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 d5863b1284b6ef24d995507599faad4096098e83..9b03ec8f03b19990cf16d24531314a50da42237d 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 a10ffded1a1a6cbc4a80f0aba3acb568b6136558..0669cca06f8f8bb0bd5e2c0b23078ca160645589 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 bb4bae830357f6e64885ad62fc9daa7f437fc26f..288f63863cb3e9c69c77c7ade3dd07a557b8e9d4 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 7fa0cd6790f0f6537bc7fa9a266d0270546bb123..f80cc4662e1dab3635cfe2eb9812370552b420d2 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 68a7c801eb94d5f3b6fd8b2eac9d445b68743c1e..310c20212ff3f8858321716ec47fc5d70d92dd6f 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 9fd5bd76ae7feaf61fa4efed2f57ffac31c6446b..d1dc078c82b5cab2c0d977ae1dd6ecd30f74f0e8 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 5111f47e94613d39fd544e9ca9c1104113eebc98..8d44ce72d1640db8c7cf37675ef2d46bbc189b79 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 d32751fb601e2d8d2e3c0ab6f65cab14b9037e1f..e36e2cdd6546b46f4901daefb7ec3d690efff620 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 b471713782f87181d4a21e2cad62835d914dbddf..0710523832b0f995f86b6feb9826ba65dab8e6d1 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