Reorg for better seperation of UI and Core functionality.   Fix issues with Actions not instatiating.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
index adc1898..d665836 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
@@ -9,13 +9,10 @@
  org.junit
 Export-Package: com.wutka.dtd,
  org.eclipse.wst.xml.vex.core.internal;x-internal:=true,
- org.eclipse.wst.xml.vex.core.internal.action;x-internal:=true,
  org.eclipse.wst.xml.vex.core.internal.core;x-internal:=true,
  org.eclipse.wst.xml.vex.core.internal.css;x-internal:=true,
  org.eclipse.wst.xml.vex.core.internal.dom;x-internal:=true,
  org.eclipse.wst.xml.vex.core.internal.layout;x-internal:=true,
- org.eclipse.wst.xml.vex.core.internal.swing;x-internal:=true,
- org.eclipse.wst.xml.vex.core.internal.swt;x-internal:=true,
  org.eclipse.wst.xml.vex.core.internal.undo;x-internal:=true,
  org.eclipse.wst.xml.vex.core.internal.widget;x-internal:=true,
  org.w3c.css.sac,
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
index 6a53f77..aec84e2 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
@@ -14,10 +14,13 @@
  org.eclipse.ui.editors,
  org.junit,
  org.eclipse.wst.xml.vex.core;bundle-version="0.5.0"
-Export-Package: org.eclipse.wst.xml.vex.ui.internal;x-internal:=true,
+Export-Package: com.wutka.dtd,
+ org.eclipse.wst.xml.vex.ui.internal;x-internal:=true,
  org.eclipse.wst.xml.vex.ui.internal.action;x-internal:=true,
  org.eclipse.wst.xml.vex.ui.internal.config;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.editor;x-internal:=true
+ org.eclipse.wst.xml.vex.ui.internal.editor;x-internal:=true,
+ org.eclipse.wst.xml.vex.ui.internal.swing;x-internal:=true,
+ org.eclipse.wst.xml.vex.ui.internal.swt;x-internal:=true
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml
index c78e14d..d8b2875 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml
@@ -33,88 +33,88 @@
             <separator name="items"/>
          </menu>
                
-         <action id="org.eclipse.wst.xml.vex.ui.action.PasteTextAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.PasteTextAction"
                  label="%PasteTextAction.label"
                  menubarPath="edit/cut.ext"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.RestoreLastSelectionAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.RestoreLastSelectionAction"
                  label="%RestoreLastSelectionAction.label"
                  menubarPath="edit/editEnd"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
 
-         <action id="org.eclipse.wst.xml.vex.ui.action.InsertElementAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.InsertElementAction"
                  label="%InsertElementAction.mainmenu.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.insertMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
 
-         <action id="org.eclipse.wst.xml.vex.ui.action.DuplicateSelectionAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.DuplicateSelectionAction"
                  label="%DuplicateSelectionAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/modify"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate"
                  definitionId="org.eclipse.wst.xml.vex.ui.action.DuplicateSelectionAction">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.RemoveElementAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.RemoveElementAction"
                  label="%RemoveElementAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/modify"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate"
                  definitionId="org.eclipse.wst.xml.vex.ui.action.RemoveElementAction">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.ChangeElementAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.ChangeElementAction"
                  label="%ChangeElementAction.menu.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/modify"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
 
-         <action id="org.eclipse.wst.xml.vex.ui.action.MoveRowDownAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.MoveRowDownAction"
                  label="%MoveRowDownAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.rowMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.MoveRowUpAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.MoveRowUpAction"
                  label="%MoveRowUpAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.rowMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.DeleteRowAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.DeleteRowAction"
                  label="%DeleteRowAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.rowMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.InsertRowBelowAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.InsertRowBelowAction"
                  label="%InsertRowBelowAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.rowMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.InsertRowAboveAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.InsertRowAboveAction"
                  label="%InsertRowAboveAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.rowMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
 
-         <action id="org.eclipse.wst.xml.vex.ui.action.MoveColumnRightAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.MoveColumnRightAction"
                  label="%MoveColumnRightAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.columnMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.MoveColumnLeftAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.MoveColumnLeftAction"
                  label="%MoveColumnLeftAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.columnMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.DeleteColumnAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.DeleteColumnAction"
                  label="%DeleteColumnAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.columnMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.InsertColumnAfterAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.InsertColumnAfterAction"
                  label="%InsertColumnAfterAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.columnMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
          </action>
-         <action id="org.eclipse.wst.xml.vex.ui.action.InsertColumnBeforeAction"
+         <action id="org.eclipse.wst.xml.vex.ui.internal.action.InsertColumnBeforeAction"
                  label="%InsertColumnBeforeAction.label"
                  menubarPath="org.eclipse.wst.xml.vex.ui.documentMenu/org.eclipse.wst.xml.vex.ui.columnMenu/items"
                  class="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionDelegate">
@@ -142,7 +142,7 @@
       <wizard
             name="%NewDocumentWizard.name"
             icon="$nl$/vex16.gif"
-            category="org.eclipse.wst.xml.vex.ui.vex.NewWizardCategory"
+            category="org.eclipse.wst.xml.vex.ui.NewWizardCategory"
             class="org.eclipse.wst.xml.vex.ui.internal.editor.NewDocumentWizard"
             id="org.eclipse.wst.xml.vex.ui.NewDocumentWizard">
          <description>%NewDocumentWizard.desc</description>
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
index 83e9448..1fd5e91 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
@@ -16,8 +16,8 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.swt.SwtDisplayDevice;
 import org.eclipse.wst.xml.vex.ui.internal.config.ConfigLoaderJob;
+import org.eclipse.wst.xml.vex.ui.internal.swt.SwtDisplayDevice;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/AbstractVexAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/AbstractVexAction.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/AbstractVexAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/AbstractVexAction.java
index 1737530..61d968e 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/AbstractVexAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/AbstractVexAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/ActionUtils.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java
similarity index 99%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/ActionUtils.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java
index 92929d3..5613688 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/ActionUtils.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ActionUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ChangeElementAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ChangeElementAction.java
index e8e6736..2013986 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ChangeElementAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/ChangeElementAction.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.vex.ui.internal.action;
 
-import org.eclipse.wst.xml.vex.core.internal.action.IVexAction;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
+import org.eclipse.wst.xml.vex.ui.internal.action.IVexAction;
 import org.eclipse.wst.xml.vex.ui.internal.editor.MorphAssistant;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Displays the Change Element dialog.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DeleteColumnAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DeleteColumnAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DeleteColumnAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DeleteColumnAction.java
index a96c9c8..14e2ce3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DeleteColumnAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DeleteColumnAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DeleteRowAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DeleteRowAction.java
similarity index 95%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DeleteRowAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DeleteRowAction.java
index 930c36f..529a622 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DeleteRowAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DeleteRowAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.List;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DuplicateSelectionAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DuplicateSelectionAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java
index 332bc7c..734ac04 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/DuplicateSelectionAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/DuplicateSelectionAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/IVexAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/IVexAction.java
similarity index 95%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/IVexAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/IVexAction.java
index 4ecba49..5e730e0 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/IVexAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/IVexAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertColumnAfterAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertColumnAfterAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertColumnAfterAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertColumnAfterAction.java
index 5092e9e..c656d15 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertColumnAfterAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertColumnAfterAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertColumnBeforeAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertColumnBeforeAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertColumnBeforeAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertColumnBeforeAction.java
index 6bc50e9..30a2b7d 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertColumnBeforeAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertColumnBeforeAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertElementAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertElementAction.java
index 27e4574..40aca7d 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertElementAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertElementAction.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.vex.ui.internal.action;
 
-import org.eclipse.wst.xml.vex.core.internal.action.IVexAction;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
+import org.eclipse.wst.xml.vex.ui.internal.action.IVexAction;
 import org.eclipse.wst.xml.vex.ui.internal.editor.InsertAssistant;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * @author john
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowAboveAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAboveAction.java
similarity index 92%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowAboveAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAboveAction.java
index 6fae2ac..f5edfd0 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowAboveAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAboveAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 /**
  * Inserts one or more table rows above the currently selected one(s).
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java
similarity index 98%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java
index c5a897f..987c75c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowBelowAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowBelowAction.java
similarity index 92%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowBelowAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowBelowAction.java
index c02c812..3a03f27 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/InsertRowBelowAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/InsertRowBelowAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 /**
  * Inserts one or more table rows below the currently selected one(s).
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveColumnLeftAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveColumnLeftAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveColumnLeftAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveColumnLeftAction.java
index 0e99e73..a0ac322 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveColumnLeftAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveColumnLeftAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveColumnRightAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveColumnRightAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveColumnRightAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveColumnRightAction.java
index c9729c8..69a8e7c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveColumnRightAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveColumnRightAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveRowDownAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveRowDownAction.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveRowDownAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveRowDownAction.java
index d6c0e80..cfb1456 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveRowDownAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveRowDownAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveRowUpAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveRowUpAction.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveRowUpAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveRowUpAction.java
index a7c0777..d6831f1 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveRowUpAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveRowUpAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.List;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveSelectionUpAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveSelectionUpAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java
index 24c63bf..43274b7 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/MoveSelectionUpAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/MoveSelectionUpAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.layout.BlockBox;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/NextTableCellAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/NextTableCellAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/NextTableCellAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/NextTableCellAction.java
index db89d3a..fc7667c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/NextTableCellAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/NextTableCellAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.layout.Box;
 import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/PasteTextAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/PasteTextAction.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/PasteTextAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/PasteTextAction.java
index 17f401f..ae1e935 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/PasteTextAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/PasteTextAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/PreviousTableCellAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/PreviousTableCellAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/PreviousTableCellAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/PreviousTableCellAction.java
index 74347fb..1ff55c3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/PreviousTableCellAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/PreviousTableCellAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.layout.Box;
 import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/RemoveElementAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/RemoveElementAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java
index 5cca284..ab82c9a 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/RemoveElementAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RemoveElementAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
 import org.eclipse.wst.xml.vex.core.internal.dom.Element;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/RestoreLastSelectionAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RestoreLastSelectionAction.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/RestoreLastSelectionAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RestoreLastSelectionAction.java
index 175a319..ffb4fb4 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/RestoreLastSelectionAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/RestoreLastSelectionAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/SplitAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java
similarity index 98%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/SplitAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java
index 370c7c6..22c6671 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/SplitAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/SplitItemAction.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/SplitItemAction.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java
index 001d5ea..accdc20 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/SplitItemAction.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/SplitItemAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.wst.xml.vex.core.internal.css.CSS;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/TableCellCallback.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/TableCellCallback.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/TableCellCallback.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/TableCellCallback.java
index 432576e..653266b 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/action/TableCellCallback.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/TableCellCallback.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.action;
+package org.eclipse.wst.xml.vex.ui.internal.action;
 
 /**
  * Callback interface called from LayoutUtils.iterateTableCells.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/VexActionAdapter.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/VexActionAdapter.java
index 3c8e854..c35cf09 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/VexActionAdapter.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/action/VexActionAdapter.java
@@ -11,10 +11,10 @@
 package org.eclipse.wst.xml.vex.ui.internal.action;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.wst.xml.vex.core.internal.action.IVexAction;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
+import org.eclipse.wst.xml.vex.ui.internal.action.IVexAction;
 import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
 import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Adapts a JFace Action to an IVexAction instance. The ID and definition ID of
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/ContentAssistant.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/ContentAssistant.java
index 3409967..f4c1b49 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/ContentAssistant.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/ContentAssistant.java
@@ -34,8 +34,8 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Class that owns the content assistant window, the popup where the user can
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DebugViewPage.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DebugViewPage.java
index 6483bd4..153f217 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DebugViewPage.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DebugViewPage.java
@@ -39,9 +39,9 @@
 import org.eclipse.wst.xml.vex.core.internal.core.Caret;
 import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
 import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.HostComponent;
 import org.eclipse.wst.xml.vex.core.internal.widget.VexWidgetImpl;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Page in the debug view.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentOutlinePage.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentOutlinePage.java
index 9366921..0b13d54 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentOutlinePage.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentOutlinePage.java
@@ -29,9 +29,9 @@
 import org.eclipse.ui.part.Page;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
 import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/InsertAssistant.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/InsertAssistant.java
index 4a73c69..a7e7e12 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/InsertAssistant.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/InsertAssistant.java
@@ -11,7 +11,7 @@
 package org.eclipse.wst.xml.vex.ui.internal.editor;
 
 import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Content assistant that shows valid elements to be inserted at the current
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/MorphAssistant.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/MorphAssistant.java
index 12cc504..332bc4c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/MorphAssistant.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/MorphAssistant.java
@@ -13,7 +13,7 @@
 import java.text.MessageFormat;
 
 import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Content assistant that shows valid elements to be inserted at the current
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
index f5fdfa2..777a277 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
@@ -26,23 +26,23 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.xml.vex.core.internal.action.ActionUtils;
-import org.eclipse.wst.xml.vex.core.internal.action.DeleteColumnAction;
-import org.eclipse.wst.xml.vex.core.internal.action.DeleteRowAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertColumnAfterAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertColumnBeforeAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertRowAboveAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertRowBelowAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveColumnLeftAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveColumnRightAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveRowDownAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveRowUpAction;
 import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
+import org.eclipse.wst.xml.vex.ui.internal.action.ActionUtils;
+import org.eclipse.wst.xml.vex.ui.internal.action.DeleteColumnAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.DeleteRowAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertColumnAfterAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertColumnBeforeAction;
 import org.eclipse.wst.xml.vex.ui.internal.action.InsertElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertRowAboveAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertRowBelowAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveColumnLeftAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveColumnRightAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveRowDownAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveRowUpAction;
 import org.eclipse.wst.xml.vex.ui.internal.action.VexActionAdapter;
 import org.eclipse.wst.xml.vex.ui.internal.config.Style;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Contribute actions on behalf of the VexEditor.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionDelegate.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionDelegate.java
index edd3b7a..63115fa 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionDelegate.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionDelegate.java
@@ -20,12 +20,12 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.xml.vex.core.internal.action.IVexAction;
-import org.eclipse.wst.xml.vex.core.internal.action.RemoveElementAction;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
 import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
 import org.eclipse.wst.xml.vex.ui.internal.action.ChangeElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.IVexAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.RemoveElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * An IWorkbenchWindowActionDelegate that defers to to an instance of
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
index b1c6d06..89df2ec 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
@@ -62,24 +62,6 @@
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.eclipse.ui.views.properties.IPropertySourceProvider;
 import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.wst.xml.vex.core.internal.action.DeleteColumnAction;
-import org.eclipse.wst.xml.vex.core.internal.action.DeleteRowAction;
-import org.eclipse.wst.xml.vex.core.internal.action.DuplicateSelectionAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertColumnAfterAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertColumnBeforeAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertRowAboveAction;
-import org.eclipse.wst.xml.vex.core.internal.action.InsertRowBelowAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveColumnLeftAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveColumnRightAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveRowDownAction;
-import org.eclipse.wst.xml.vex.core.internal.action.MoveRowUpAction;
-import org.eclipse.wst.xml.vex.core.internal.action.NextTableCellAction;
-import org.eclipse.wst.xml.vex.core.internal.action.PasteTextAction;
-import org.eclipse.wst.xml.vex.core.internal.action.PreviousTableCellAction;
-import org.eclipse.wst.xml.vex.core.internal.action.RemoveElementAction;
-import org.eclipse.wst.xml.vex.core.internal.action.RestoreLastSelectionAction;
-import org.eclipse.wst.xml.vex.core.internal.action.SplitAction;
-import org.eclipse.wst.xml.vex.core.internal.action.SplitItemAction;
 import org.eclipse.wst.xml.vex.core.internal.core.ListenerList;
 import org.eclipse.wst.xml.vex.core.internal.dom.Document;
 import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
@@ -88,17 +70,35 @@
 import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicy;
 import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicyFactory;
 import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.core.internal.swt.VexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
 import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
 import org.eclipse.wst.xml.vex.ui.internal.action.ChangeElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.DeleteColumnAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.DeleteRowAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.DuplicateSelectionAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertColumnAfterAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertColumnBeforeAction;
 import org.eclipse.wst.xml.vex.ui.internal.action.InsertElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertRowAboveAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.InsertRowBelowAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveColumnLeftAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveColumnRightAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveRowDownAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.MoveRowUpAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.NextTableCellAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.PasteTextAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.PreviousTableCellAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.RemoveElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.RestoreLastSelectionAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.SplitAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.SplitItemAction;
 import org.eclipse.wst.xml.vex.ui.internal.action.VexActionAdapter;
 import org.eclipse.wst.xml.vex.ui.internal.config.ConfigEvent;
 import org.eclipse.wst.xml.vex.ui.internal.config.ConfigRegistry;
 import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
 import org.eclipse.wst.xml.vex.ui.internal.config.IConfigListener;
 import org.eclipse.wst.xml.vex.ui.internal.config.Style;
+import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 import org.osgi.service.prefs.BackingStoreException;
 import org.osgi.service.prefs.Preferences;
 import org.xml.sax.EntityResolver;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtColor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtColor.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtColor.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtColor.java
index 817ecf5..8693ecd 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtColor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtColor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtDisplayDevice.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtDisplayDevice.java
similarity index 95%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtDisplayDevice.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtDisplayDevice.java
index e0b3f16..6b99d46 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtDisplayDevice.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtDisplayDevice.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import java.awt.Toolkit;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtFont.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtFont.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtFont.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtFont.java
index bf4531d..b490218 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtFont.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtFont.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtFontMetrics.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtFontMetrics.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtFontMetrics.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtFontMetrics.java
index a12087d..7d98064 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtFontMetrics.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtFontMetrics.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtGraphics.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtGraphics.java
similarity index 98%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtGraphics.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtGraphics.java
index e466dbf..112c2f7 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/AwtGraphics.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/AwtGraphics.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import java.awt.BasicStroke;
 import java.awt.GraphicsEnvironment;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/NullSelection.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/NullSelection.java
similarity index 92%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/NullSelection.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/NullSelection.java
index a7c7395..838db4c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/NullSelection.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/NullSelection.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 /**
  * Passed to {@link SelectionListener}s to indicate that nothing is currently
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/Selection.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/Selection.java
similarity index 92%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/Selection.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/Selection.java
index 99d8801..b076e43 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/Selection.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/Selection.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 /**
  * Marker interface for classes that represent selections passed to
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionListener.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionListener.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionListener.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionListener.java
index 63f1a95..608fd06 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionListener.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 /**
  * Interface for receiving selection change events. Typically, objects
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionProvider.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionProvider.java
similarity index 95%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionProvider.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionProvider.java
index 79ccc6a..1d4310a 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionProvider.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 /**
  * Represents a class that can fire selection change events to
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionProviderImpl.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionProviderImpl.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionProviderImpl.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionProviderImpl.java
index 716c3ca..1e29d99 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/SelectionProviderImpl.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/SelectionProviderImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexComponent.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java
similarity index 99%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexComponent.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java
index 36821ba..c396def 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexComponent.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponent.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import java.awt.Cursor;
 import java.awt.Dimension;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexComponentSelection.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponentSelection.java
similarity index 95%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexComponentSelection.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponentSelection.java
index e426e10..796966f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexComponentSelection.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexComponentSelection.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import org.eclipse.wst.xml.vex.core.internal.widget.VexWidgetImpl;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexSelection.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexSelection.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java
index 9fd1d91..3fc78bd 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swing/VexSelection.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swing/VexSelection.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swing;
+package org.eclipse.wst.xml.vex.ui.internal.swing;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.StringSelection;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/DocumentFragmentTransfer.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/DocumentFragmentTransfer.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
index 307b93f..9a74c8d 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/DocumentFragmentTransfer.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/KeyStroke.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/KeyStroke.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
index 69a3262..a2336e6 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/KeyStroke.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.swt.events.KeyEvent;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtColor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtColor.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
index 1e88dcd..883e463 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtColor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtDisplayDevice.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtDisplayDevice.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
index c255fb3..499a466 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtDisplayDevice.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtFont.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
similarity index 94%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtFont.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
index 87ab0c3..eb964ca 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtFont.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtFontMetrics.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
similarity index 96%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtFontMetrics.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
index 4ab1d32..846ddd4 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtFontMetrics.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtGraphics.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
similarity index 98%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtGraphics.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
index 97a85c1..7a07ba0 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/SwtGraphics.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.FontData;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/Timer.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/Timer.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
index 2acf043..e514a07 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/Timer.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import org.eclipse.swt.widgets.Display;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/VexWidget.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
similarity index 97%
rename from sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/VexWidget.java
rename to sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
index 65099cb..55a3154 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/swt/VexWidget.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.swt;
+package org.eclipse.wst.xml.vex.ui.internal.swt;
 
 import java.io.IOException;
 import java.net.URL;
@@ -50,14 +50,6 @@
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.wst.xml.vex.core.internal.action.AbstractVexAction;
-import org.eclipse.wst.xml.vex.core.internal.action.DuplicateSelectionAction;
-import org.eclipse.wst.xml.vex.core.internal.action.IVexAction;
-import org.eclipse.wst.xml.vex.core.internal.action.NextTableCellAction;
-import org.eclipse.wst.xml.vex.core.internal.action.PreviousTableCellAction;
-import org.eclipse.wst.xml.vex.core.internal.action.RemoveElementAction;
-import org.eclipse.wst.xml.vex.core.internal.action.SplitAction;
-import org.eclipse.wst.xml.vex.core.internal.action.SplitItemAction;
 import org.eclipse.wst.xml.vex.core.internal.core.Color;
 import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
 import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
@@ -75,6 +67,14 @@
 import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
 import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
 import org.eclipse.wst.xml.vex.core.internal.widget.VexWidgetImpl;
+import org.eclipse.wst.xml.vex.ui.internal.action.AbstractVexAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.DuplicateSelectionAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.IVexAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.NextTableCellAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.PreviousTableCellAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.RemoveElementAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.SplitAction;
+import org.eclipse.wst.xml.vex.ui.internal.action.SplitItemAction;
 import org.xml.sax.SAXException;
 
 /**