renamed packages and extension IDs

Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
index 038f763..45c65c0 100644
--- a/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.vex.core.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xml.vex.core.tests.VEXCoreTestPlugin
+Bundle-Activator: org.eclipse.vex.core.tests.VEXCoreTestPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.apache.xerces;bundle-version="2.9.0",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
@@ -19,10 +19,10 @@
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: 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.widget;x-internal:=true,
- org.eclipse.wst.xml.vex.core.tests
+Export-Package: org.eclipse.vex.core.internal.css;x-internal:=true,
+ org.eclipse.vex.core.internal.dom;x-internal:=true,
+ org.eclipse.vex.core.internal.layout;x-internal:=true,
+ org.eclipse.vex.core.internal.widget;x-internal:=true,
+ org.eclipse.vex.core.tests
 Bundle-Localization: plugin
 Bundle-ClassPath: .
diff --git a/org.eclipse.vex.core.tests/pom.xml b/org.eclipse.vex.core.tests/pom.xml
index 0cebcaa..83a1eb6 100644
--- a/org.eclipse.vex.core.tests/pom.xml
+++ b/org.eclipse.vex.core.tests/pom.xml
@@ -23,7 +23,7 @@
 				<configuration>
 					<useUIHarness>true</useUIHarness>
 					<testSuite>org.eclipse.vex.core.tests</testSuite>
-					<testClass>org.eclipse.wst.xml.vex.core.tests.VEXCoreTestSuite</testClass>
+					<testClass>org.eclipse.vex.core.tests.VEXCoreTestSuite</testClass>
 					<dependencies>
 						<dependency>
 							<type>p2-installable-unit</type>
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/CssTest.java
similarity index 97%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/CssTest.java
index 033ccae..6e3ccb8 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/CssTest.java
@@ -8,19 +8,19 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Color;
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/MockDisplayDevice.java
similarity index 88%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/MockDisplayDevice.java
index f20585c..515c687 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/MockDisplayDevice.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
 
 public class MockDisplayDevice extends DisplayDevice {
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/MockLU.java
similarity index 98%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/MockLU.java
index 213816d..e0f6e8b 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/MockLU.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import org.w3c.css.sac.LexicalUnit;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java
similarity index 90%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java
index 938849d..b00426b 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/PropertyTest.java
@@ -8,16 +8,23 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.io.StringReader;
 
 import junit.framework.TestCase;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.BackgroundImageProperty;
+import org.eclipse.vex.core.internal.css.BorderStyleProperty;
+import org.eclipse.vex.core.internal.css.BorderWidthProperty;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.IProperty;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentReader;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.InputSource;
 import org.w3c.css.sac.LexicalUnit;
 import org.w3c.css.sac.Parser;
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java
similarity index 96%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java
index 09f5349..968feb0 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/RuleTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.net.URL;
 import java.util.List;
@@ -16,9 +16,12 @@
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.css.Rule;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
 
 /**
  * Test rule matching.
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/expansion.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/expansion.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/expansion.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/expansion.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/test1.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/test1.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.xml b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/test1.xml
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/test1.xml
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test2.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/test2.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test2.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/test2.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testImportant.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/testImportant.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testImportant.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/testImportant.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testLexicalUnits.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/testLexicalUnits.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testLexicalUnits.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/testLexicalUnits.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testRules.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/testRules.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testRules.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/css/testRules.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java
similarity index 74%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java
index 7ef05d3..5c321de 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/BlockElementBoxTest.java
@@ -8,23 +8,24 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
-import org.eclipse.wst.xml.vex.core.internal.layout.BlockElementBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.CssBoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.layout.FakeGraphics;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
-import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
-import org.eclipse.wst.xml.vex.core.tests.TestResources;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentReader;
+import org.eclipse.vex.core.internal.layout.BlockElementBox;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.CssBoxFactory;
+import org.eclipse.vex.core.internal.layout.FakeGraphics;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.RootBox;
+import org.eclipse.vex.core.tests.TestResources;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java
similarity index 93%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java
index c5cb2bb..0d600d0 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DTDValidatorTest.java
@@ -10,7 +10,7 @@
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *     Florian Thienel - bug 299999 - completed implementation of validation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -22,9 +22,13 @@
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
-import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;
-import org.eclipse.wst.xml.vex.core.tests.TestResources;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.validator.AttributeDefinition;
+import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.tests.TestResources;
 
 public class DTDValidatorTest extends TestCase {
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentWriterTest.java
similarity index 86%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentWriterTest.java
index 7ad0b73..caa9178 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentWriterTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -24,12 +24,18 @@
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.MockDisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
-import org.eclipse.wst.xml.vex.core.tests.TestResources;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.MockDisplayDevice;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentWriter;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;
+import org.eclipse.vex.core.internal.dom.Node;
+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
+import org.eclipse.vex.core.tests.TestResources;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -112,7 +118,7 @@
 			}
 		};
 
-		final org.eclipse.wst.xml.vex.core.internal.dom.DocumentBuilder builder = new org.eclipse.wst.xml.vex.core.internal.dom.DocumentBuilder(wsFactory);
+		final org.eclipse.vex.core.internal.dom.DocumentBuilder builder = new org.eclipse.vex.core.internal.dom.DocumentBuilder(wsFactory);
 
 		xmlReader.setContentHandler(builder);
 		xmlReader.setDTDHandler(defaultHandler);
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java
similarity index 96%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java
index 767b8fb..aee3b77 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/GapContentTest.java
@@ -8,9 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.GapContent;
+import org.eclipse.vex.core.internal.dom.GapContent;
+import org.eclipse.vex.core.internal.dom.Position;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/NamespaceStackTest.java
similarity index 96%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/NamespaceStackTest.java
index 7172090..94ada88 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/NamespaceStackTest.java
@@ -8,12 +8,13 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.dom;

+package org.eclipse.vex.core.internal.dom;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNull;

 import static org.junit.Assert.assertTrue;

 

+import org.eclipse.vex.core.internal.dom.NamespaceStack;

 import org.junit.Test;

 

 /**

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/NamespaceTest.java
similarity index 95%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/NamespaceTest.java
index a06a69a..292923a 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/NamespaceTest.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.dom;

+package org.eclipse.vex.core.internal.dom;

 

 import static org.junit.Assert.*;

 

@@ -19,9 +19,16 @@
 import javax.xml.parsers.ParserConfigurationException;

 

 import org.eclipse.core.runtime.QualifiedName;

-import org.eclipse.wst.xml.vex.core.internal.css.Rule;

-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;

-import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;

+import org.eclipse.vex.core.internal.css.Rule;

+import org.eclipse.vex.core.internal.css.StyleSheet;

+import org.eclipse.vex.core.internal.dom.Attribute;

+import org.eclipse.vex.core.internal.dom.Document;

+import org.eclipse.vex.core.internal.dom.DocumentReader;

+import org.eclipse.vex.core.internal.dom.DocumentWriter;

+import org.eclipse.vex.core.internal.dom.Element;

+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;

+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;

+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;

 import org.junit.Test;

 import org.xml.sax.SAXException;

 

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/SchemaValidatorTest.java
similarity index 93%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/SchemaValidatorTest.java
index e86aba6..4ac9ec6 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/SchemaValidatorTest.java
@@ -8,10 +8,10 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.dom;

+package org.eclipse.vex.core.internal.dom;

 

-import static org.eclipse.wst.xml.vex.core.internal.dom.Validator.PCDATA;

-import static org.eclipse.wst.xml.vex.core.tests.TestResources.*;

+import static org.eclipse.vex.core.internal.dom.Validator.PCDATA;

+import static org.eclipse.vex.core.tests.TestResources.*;

 import static org.junit.Assert.*;

 

 import java.io.IOException;

@@ -23,12 +23,18 @@
 import java.util.Set;

 

 import org.eclipse.core.runtime.QualifiedName;

+import org.eclipse.vex.core.internal.dom.Document;

+import org.eclipse.vex.core.internal.dom.DocumentReader;

+import org.eclipse.vex.core.internal.dom.Element;

+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;

+import org.eclipse.vex.core.internal.dom.RootElement;

+import org.eclipse.vex.core.internal.dom.Validator;

+import org.eclipse.vex.core.internal.validator.WTPVEXValidator;

 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;

 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;

 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;

 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;

 import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;

-import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;

 import org.junit.Test;

 import org.xml.sax.EntityResolver;

 import org.xml.sax.InputSource;

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/SpaceNormalizerTest.java
similarity index 92%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/SpaceNormalizerTest.java
index 255d2ae..11ecaf0 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/SpaceNormalizerTest.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -37,12 +37,19 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.MockDisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
-import org.eclipse.wst.xml.vex.core.tests.VEXCoreTestPlugin;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.MockDisplayDevice;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentBuilder;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;
+import org.eclipse.vex.core.internal.dom.Node;
+import org.eclipse.vex.core.internal.dom.Text;
+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
+import org.eclipse.vex.core.tests.VEXCoreTestPlugin;
 import org.osgi.framework.Bundle;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/TextWrapperTest.java
similarity index 96%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/TextWrapperTest.java
index de1bbbc..c723f7d 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/TextWrapperTest.java
@@ -9,9 +9,9 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.TextWrapper;
+import org.eclipse.vex.core.internal.dom.TextWrapper;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/FakeGraphics.java
similarity index 85%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/FakeGraphics.java
index 3d7d637..448aeb5 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/FakeGraphics.java
@@ -9,20 +9,20 @@
  *     John Krasnay - initial API and implementation
  *     Mohamadou Nassourou - Bug 298912 - rudimentary support for images
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
 import org.eclipse.core.runtime.Assert;
-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;
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Image;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.FontSpec;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Image;
+import org.eclipse.vex.core.internal.core.Rectangle;
 
 /**
  * A pseudo-Graphics class that returns a known set of font metrics.
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/FakeImage.java
similarity index 79%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/FakeImage.java
index 2d9b850..358d717 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/FakeImage.java
@@ -1,8 +1,8 @@
-package org.eclipse.wst.xml.vex.core.internal.layout;

+package org.eclipse.vex.core.internal.layout;

 

 import java.net.URL;

 

-import org.eclipse.wst.xml.vex.core.internal.core.Image;

+import org.eclipse.vex.core.internal.core.Image;

 

 public class FakeImage implements Image {

 	public final URL url;

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/ImageBoxTest.java
similarity index 88%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/ImageBoxTest.java
index 8c2cb27..f3e0e5f 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/ImageBoxTest.java
@@ -1,11 +1,13 @@
-package org.eclipse.wst.xml.vex.core.internal.layout;

+package org.eclipse.vex.core.internal.layout;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertSame;

 

 import java.net.URL;

 

-import org.eclipse.wst.xml.vex.core.internal.core.Image;

+import org.eclipse.vex.core.internal.core.Image;

+import org.eclipse.vex.core.internal.layout.ImageBox;

+import org.eclipse.vex.core.internal.layout.LayoutContext;

 import org.junit.Test;

 

 public class ImageBoxTest {

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
similarity index 92%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
index 22023d4..a2ab270 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.io.IOException;
 import java.net.URL;
@@ -25,13 +25,17 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
-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.widget.CssWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentReader;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.RootBox;
+import org.eclipse.vex.core.internal.layout.TextBox;
+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/MockBoxFactory.java
similarity index 78%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/MockBoxFactory.java
index d3b6be7..bc6c571 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/MockBoxFactory.java
@@ -8,9 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.layout.BlockElementBox;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.CssBoxFactory;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.SpaceBox;
 
 /**
  * A box factory that, for an element named &lt;space&gt;, returns a SpaceBox
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java
similarity index 90%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java
index 1c0686c..045ad88 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TableLayoutTest.java
@@ -9,20 +9,27 @@
  *     Holger Voormann - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.Arrays;
 import java.util.Stack;
 
 import junit.framework.TestCase;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.MockDisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.MockDisplayDevice;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.DocumentTextBox;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.RootBox;
+import org.eclipse.vex.core.internal.layout.TableBox;
+import org.eclipse.vex.core.internal.layout.TableCellBox;
+import org.eclipse.vex.core.internal.layout.TableRowBox;
 
 public class TableLayoutTest extends TestCase {
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java
similarity index 78%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java
index 0ed7d63..592567b 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlockElementBox.java
@@ -8,17 +8,21 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
 import junit.framework.TestCase;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.layout.BlockElementBox;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.RootBox;
 
 public class TestBlockElementBox extends TestCase {
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java
similarity index 74%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java
index e6ef767..54c38f8 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestBlocksInInlines.java
@@ -8,19 +8,19 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.MockDisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
-import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.MockDisplayDevice;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.RootBox;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java
similarity index 87%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java
index ee918f4..08bbf85 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestDocumentTextBox.java
@@ -8,19 +8,19 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.layout.CssBoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.layout.DocumentTextBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.InlineBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.layout.CssBoxFactory;
+import org.eclipse.vex.core.internal.layout.DocumentTextBox;
+import org.eclipse.vex.core.internal.layout.InlineBox;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestParagraphBox.java
similarity index 85%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestParagraphBox.java
index 8515086..e9e5f66 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestParagraphBox.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.layout.CssBoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.layout.CssBoxFactory;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java
similarity index 85%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java
index 5fdab14..f4c9b18 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/TestStaticTextBox.java
@@ -8,20 +8,20 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.MockDisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.layout.CssBoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.layout.InlineBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
-import org.eclipse.wst.xml.vex.core.internal.layout.StaticTextBox;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.css.MockDisplayDevice;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.layout.CssBoxFactory;
+import org.eclipse.vex.core.internal.layout.InlineBox;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.StaticTextBox;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/before-after.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/before-after.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.xml b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/before-after.xml
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/before-after.xml
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/block-inline.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/block-inline.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.xml b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/block-inline.xml
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/block-inline.xml
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/linebreaks.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/linebreaks.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.xml b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/linebreaks.xml
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/linebreaks.xml
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/tables.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/tables.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.xml b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/tables.xml
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/tables.xml
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/test.css b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/test.css
similarity index 100%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/test.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/test.css
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/MockHostComponent.java
similarity index 79%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/MockHostComponent.java
index 769e1c6..055df15 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/MockHostComponent.java
@@ -8,11 +8,12 @@
  * Contributors:
  *     Florian Thienel - initial implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.layout.FakeGraphics;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.layout.FakeGraphics;
+import org.eclipse.vex.core.internal.widget.HostComponent;
 
 public class MockHostComponent implements HostComponent {
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/VexWidgetTest.java
similarity index 84%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/VexWidgetTest.java
index b4f3035..5f77e0d 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/VexWidgetTest.java
@@ -8,20 +8,22 @@
  * Contributors:
  *     Florian Thienel - bug 315914, initial implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
 import static org.junit.Assert.*;
-import static org.eclipse.wst.xml.vex.core.tests.TestResources.*;
+import static org.eclipse.vex.core.tests.TestResources.*;
 
 import java.util.Arrays;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.internal.widget.IVexWidget;
+import org.eclipse.vex.core.internal.widget.VexWidgetImpl;
 import org.junit.Test;
 
 public class VexWidgetTest {
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java
similarity index 97%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java
index fb8820b..6a7b585 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/ListenerListTest.java
@@ -9,7 +9,7 @@
  *     Florian Thienel - initial API and implementation
  *     Holger Voormann
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.tests;
+package org.eclipse.vex.core.tests;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.EventListener;
@@ -17,7 +17,7 @@
 
 import junit.framework.TestCase;
 
-import org.eclipse.wst.xml.vex.core.internal.core.ListenerList;
+import org.eclipse.vex.core.internal.core.ListenerList;
 
 public class ListenerListTest extends TestCase {
 
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/TestResources.java
similarity index 96%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/TestResources.java
index 04b2c2d..22a48df 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/TestResources.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.tests;

+package org.eclipse.vex.core.tests;

 

 import java.io.IOException;

 import java.io.InputStream;

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestPlugin.java
similarity index 95%
rename from org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestPlugin.java
index 43d0a2f..87bcdb8 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestPlugin.java
@@ -1,4 +1,4 @@
-package org.eclipse.wst.xml.vex.core.tests;
+package org.eclipse.vex.core.tests;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java
new file mode 100644
index 0000000..0df4c9c
--- /dev/null
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/tests/VEXCoreTestSuite.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2010 John Krasnay and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     John Krasnay - initial API and implementation
+ *     Florian Thienel - bug 306639 - remove serializability from StyleSheet
+ *                       and dependend classes
+ *******************************************************************************/
+package org.eclipse.vex.core.tests;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.vex.core.internal.css.CssTest;
+import org.eclipse.vex.core.internal.css.PropertyTest;
+import org.eclipse.vex.core.internal.css.RuleTest;
+import org.eclipse.vex.core.internal.dom.BlockElementBoxTest;
+import org.eclipse.vex.core.internal.dom.DTDValidatorTest;
+import org.eclipse.vex.core.internal.dom.DocumentWriterTest;
+import org.eclipse.vex.core.internal.dom.GapContentTest;
+import org.eclipse.vex.core.internal.dom.NamespaceStackTest;
+import org.eclipse.vex.core.internal.dom.NamespaceTest;
+import org.eclipse.vex.core.internal.dom.SchemaValidatorTest;
+import org.eclipse.vex.core.internal.dom.SpaceNormalizerTest;
+import org.eclipse.vex.core.internal.dom.TextWrapperTest;
+import org.eclipse.vex.core.internal.layout.ImageBoxTest;
+import org.eclipse.vex.core.internal.layout.TableLayoutTest;
+import org.eclipse.vex.core.internal.layout.TestBlockElementBox;
+import org.eclipse.vex.core.internal.layout.TestBlocksInInlines;
+import org.eclipse.vex.core.internal.layout.TestDocumentTextBox;
+import org.eclipse.vex.core.internal.layout.TestStaticTextBox;
+import org.eclipse.vex.core.internal.widget.VexWidgetTest;
+
+public class VEXCoreTestSuite extends TestSuite {
+	public static Test suite() {
+		return new VEXCoreTestSuite();
+	}
+
+	public VEXCoreTestSuite() {
+		super("Vex Core Tests");
+		addTest(new JUnit4TestAdapter(NamespaceStackTest.class));
+		addTest(new JUnit4TestAdapter(NamespaceTest.class));
+		addTest(new JUnit4TestAdapter(SchemaValidatorTest.class));
+		addTestSuite(CssTest.class);
+		addTestSuite(PropertyTest.class);
+		addTestSuite(RuleTest.class);
+		addTestSuite(BlockElementBoxTest.class);
+		addTest(new JUnit4TestAdapter(ImageBoxTest.class));
+		addTestSuite(DocumentWriterTest.class);
+		addTestSuite(DTDValidatorTest.class);
+		addTestSuite(GapContentTest.class);
+		addTestSuite(SpaceNormalizerTest.class);
+		addTestSuite(TextWrapperTest.class);
+		addTestSuite(TestBlockElementBox.class);
+		addTestSuite(TestBlocksInInlines.class);
+		addTestSuite(TestDocumentTextBox.class);
+		addTestSuite(TestStaticTextBox.class);
+		addTestSuite(TableLayoutTest.class);
+		addTestSuite(ListenerListTest.class);
+		addTest(new JUnit4TestAdapter(VexWidgetTest.class));
+	}
+}
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
deleted file mode 100644
index b187ab1..0000000
--- a/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 John Krasnay and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     John Krasnay - initial API and implementation
- *     Florian Thienel - bug 306639 - remove serializability from StyleSheet
- *                       and dependend classes
- *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.tests;
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.vex.core.internal.css.CssTest;
-import org.eclipse.wst.xml.vex.core.internal.css.PropertyTest;
-import org.eclipse.wst.xml.vex.core.internal.css.RuleTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.BlockElementBoxTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.DTDValidatorTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriterTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.GapContentTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.NamespaceStackTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.NamespaceTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.SchemaValidatorTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.SpaceNormalizerTest;
-import org.eclipse.wst.xml.vex.core.internal.dom.TextWrapperTest;
-import org.eclipse.wst.xml.vex.core.internal.layout.ImageBoxTest;
-import org.eclipse.wst.xml.vex.core.internal.layout.TableLayoutTest;
-import org.eclipse.wst.xml.vex.core.internal.layout.TestBlockElementBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.TestBlocksInInlines;
-import org.eclipse.wst.xml.vex.core.internal.layout.TestDocumentTextBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.TestStaticTextBox;
-import org.eclipse.wst.xml.vex.core.internal.widget.VexWidgetTest;
-
-public class VEXCoreTestSuite extends TestSuite {
-	public static Test suite() {
-		return new VEXCoreTestSuite();
-	}
-
-	public VEXCoreTestSuite() {
-		super("Vex Core Tests");
-		addTest(new JUnit4TestAdapter(NamespaceStackTest.class));
-		addTest(new JUnit4TestAdapter(NamespaceTest.class));
-		addTest(new JUnit4TestAdapter(SchemaValidatorTest.class));
-		addTestSuite(CssTest.class);
-		addTestSuite(PropertyTest.class);
-		addTestSuite(RuleTest.class);
-		addTestSuite(BlockElementBoxTest.class);
-		addTest(new JUnit4TestAdapter(ImageBoxTest.class));
-		addTestSuite(DocumentWriterTest.class);
-		addTestSuite(DTDValidatorTest.class);
-		addTestSuite(GapContentTest.class);
-		addTestSuite(SpaceNormalizerTest.class);
-		addTestSuite(TextWrapperTest.class);
-		addTestSuite(TestBlockElementBox.class);
-		addTestSuite(TestBlocksInInlines.class);
-		addTestSuite(TestDocumentTextBox.class);
-		addTestSuite(TestStaticTextBox.class);
-		addTestSuite(TableLayoutTest.class);
-		addTestSuite(ListenerListTest.class);
-		addTest(new JUnit4TestAdapter(VexWidgetTest.class));
-	}
-}
diff --git a/org.eclipse.vex.core/META-INF/MANIFEST.MF b/org.eclipse.vex.core/META-INF/MANIFEST.MF
index 1205d5d..eb936d5 100644
--- a/org.eclipse.vex.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.core/META-INF/MANIFEST.MF
@@ -15,18 +15,18 @@
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.1,3.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.wst.xml.vex.core.internal;x-friends:="org.eclipse.wst.xml.vex.ui",
- org.eclipse.wst.xml.vex.core.internal.core;x-friends:="org.eclipse.wst.xml.vex.ui,org.eclipse.vex.core.tests",
- org.eclipse.wst.xml.vex.core.internal.css;x-friends:="org.eclipse.wst.xml.vex.ui,org.eclipse.vex.core.tests",
- org.eclipse.wst.xml.vex.core.internal.dom;x-friends:="org.eclipse.wst.xml.vex.ui,org.eclipse.vex.core.tests",
- org.eclipse.wst.xml.vex.core.internal.layout;x-friends:="org.eclipse.wst.xml.vex.ui,org.eclipse.vex.core.tests",
- org.eclipse.wst.xml.vex.core.internal.undo;x-internal:=true,
- org.eclipse.wst.xml.vex.core.internal.validator;x-friends:="org.eclipse.wst.xml.vex.ui",
- org.eclipse.wst.xml.vex.core.internal.widget;x-friends:="org.eclipse.wst.xml.vex.ui,org.eclipse.vex.core.tests",
+Export-Package: org.eclipse.vex.core.internal;x-friends:="org.eclipse.vex.ui",
+ org.eclipse.vex.core.internal.core;x-friends:="org.eclipse.vex.ui,org.eclipse.vex.core.tests",
+ org.eclipse.vex.core.internal.css;x-friends:="org.eclipse.vex.ui,org.eclipse.vex.core.tests",
+ org.eclipse.vex.core.internal.dom;x-friends:="org.eclipse.vex.ui,org.eclipse.vex.core.tests",
+ org.eclipse.vex.core.internal.layout;x-friends:="org.eclipse.vex.ui,org.eclipse.vex.core.tests",
+ org.eclipse.vex.core.internal.undo;x-internal:=true,
+ org.eclipse.vex.core.internal.validator;x-friends:="org.eclipse.vex.ui",
+ org.eclipse.vex.core.internal.widget;x-friends:="org.eclipse.vex.ui,org.eclipse.vex.core.tests",
  org.w3c.flute.parser,
  org.w3c.flute.parser.selectors,
  org.w3c.flute.util
-Bundle-Activator: org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin
+Bundle-Activator: org.eclipse.vex.core.internal.VEXCorePlugin
 Bundle-Localization: plugin
 Bundle-ClassPath: lib/flute.jar,
  .
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/VEXCorePlugin.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/VEXCorePlugin.java
index e70e648..95a55a4 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/VEXCorePlugin.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     David Carver (STAR) - initial renaming
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal;
+package org.eclipse.vex.core.internal;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Caret.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Caret.java
index dbb41e2..09ef810 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Caret.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Represents the caret, a line that indicates an insertion point in the
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Color.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Color.java
index d4d01b9..78d717a 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Color.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Toolkit-independent representation of a color. Colors consist of three
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/ColorResource.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/ColorResource.java
index 914173e..a44c37b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/ColorResource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Wrapper for a toolkit-defined color. Color objects are system resources. They
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/DisplayDevice.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/DisplayDevice.java
index c958acb..ede95ea 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/DisplayDevice.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Represents a device that can display graphics. This class is subclassed for
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Drawable.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Drawable.java
index 2ba63d8..af13444 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Drawable.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * An object that can be drawn into a Graphics.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontMetrics.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontMetrics.java
index e46771a..9d198d2 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontMetrics.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Toolkit-independent font metrics.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontResource.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontResource.java
index 037f4da..15e382b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontResource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Wrapper for a toolkit-defined font. Fonts are system-defined resources. They
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontSpec.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontSpec.java
index 8cb4474..1a2059a 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/FontSpec.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Dave Holroyd - Implement text decoration
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Toolkit-independent specifier of a font. This class does not encapsulate an
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Graphics.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Graphics.java
index 4e64962..0d0558e 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Graphics.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Mohamadou Nassourou - Bug 298912 - rudimentary support for images 
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 import java.net.URL;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Image.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Image.java
index f9622eb..c63bc7b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Image.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.core;

+package org.eclipse.vex.core.internal.core;

 

 /**

  * @author Florian Thienel

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Insets.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Insets.java
index d2f762a..5ca6d09 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Insets.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Toolkit-independent insets.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/IntRange.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/IntRange.java
index c680f16..a268b48 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/IntRange.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Represents a range of integers. Zero-length ranges (i.e. ranges where start
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/ListenerList.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/ListenerList.java
index c7eb120..94d03a4 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/ListenerList.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Florian Thienel - generics inferred
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Point.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Point.java
index d3fdd29..fd25bc6 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Point.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Toolkit-independent point.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/QualifiedNameComparator.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/QualifiedNameComparator.java
index 97360f7..8916bcc 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/QualifiedNameComparator.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.core;

+package org.eclipse.vex.core.internal.core;

 

 import java.util.Comparator;

 

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Rectangle.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Rectangle.java
index b996dcb..fca2009 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/core/Rectangle.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.core;
+package org.eclipse.vex.core.internal.core;
 
 /**
  * Toolkit-independent rectangle.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/AbstractProperty.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/AbstractProperty.java
index 31b6662..c00a411 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/AbstractProperty.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import org.w3c.css.sac.LexicalUnit;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BackgroundImageProperty.java
similarity index 90%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BackgroundImageProperty.java
index c79e12b..740ef52 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BackgroundImageProperty.java
@@ -8,14 +8,14 @@
  * Contributors:

  * 		 Mohamadou Nassourou - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.css;

+package org.eclipse.vex.core.internal.css;

 

 import java.text.MessageFormat;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin;

-import org.eclipse.wst.xml.vex.core.internal.dom.Element;

+import org.eclipse.vex.core.internal.VEXCorePlugin;

+import org.eclipse.vex.core.internal.dom.Element;

 import org.w3c.css.sac.LexicalUnit;

 

 /**

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderSpacingProperty.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderSpacingProperty.java
index 9bd90c6..1a58809 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderSpacingProperty.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderStyleProperty.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderStyleProperty.java
index 7865f3a..b9864e9 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderStyleProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderWidthProperty.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderWidthProperty.java
index 884568d..6dc949e 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/BorderWidthProperty.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CSS.java
similarity index 99%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CSS.java
index 88c7a37..40ca7af 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CSS.java
@@ -10,7 +10,7 @@
  *     Dave Holroyd - Implement text decoration
  *     John Austin - More complete CSS constants.  Add the colour "orange".
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 /**
  * CSS constants.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/ColorProperty.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/ColorProperty.java
index 1454d4a..54e5f01 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/ColorProperty.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Color;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/DisplayProperty.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/DisplayProperty.java
index f51a661..894f972 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/DisplayProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontFamilyProperty.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontFamilyProperty.java
index 93b5ae7..d9943c8 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontFamilyProperty.java
@@ -10,12 +10,12 @@
  *     Florian Thienel - bug 304413 - fix immutable array issue.
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontSizeProperty.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontSizeProperty.java
index bd3112b..7fc491c 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontSizeProperty.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontStyleProperty.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontStyleProperty.java
index 8daa8eb..c32095d 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontStyleProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontVariantProperty.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontVariantProperty.java
index 19f1382..6a6b3fc 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontVariantProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontWeightProperty.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontWeightProperty.java
index 2502ff3..32fe788 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/FontWeightProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IProperty.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IProperty.java
index d50ede7..87b4a16 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/LengthProperty.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/LengthProperty.java
index bf76a38..976b6c1 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/LengthProperty.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.io.IOException;
 import java.io.StringReader;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin;
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.VEXCorePlugin;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.InputSource;
 import org.w3c.css.sac.LexicalUnit;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/LineHeightProperty.java
similarity index 91%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/LineHeightProperty.java
index f9173fb..053c259 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/LineHeightProperty.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/ListStyleTypeProperty.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/ListStyleTypeProperty.java
index dcea615..5ca842f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/ListStyleTypeProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/PropertyDecl.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/PropertyDecl.java
index e28b922..0056459 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/PropertyDecl.java
@@ -10,7 +10,7 @@
  *     Florian Thienel - bug 306639 - remove serializability from StyleSheet
  *                       and dependend classes
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import org.w3c.css.sac.LexicalUnit;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/PseudoElement.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/PseudoElement.java
index 0c73081..7173b4f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/PseudoElement.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Represents a :before or :after pseudo-element.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/RelativeLength.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/RelativeLength.java
index d88f4cc..450255b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/RelativeLength.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/Rule.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/Rule.java
index cfd81e0..0bf56c7 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/Rule.java
@@ -12,14 +12,14 @@
  *     Florian Thienel - bug 306639 - remove serializability from StyleSheet
  *                       and dependend classes
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.AttributeCondition;
 import org.w3c.css.sac.CombinatorCondition;
 import org.w3c.css.sac.Condition;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/StyleSheet.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/StyleSheet.java
index 8b6296d..735effa 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/StyleSheet.java
@@ -15,7 +15,7 @@
  *                       and dependend classes
  *     Mohamadou Nassourou - Bug 298912 - rudimentary support for images 
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.FontSpec;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/StyleSheetReader.java
similarity index 99%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/StyleSheetReader.java
index 8255cf3..cfc5d33 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/StyleSheetReader.java
@@ -11,7 +11,7 @@
  *                       and dependend classes
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.io.CharArrayReader;
 import java.io.IOException;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/Styles.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/Styles.java
index 4aa08a2..7adff58 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/Styles.java
@@ -10,14 +10,14 @@
  *     Dave Holroyd - Implement text decoration
  *     Mohamadou Nassourou - Bug 298912 - rudimentary support for images 
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Color;
-import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.FontSpec;
 
 /**
  * Represents the computed style properties for a particular element.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/TextAlignProperty.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/TextAlignProperty.java
index d04bc85..9dc3434 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/TextAlignProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/TextDecorationProperty.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/TextDecorationProperty.java
index d0eb3e3..3744286 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/TextDecorationProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/WhiteSpaceProperty.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/WhiteSpaceProperty.java
index fd98eab..cec05f5 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/WhiteSpaceProperty.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.css;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/package.html b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/package.html
similarity index 100%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/package.html
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/package.html
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Attribute.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Attribute.java
index eeeb99a..6347b62 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Attribute.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.dom;

+package org.eclipse.vex.core.internal.dom;

 

 import org.eclipse.core.runtime.QualifiedName;

 

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Content.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Content.java
index 58e3011..3d3c37f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Content.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java
index 969c15a..3097698 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Document.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.xml.vex.core.internal.core.ListenerList;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
+import org.eclipse.vex.core.internal.core.ListenerList;
+import org.eclipse.vex.core.internal.undo.CannotRedoException;
+import org.eclipse.vex.core.internal.undo.CannotUndoException;
+import org.eclipse.vex.core.internal.undo.IUndoableEdit;
 
 /**
  * Represents an XML document.
@@ -77,8 +77,8 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#addDocumentListener
-	 * (org.eclipse.wst.xml.vex.core.internal.dom.DocumentListener)
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#addDocumentListener
+	 * (org.eclipse.vex.core.internal.dom.DocumentListener)
 	 */
 	public void addDocumentListener(final DocumentListener listener) {
 		listeners.add(listener);
@@ -88,8 +88,8 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#canInsertFragment
-	 * (int, org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment)
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#canInsertFragment
+	 * (int, org.eclipse.vex.core.internal.dom.DocumentFragment)
 	 */
 	public boolean canInsertFragment(final int offset, final DocumentFragment fragment) {
 		if (validator == null)
@@ -265,7 +265,7 @@
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getNodes(int,
+	 * @see org.eclipse.vex.core.internal.dom.IVEXDocument#getNodes(int,
 	 * int)
 	 */
 	public List<Node> getNodes(final int startOffset, final int endOffset) {
@@ -331,7 +331,7 @@
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getPublicID()
+	 * @see org.eclipse.vex.core.internal.dom.IVEXDocument#getPublicID()
 	 */
 	public String getPublicID() {
 		return publicID;
@@ -341,7 +341,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#getRawText(int,
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#getRawText(int,
 	 * int)
 	 */
 	public String getRawText(final int startOffset, final int endOffset) {
@@ -512,7 +512,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#isUndoEnabled()
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#isUndoEnabled()
 	 */
 	public boolean isUndoEnabled() {
 		return undoEnabled;
@@ -522,8 +522,8 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#removeDocumentListener
-	 * (org.eclipse.wst.xml.vex.core.internal.dom.DocumentListener)
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#removeDocumentListener
+	 * (org.eclipse.vex.core.internal.dom.DocumentListener)
 	 */
 	public void removeDocumentListener(final DocumentListener listener) {
 		listeners.remove(listener);
@@ -533,7 +533,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#setPublicID(java
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#setPublicID(java
 	 * .lang.String)
 	 */
 	public void setPublicID(final String publicID) {
@@ -544,7 +544,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#setSystemID(java
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#setSystemID(java
 	 * .lang.String)
 	 */
 	public void setSystemID(final String systemID) {
@@ -555,7 +555,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#setUndoEnabled
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#setUndoEnabled
 	 * (boolean)
 	 */
 	public void setUndoEnabled(final boolean undoEnabled) {
@@ -566,8 +566,8 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocument#setValidator(org
-	 * .eclipse.wst.xml.vex.core.internal.dom.Validator)
+	 * org.eclipse.vex.core.internal.dom.IVEXDocument#setValidator(org
+	 * .eclipse.vex.core.internal.dom.Validator)
 	 */
 	public void setValidator(final Validator validator) {
 		this.validator = validator;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentBuilder.java
similarity index 99%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentBuilder.java
index 9a13e8f..20ed0ab 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentBuilder.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.LinkedList;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentEvent.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentEvent.java
index 26416db..7b21550 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentEvent.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.EventObject;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
+import org.eclipse.vex.core.internal.undo.IUndoableEdit;
 
 /**
  * Encapsulation of the details of a document change
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java
index f2aacee..902d5d1 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentFragment.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -55,7 +55,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getContent
+	 * org.eclipse.vex.core.internal.dom.IVEXDocumentFragment#getContent
 	 * ()
 	 */
 	public Content getContent() {
@@ -66,7 +66,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getLength
+	 * org.eclipse.vex.core.internal.dom.IVEXDocumentFragment#getLength
 	 * ()
 	 */
 	public int getLength() {
@@ -77,7 +77,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getElements
+	 * org.eclipse.vex.core.internal.dom.IVEXDocumentFragment#getElements
 	 * ()
 	 */
 	public List<Element> getElements() {
@@ -88,7 +88,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getNodeNames
+	 * org.eclipse.vex.core.internal.dom.IVEXDocumentFragment#getNodeNames
 	 * ()
 	 */
 	public List<QualifiedName> getNodeNames() {
@@ -107,7 +107,7 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.dom.IVEXDocumentFragment#getNodes()
+	 * org.eclipse.vex.core.internal.dom.IVEXDocumentFragment#getNodes()
 	 */
 	public List<Node> getNodes() {
 		return Document.createNodeList(getContent(), 0, getContent().getLength(), getNodes(getElements()));
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentListener.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentListener.java
index 8776b36..cc9314a 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 /**
  * Receives notifications of document changes.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentReader.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentReader.java
index a94975c..a54bdea 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentReader.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.io.CharArrayReader;
 import java.io.IOException;
@@ -93,7 +93,7 @@
 		final XMLReader xmlReader = factory.newSAXParser().getXMLReader();
 		// xmlReader.setFeature("http://xml.org/sax/features/validation",
 		// false);
-		final org.eclipse.wst.xml.vex.core.internal.dom.DocumentBuilder builder = new org.eclipse.wst.xml.vex.core.internal.dom.DocumentBuilder(
+		final org.eclipse.vex.core.internal.dom.DocumentBuilder builder = new org.eclipse.vex.core.internal.dom.DocumentBuilder(
 				getWhitespacePolicyFactory());
 
 		ContentHandler contentHandler = builder;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentValidationException.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentValidationException.java
index fe613b1..d12183b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentValidationException.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 /**
  * Exception thrown when an change would have compromised document validity.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentWriter.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentWriter.java
index bf57aec..a0bba0f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/DocumentWriter.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
+import org.eclipse.vex.core.internal.validator.AttributeDefinition;
 
 /**
  * Writes a document to an output stream, using a stylesheet to provide
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java
index b9293b0..5640308 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Element.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,10 +21,10 @@
 import java.util.Map.Entry;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.core.QualifiedNameComparator;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
+import org.eclipse.vex.core.internal.core.QualifiedNameComparator;
+import org.eclipse.vex.core.internal.undo.CannotRedoException;
+import org.eclipse.vex.core.internal.undo.CannotUndoException;
+import org.eclipse.vex.core.internal.undo.IUndoableEdit;
 
 /**
  * Represents a tag in an XML document. Methods are
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java
index e6b6a17..01a29ea 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/GapContent.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/IWhitespacePolicy.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/IWhitespacePolicy.java
index ccc9c2f..3b56f94 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/IWhitespacePolicy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 /**
  * Determines whitespace policy for document elements. For example, a CSS
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/IWhitespacePolicyFactory.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/IWhitespacePolicyFactory.java
index 6476cfd..035b300 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/IWhitespacePolicyFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Namespace.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Namespace.java
index 664cd0e..04dc51f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Namespace.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.dom;

+package org.eclipse.vex.core.internal.dom;

 

 /**

  * @author Florian Thienel

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/NamespaceStack.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/NamespaceStack.java
index 740202d..e02c008 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/NamespaceStack.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.dom;

+package org.eclipse.vex.core.internal.dom;

 

 import java.util.ArrayList;

 import java.util.Collection;

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java
index 8caaf2f..a46e934 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Node.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 /**
  * <code>Node</code> represents a component of an XML document. .
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Position.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Position.java
index 4d5c931..c493be5 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Position.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 /**
  * Represents a logical location in a document. As the document is modified,
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/RootElement.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/RootElement.java
index 458dc32..ad3cae4 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/RootElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import org.eclipse.core.runtime.QualifiedName;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java
index 187f845..3611d06 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Text.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 /**
  * <code>Text</code> represents a run of text in a document. Text objects are
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/TextWrapper.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/TextWrapper.java
index 4dc19e4..499d232 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/TextWrapper.java
@@ -10,7 +10,7 @@
  *     David Carver unit tests fixes
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Validator.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Validator.java
index d52ca1d..3567b92 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/Validator.java
@@ -9,13 +9,13 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
+package org.eclipse.vex.core.internal.dom;
 
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
+import org.eclipse.vex.core.internal.validator.AttributeDefinition;
 
 /**
  * Represents an object that can validate the structure of a document.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/package.html b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/package.html
similarity index 100%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/package.html
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/dom/package.html
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractBlockBox.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractBlockBox.java
index 57b1645..f223679 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractBlockBox.java
@@ -9,26 +9,26 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-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.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Position;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Position;
 
 /**
  * Base class of block boxes that can contain other block boxes. This class
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractBox.java
similarity index 87%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractBox.java
index 9f057c7..d69057c 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractBox.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-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.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Base implementation of the <code>Box</code> interface, implementing some
@@ -43,7 +43,7 @@
 	 * Returns true if the given offset is between startOffset and endOffset,
 	 * inclusive.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#containsOffset(int)
+	 * @see org.eclipse.vex.core.internal.layout.Box#containsOffset(int)
 	 */
 	public boolean containsOffset(int offset) {
 		return offset >= this.getStartOffset() && offset <= this.getEndOffset();
@@ -53,7 +53,7 @@
 	 * Throws <code>IllegalStateException</code>. Boxes with content must
 	 * provide an implementation of this method.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getCaret(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#getCaret(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int)
 	 */
 	public Caret getCaret(LayoutContext context, int offset) {
@@ -63,7 +63,7 @@
 	/**
 	 * Returns an empty array of children.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getChildren()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getChildren()
 	 */
 	public Box[] getChildren() {
 		return EMPTY_BOX_ARRAY;
@@ -73,7 +73,7 @@
 	 * Returns null. Boxes associated with elements must provide an
 	 * implementation of this method.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getElement()
 	 */
 	public Element getElement() {
 		return null;
@@ -83,7 +83,7 @@
 	 * Throws <code>IllegalStateException</code>. Boxes with content must
 	 * provide an implementation of this method.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getEndOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getEndOffset()
 	 */
 	public int getEndOffset() {
 		throw new IllegalStateException();
@@ -92,7 +92,7 @@
 	/**
 	 * Returns the height set with <code>setHeight</code>.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getHeight()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getHeight()
 	 */
 	public int getHeight() {
 		return this.height;
@@ -102,7 +102,7 @@
 	 * Throws <code>IllegalStateException</code>. Boxes with content must
 	 * provide an implementation of this method.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getStartOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getStartOffset()
 	 */
 	public int getStartOffset() {
 		throw new IllegalStateException();
@@ -134,7 +134,7 @@
 	 * <li>{@link Box#viewToModel}</li>
 	 * </ul>
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#hasContent()
+	 * @see org.eclipse.vex.core.internal.layout.Box#hasContent()
 	 */
 	public boolean hasContent() {
 		return false;
@@ -147,7 +147,7 @@
 	/**
 	 * Returns the width set with <code>setWidth</code>.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getWidth()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getWidth()
 	 */
 	public int getWidth() {
 		return this.width;
@@ -156,7 +156,7 @@
 	/**
 	 * Returns the value set with <code>setX</code>.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getX()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getX()
 	 */
 	public int getX() {
 		return this.x;
@@ -165,7 +165,7 @@
 	/**
 	 * Returns the value set with <code>setY</code>.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getY()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getY()
 	 */
 	public int getY() {
 		return this.y;
@@ -174,7 +174,7 @@
 	/**
 	 * Paint all children of this box.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#paint(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#paint(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public void paint(LayoutContext context, int x, int y) {
@@ -241,7 +241,7 @@
 	 * Throws <code>IllegalStateException</code>. Boxes with content must
 	 * provide an implementation of this method.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#viewToModel(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#viewToModel(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public int viewToModel(LayoutContext context, int x, int y) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractInlineBox.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractInlineBox.java
index ef9c5b6..9a6b87a 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AbstractInlineBox.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.core.internal.layout;

+package org.eclipse.vex.core.internal.layout;

 

 /**

  * @author Florian Thienel

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AnonymousBlockBox.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AnonymousBlockBox.java
index 5021f0d..d10d5da 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/AnonymousBlockBox.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.List;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockBox.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockBox.java
index 7787476..1e869d7 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockBox.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.core.IntRange;
 
 /**
  * Represents a block box. Block boxes are stacked one on top of another.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockElementBox.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockElementBox.java
index df4f661..c4f7301 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockElementBox.java
@@ -10,19 +10,19 @@
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *     Mohamadou Nassourou - Bug 298912 - rudimentary support for images 
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin;
-import org.eclipse.wst.xml.vex.core.internal.core.Drawable;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.VEXCorePlugin;
+import org.eclipse.vex.core.internal.core.Drawable;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * A block box corresponding to a DOM Element. Block boxes lay their children
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockPseudoElementBox.java
similarity index 75%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockPseudoElementBox.java
index cc23b54..53d3831 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BlockPseudoElementBox.java
@@ -9,13 +9,13 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Implements a Block
@@ -62,42 +62,42 @@
 	/**
 	 * Provide children for {@link AbstractBox#paint}.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getChildren()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getChildren()
 	 */
 	public Box[] getChildren() {
 		return new Box[] { this.para };
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getElement()
 	 */
 	public Element getElement() {
 		return this.pseudoElement;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getFirstLine()
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getFirstLine()
 	 */
 	public LineBox getFirstLine() {
 		throw new IllegalStateException();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getLastLine()
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getLastLine()
 	 */
 	public LineBox getLastLine() {
 		throw new IllegalStateException();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getLineEndOffset(int)
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getLineEndOffset(int)
 	 */
 	public int getLineEndOffset(int offset) {
 		throw new IllegalStateException();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getLineStartOffset(int)
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getLineStartOffset(int)
 	 */
 	public int getLineStartOffset(int offset) {
 		throw new IllegalStateException();
@@ -112,7 +112,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getNextLineOffset(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getNextLineOffset(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public int getNextLineOffset(LayoutContext context, int offset, int x) {
@@ -127,7 +127,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getPreviousLineOffset(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getPreviousLineOffset(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public int getPreviousLineOffset(LayoutContext context, int offset, int x) {
@@ -146,7 +146,7 @@
 	/**
 	 * Draw boxes before painting our child.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#paint(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#paint(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public void paint(LayoutContext context, int x, int y) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/Box.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/Box.java
index 8b90c0b..ac8e7ca 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/Box.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Represents a rectangular area in the layout. The height and width of the box
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BoxFactory.java
similarity index 91%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BoxFactory.java
index b2c762c..3362518 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/BoxFactory.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.io.Serializable;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Interface to an object that creates boxes from elements. Implementations of
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/CompositeInlineBox.java
similarity index 87%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/CompositeInlineBox.java
index cbfa82c..ebcb6ce 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/CompositeInlineBox.java
@@ -9,18 +9,18 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.Styles;
 
 /**
  * InlineBox consisting of several children. This is the parent class of
@@ -48,7 +48,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getCaret(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#getCaret(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int)
 	 */
 	public Caret getCaret(LayoutContext context, int offset) {
@@ -99,7 +99,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#split(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#split(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, boolean)
 	 */
 	public Pair split(LayoutContext context, int maxWidth, boolean force) {
@@ -167,7 +167,7 @@
 			InlineBox[] rights);
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#viewToModel(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#viewToModel(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public int viewToModel(LayoutContext context, int x, int y) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/CssBoxFactory.java
similarity index 85%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/CssBoxFactory.java
index 088a6e1..d3fafc3 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/CssBoxFactory.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Implementation of the BoxFactory interface that returns boxes that represent
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/DocumentTextBox.java
similarity index 85%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/DocumentTextBox.java
index 15b5fa9..62aedc6 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/DocumentTextBox.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Text;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Text;
 
 /**
  * A TextBox that gets its text from the document. Represents text which is
@@ -71,7 +71,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getEndOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getEndOffset()
 	 */
 	public int getEndOffset() {
 		if (this.endRelative == -1) {
@@ -82,7 +82,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getStartOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getStartOffset()
 	 */
 	public int getStartOffset() {
 		if (this.startRelative == -1) {
@@ -93,7 +93,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.TextBox#getText()
+	 * @see org.eclipse.vex.core.internal.layout.TextBox#getText()
 	 */
 	public String getText() {
 		Document doc = this.getElement().getDocument();
@@ -101,14 +101,14 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#hasContent()
+	 * @see org.eclipse.vex.core.internal.layout.Box#hasContent()
 	 */
 	public boolean hasContent() {
 		return true;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#paint(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#paint(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public void paint(LayoutContext context, int x, int y) {
@@ -176,7 +176,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.TextBox#splitAt(int)
+	 * @see org.eclipse.vex.core.internal.layout.TextBox#splitAt(int)
 	 */
 	public Pair splitAt(LayoutContext context, int offset) {
 
@@ -205,7 +205,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#viewToModel(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#viewToModel(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public int viewToModel(LayoutContext context, int x, int y) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/DrawableBox.java
similarity index 83%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/DrawableBox.java
index 42f7781..825896f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/DrawableBox.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Drawable;
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.Drawable;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * An inline box that draws a Drawable object. The drawable is drawn relative to
@@ -68,7 +68,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#getBaseline()
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#getBaseline()
 	 */
 	public int getBaseline() {
 		return 0;
@@ -86,7 +86,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#split(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#split(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, boolean)
 	 */
 	public Pair split(LayoutContext context, int maxWidth, boolean force) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ElementOrRangeCallback.java
similarity index 86%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ElementOrRangeCallback.java
index b090cab..e5e3349 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ElementOrRangeCallback.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 
 public interface ElementOrRangeCallback {
 	public void onElement(Element child, String displayStyle);
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/HCaret.java
similarity index 78%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/HCaret.java
index 6e46709..647d7c2 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/HCaret.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-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.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
 
 /**
  * A horizontal caret representing the insertion point between two block boxes.
@@ -47,7 +47,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.core.Caret#getBounds()
+	 * @see org.eclipse.vex.core.internal.core.Caret#getBounds()
 	 */
 	public Rectangle getBounds() {
 		return new Rectangle(this.getX(), this.getY(), this.length, LINE_WIDTH);
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ImageBox.java
similarity index 90%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ImageBox.java
index ad66030..26fe442 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ImageBox.java
@@ -1,11 +1,11 @@
-package org.eclipse.wst.xml.vex.core.internal.layout;

+package org.eclipse.vex.core.internal.layout;

 

 import java.net.URL;

 

-import org.eclipse.wst.xml.vex.core.internal.core.Image;

-import org.eclipse.wst.xml.vex.core.internal.core.Point;

-import org.eclipse.wst.xml.vex.core.internal.css.Styles;

-import org.eclipse.wst.xml.vex.core.internal.dom.Element;

+import org.eclipse.vex.core.internal.core.Image;

+import org.eclipse.vex.core.internal.core.Point;

+import org.eclipse.vex.core.internal.css.Styles;

+import org.eclipse.vex.core.internal.dom.Element;

 

 public class ImageBox extends AbstractInlineBox {

 

diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/InlineBox.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/InlineBox.java
index 2958a51..a8b65ab 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/InlineBox.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 /**
  * Represents an inline box. Inline boxes are the children of line boxes.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/InlineElementBox.java
similarity index 90%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/InlineElementBox.java
index 15755d0..15821a1 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/InlineElementBox.java
@@ -9,21 +9,21 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Drawable;
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Node;
-import org.eclipse.wst.xml.vex.core.internal.dom.Text;
+import org.eclipse.vex.core.internal.core.Drawable;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Node;
+import org.eclipse.vex.core.internal.dom.Text;
 
 /**
  * An inline box that represents an inline element. This box is responsible for
@@ -155,14 +155,14 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#getBaseline()
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#getBaseline()
 	 */
 	public int getBaseline() {
 		return this.baseline;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getChildren()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getChildren()
 	 */
 	public Box[] getChildren() {
 		return this.children;
@@ -176,7 +176,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getEndOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getEndOffset()
 	 */
 	public int getEndOffset() {
 		if (this.lastContentChild == null) {
@@ -187,7 +187,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getStartOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getStartOffset()
 	 */
 	public int getStartOffset() {
 		if (this.firstContentChild == null) {
@@ -200,7 +200,7 @@
 	/**
 	 * Override to paint background and borders.
 	 * 
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.AbstractBox#paint(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.AbstractBox#paint(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public void paint(LayoutContext context, int x, int y) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LayoutContext.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LayoutContext.java
index 84691fc..312c311 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LayoutContext.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -16,11 +16,11 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.VEXCorePlugin;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Encapsulation of all the resources needed to create a box tree. Most
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LayoutUtils.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LayoutUtils.java
index 1dfff84..902ca81 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LayoutUtils.java
@@ -9,19 +9,19 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Node;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Node;
 
 /**
  * Tools for layout and rendering of CSS-styled boxes
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LineBox.java
similarity index 78%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LineBox.java
index f1410f7..d587b4e 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/LineBox.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Represents a line of text and inline images.
@@ -59,7 +59,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#getBaseline()
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#getBaseline()
 	 */
 	public int getBaseline() {
 		return this.baseline;
@@ -70,37 +70,37 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getElement()
 	 */
 	public Element getElement() {
 		return this.element;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getEndOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getEndOffset()
 	 */
 	public int getEndOffset() {
 		return this.lastContentChild.getEndOffset();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getStartOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getStartOffset()
 	 */
 	public int getStartOffset() {
 		return this.firstContentChild.getStartOffset();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#hasContent()
+	 * @see org.eclipse.vex.core.internal.layout.Box#hasContent()
 	 */
 	public boolean hasContent() {
 		return this.firstContentChild != null;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.CompositeInlineBox#split(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
-	 *      org.eclipse.wst.xml.vex.core.internal.layout.InlineBox[],
-	 *      org.eclipse.wst.xml.vex.core.internal.layout.InlineBox[])
+	 * @see org.eclipse.vex.core.internal.layout.CompositeInlineBox#split(org.eclipse.vex.core.internal.layout.LayoutContext,
+	 *      org.eclipse.vex.core.internal.layout.InlineBox[],
+	 *      org.eclipse.vex.core.internal.layout.InlineBox[])
 	 */
 	public Pair split(LayoutContext context, InlineBox[] lefts,
 			InlineBox[] rights) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ParagraphBox.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ParagraphBox.java
index 82c1ddf..7242cf4 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/ParagraphBox.java
@@ -9,16 +9,16 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * A box that wraps inline content into a paragraph.
@@ -157,7 +157,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getCaret(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#getCaret(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int)
 	 */
 	public Caret getCaret(LayoutContext context, int offset) {
@@ -178,7 +178,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getFirstLine()
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getFirstLine()
 	 */
 	public LineBox getFirstLine() {
 		if (this.children.length == 0) {
@@ -189,7 +189,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getLastLine()
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getLastLine()
 	 */
 	public LineBox getLastLine() {
 		if (this.children.length == 0) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/PlaceholderBox.java
similarity index 71%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/PlaceholderBox.java
index 48dd34a..03b2b5b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/PlaceholderBox.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * A zero-width box that represents a single offset in the document.
@@ -64,14 +64,14 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#getBaseline()
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#getBaseline()
 	 */
 	public int getBaseline() {
 		return this.baseline;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#split(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#split(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, boolean)
 	 */
 	public Pair split(LayoutContext context, int maxWidth, boolean force) {
@@ -79,7 +79,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getCaret(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#getCaret(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int)
 	 */
 	public Caret getCaret(LayoutContext context, int offset) {
@@ -87,28 +87,28 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getElement()
 	 */
 	public Element getElement() {
 		return this.element;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getEndOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getEndOffset()
 	 */
 	public int getEndOffset() {
 		return this.element.getStartOffset() + this.relOffset;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getStartOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getStartOffset()
 	 */
 	public int getStartOffset() {
 		return this.element.getStartOffset() + this.relOffset;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#hasContent()
+	 * @see org.eclipse.vex.core.internal.layout.Box#hasContent()
 	 */
 	public boolean hasContent() {
 		return true;
@@ -126,7 +126,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#viewToModel(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#viewToModel(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public int viewToModel(LayoutContext context, int x, int y) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/RootBox.java
similarity index 80%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/RootBox.java
index 1ea4c8d..92f2e44 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/RootBox.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin;
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.VEXCorePlugin;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * A wrapper for the top level <code>BlockElementBox</code> that applies its
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getCaret(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#getCaret(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int)
 	 */
 	public Caret getCaret(LayoutContext context, int offset) {
@@ -65,28 +65,28 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getElement()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getElement()
 	 */
 	public Element getElement() {
 		return this.element;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getEndOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getEndOffset()
 	 */
 	public int getEndOffset() {
 		return this.childBox.getEndOffset();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getFirstLine()
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getFirstLine()
 	 */
 	public LineBox getFirstLine() {
 		return this.childBox.getFirstLine();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.BlockBox#getLastLine()
+	 * @see org.eclipse.vex.core.internal.layout.BlockBox#getLastLine()
 	 */
 	public LineBox getLastLine() {
 		return this.childBox.getLastLine();
@@ -122,7 +122,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getStartOffset()
+	 * @see org.eclipse.vex.core.internal.layout.Box#getStartOffset()
 	 */
 	public int getStartOffset() {
 		return this.childBox.getStartOffset();
@@ -167,8 +167,8 @@
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.wst.xml.vex.core.internal.layout.AbstractBox#viewToModel(
-	 * org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext, int, int)
+	 * org.eclipse.vex.core.internal.layout.AbstractBox#viewToModel(
+	 * org.eclipse.vex.core.internal.layout.LayoutContext, int, int)
 	 */
 	public int viewToModel(LayoutContext context, int x, int y) {
 		return this.childBox.viewToModel(context, x - this.childBox.getX(), y
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/SpaceBox.java
similarity index 82%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/SpaceBox.java
index 90b710d..7a33fe8 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/SpaceBox.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 /**
  * An empty inline box that simply takes up space.
@@ -29,7 +29,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#getBaseline()
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#getBaseline()
 	 */
 	public int getBaseline() {
 		return this.getHeight();
@@ -40,7 +40,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#split(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#split(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, boolean)
 	 */
 	public Pair split(LayoutContext context, int maxWidth, boolean force) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/StaticTextBox.java
similarity index 85%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/StaticTextBox.java
index 00a410c..d7d74f9 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/StaticTextBox.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * A TextBox representing a static string. Represents text which is not editable
@@ -73,21 +73,21 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.TextBox#getText()
+	 * @see org.eclipse.vex.core.internal.layout.TextBox#getText()
 	 */
 	public String getText() {
 		return this.text;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#hasContent()
+	 * @see org.eclipse.vex.core.internal.layout.Box#hasContent()
 	 */
 	public boolean hasContent() {
 		return false;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#paint(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#paint(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, int)
 	 */
 	public void paint(LayoutContext context, int x, int y) {
@@ -128,7 +128,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.TextBox#splitAt(int)
+	 * @see org.eclipse.vex.core.internal.layout.TextBox#splitAt(int)
 	 */
 	public Pair splitAt(LayoutContext context, int offset) {
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableBodyBox.java
similarity index 90%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableBodyBox.java
index 98ba230..c5a5e01 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableBodyBox.java
@@ -9,17 +9,17 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * An anonymous box that contains the table row groups for a table. This box is
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableBox.java
similarity index 94%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableBox.java
index 8824053..f2ac0bb 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableBox.java
@@ -9,19 +9,19 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Box that lays out a table.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableCellBox.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableCellBox.java
index ab56e46..5bd8a32 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableCellBox.java
@@ -9,12 +9,12 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Represents an element with display:table-cell, or a generated, anonymous
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableRowBox.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableRowBox.java
index 88adfb8..f4c278c 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableRowBox.java
@@ -9,14 +9,14 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Box representing a row in a table.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableRowGroupBox.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableRowGroupBox.java
index a92b03d..6f19d1e 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TableRowGroupBox.java
@@ -9,17 +9,17 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Insets;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * Container for TableRowBox objects. May correspond to an element with
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TextBox.java
similarity index 89%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TextBox.java
index 6b21c3f..3aed38b 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TextBox.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.FontSpec;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Element;
 
 /**
  * An inline box containing text. The <code>getText</code> and
@@ -71,14 +71,14 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#getBaseline()
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#getBaseline()
 	 */
 	public int getBaseline() {
 		return this.baseline;
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.Box#getCaret(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.Box#getCaret(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int)
 	 */
 	public Caret getCaret(LayoutContext context, int offset) {
@@ -210,7 +210,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.layout.InlineBox#split(org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext,
+	 * @see org.eclipse.vex.core.internal.layout.InlineBox#split(org.eclipse.vex.core.internal.layout.LayoutContext,
 	 *      int, boolean)
 	 */
 	public Pair split(LayoutContext context, int maxWidth, boolean force) {
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TextCaret.java
similarity index 79%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TextCaret.java
index b1dea06..8b6ec57 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/TextCaret.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.layout;
+package org.eclipse.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-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.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
 
 /**
  * A caret drawn as a vertical line between characters.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/package.html b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/package.html
similarity index 100%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/package.html
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/layout/package.html
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CannotRedoException.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CannotRedoException.java
index 8a382da..e7548c5 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CannotRedoException.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.undo;
+package org.eclipse.vex.core.internal.undo;
 
 /**
  * Thrown when an IUndoableEdit cannot be undone.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CannotUndoException.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CannotUndoException.java
index dd467cf..b4a1492 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CannotUndoException.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.undo;
+package org.eclipse.vex.core.internal.undo;
 
 /**
  * Thrown when an IUndoableEdit cannot be undone.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CompoundEdit.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CompoundEdit.java
index 927a762..b1d0190 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/CompoundEdit.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.undo;
+package org.eclipse.vex.core.internal.undo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/IUndoableEdit.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/IUndoableEdit.java
index 2577354..471476c 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/undo/IUndoableEdit.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.undo;
+package org.eclipse.vex.core.internal.undo;
 
 /**
  * Represents a change to a document (an edit) that can be undone and redone.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/AttributeDefinition.java
similarity index 98%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/AttributeDefinition.java
index 64aa8a9..7a15f6f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/AttributeDefinition.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.validator;
+package org.eclipse.vex.core.internal.validator;
 
 import java.io.ObjectStreamException;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java
index a5fff2c..5de14f9 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java
@@ -11,7 +11,7 @@
  *	  Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *    Florian Thienel - bug 299999 - completed implementation of validation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.validator;
+package org.eclipse.vex.core.internal.validator;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,6 +24,10 @@
 import java.util.Set;
 
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.vex.core.internal.dom.Attribute;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.validator.AttributeDefinition.Type;
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
@@ -40,10 +44,6 @@
 import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.ElementContentComparator;
 import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.ElementPathRecordingResult;
 import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.StringElementContentComparator;
-import org.eclipse.wst.xml.vex.core.internal.dom.Attribute;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition.Type;
 
 public class WTPVEXValidator implements Validator {
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/CssWhitespacePolicy.java
similarity index 80%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/CssWhitespacePolicy.java
index f85791c..fba0686 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/CssWhitespacePolicy.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
 
 /**
  * Implementation of WhitespacePolicy using a CSS stylesheet.
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/HostComponent.java
similarity index 92%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/HostComponent.java
index 3e5a319..ea94821 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/HostComponent.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
 
 /**
  * Callback interface through which VexComponentImpl accesses its host
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IBoxFilter.java
similarity index 88%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IBoxFilter.java
index 4b5fd23..15a4c0f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IBoxFilter.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.Box;
 
 /**
  * Interface implemented by classes that determine whether a Box matches certain
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java
index 58337e8..6dcc319 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java
@@ -8,22 +8,22 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
 import java.io.IOException;
 import java.net.URL;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentFragment;
+import org.eclipse.vex.core.internal.dom.DocumentValidationException;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.BoxFactory;
+import org.eclipse.vex.core.internal.undo.CannotRedoException;
+import org.eclipse.vex.core.internal.undo.CannotUndoException;
 import org.xml.sax.SAXException;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java
similarity index 95%
rename from org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java
index 14163b5..37c1f63 100644
--- a/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java
@@ -11,7 +11,7 @@
  *     Holger Voormann - bug 315914: content assist should only show elements 
  *			valid in the current context
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.widget;
+package org.eclipse.vex.core.internal.widget;
 
 import java.io.IOException;
 import java.net.URL;
@@ -26,37 +26,37 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.xml.vex.core.internal.core.Caret;
-import org.eclipse.wst.xml.vex.core.internal.core.Color;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.core.QualifiedNameComparator;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentEvent;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentListener;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-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.Position;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.core.internal.layout.BlockBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.layout.CssBoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
-import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotRedoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.CannotUndoException;
-import org.eclipse.wst.xml.vex.core.internal.undo.CompoundEdit;
-import org.eclipse.wst.xml.vex.core.internal.undo.IUndoableEdit;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.core.QualifiedNameComparator;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentEvent;
+import org.eclipse.vex.core.internal.dom.DocumentFragment;
+import org.eclipse.vex.core.internal.dom.DocumentListener;
+import org.eclipse.vex.core.internal.dom.DocumentReader;
+import org.eclipse.vex.core.internal.dom.DocumentValidationException;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;
+import org.eclipse.vex.core.internal.dom.Position;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.layout.BlockBox;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.BoxFactory;
+import org.eclipse.vex.core.internal.layout.CssBoxFactory;
+import org.eclipse.vex.core.internal.layout.LayoutContext;
+import org.eclipse.vex.core.internal.layout.RootBox;
+import org.eclipse.vex.core.internal.undo.CannotRedoException;
+import org.eclipse.vex.core.internal.undo.CannotUndoException;
+import org.eclipse.vex.core.internal.undo.CompoundEdit;
+import org.eclipse.vex.core.internal.undo.IUndoableEdit;
 import org.xml.sax.SAXException;
 
 /**
diff --git a/org.eclipse.vex.dita/plugin.xml b/org.eclipse.vex.dita/plugin.xml
index 37c5aa4..b5f1cfc 100644
--- a/org.eclipse.vex.dita/plugin.xml
+++ b/org.eclipse.vex.dita/plugin.xml
@@ -4,19 +4,19 @@
 
 	<!-- Registers DITA-related content types extensions as xml content-->
 	<extension point="org.eclipse.core.contenttype.contentTypes">
-		<content-type id="org.eclipse.wst.xml.vex.ui.dita" name="%contentType.name"
-			base-type="org.eclipse.wst.xml.vex.ui.XmlDocument" file-extensions="dita, ditamap, bookmap, ditaval">
+		<content-type id="org.eclipse.vex.ui.dita" name="%contentType.name"
+			base-type="org.eclipse.vex.ui.XmlDocument" file-extensions="dita, ditamap, bookmap, ditaval">
 		</content-type>
-		<content-type id="org.eclipse.wst.xml.vex.ui.dita.map"
-			name="%contentType.map.name" base-type="org.eclipse.wst.xml.vex.ui.dita.map"
+		<content-type id="org.eclipse.vex.ui.dita.map"
+			name="%contentType.map.name" base-type="org.eclipse.vex.ui.dita.map"
 			file-extensions="ditamap, bookmap">
 		</content-type>
-		<content-type id="org.eclipse.wst.xml.vex.ui.dita.ditaval"
-			name="%contentType.ditaval.name" base-type="org.eclipse.wst.xml.vex.ui.dita.ditaval"
+		<content-type id="org.eclipse.vex.ui.dita.ditaval"
+			name="%contentType.ditaval.name" base-type="org.eclipse.vex.ui.dita.ditaval"
 			file-extensions="ditaval">
 		</content-type>
-		<content-type id="org.eclipse.wst.xml.vex.ui.dita.topic"
-			name="%contentType.topic.name" base-type="org.eclipse.wst.xml.vex.ui.dita.topic"
+		<content-type id="org.eclipse.vex.ui.dita.topic"
+			name="%contentType.topic.name" base-type="org.eclipse.vex.ui.dita.topic"
 			file-extensions="dita">
 		</content-type>
 	</extension>
diff --git a/org.eclipse.vex.docbook/META-INF/MANIFEST.MF b/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
index de6ed32..6dce86d 100644
--- a/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@
  org.eclipse.emf.ecore;bundle-version="[2.4.1,3.0.0)",
  org.eclipse.wst.xml.core
 Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.vex.docbook
+Export-Package: org.eclipse.vex.docbook
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
diff --git a/org.eclipse.vex.docbook/plugin.xml b/org.eclipse.vex.docbook/plugin.xml
index f9b5f87..97f7b9f 100644
--- a/org.eclipse.vex.docbook/plugin.xml
+++ b/org.eclipse.vex.docbook/plugin.xml
@@ -3,8 +3,8 @@
 <plugin>
 
 	<extension point="org.eclipse.core.contenttype.contentTypes">
-		<content-type id="org.eclipse.wst.xml.vex.ui.docbook4_5" name="%contentType.name"
-			base-type="org.eclipse.wst.xml.vex.ui.XmlDocument" file-extensions="xml, docbook">
+		<content-type id="org.eclipse.vex.ui.docbook4_5" name="%contentType.name"
+			base-type="org.eclipse.vex.ui.XmlDocument" file-extensions="xml, docbook">
 		</content-type>
 	</extension>
  <extension
@@ -24,7 +24,7 @@
          name="%doctype.docbook4_5"
          point="org.eclipse.vex.ui.doctypes">
       <doctype
-            outlineProvider="org.eclipse.wst.xml.vex.docbook.DocBookOutlineProvider"
+            outlineProvider="org.eclipse.vex.docbook.DocBookOutlineProvider"
             publicId="-//OASIS//DTD DocBook XML V4.5//EN"
             systemId="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
             
diff --git a/org.eclipse.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java b/org.eclipse.vex.docbook/src/org/eclipse/vex/docbook/DocBookOutlineProvider.java
similarity index 96%
rename from org.eclipse.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
rename to org.eclipse.vex.docbook/src/org/eclipse/vex/docbook/DocBookOutlineProvider.java
index 151c300..cad74d2 100644
--- a/org.eclipse.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
+++ b/org.eclipse.vex.docbook/src/org/eclipse/vex/docbook/DocBookOutlineProvider.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.docbook;
+package org.eclipse.vex.docbook;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -20,10 +20,10 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
-import org.eclipse.wst.xml.vex.ui.internal.outline.IOutlineProvider;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.ui.internal.outline.IOutlineProvider;
 
 /**
  * Provides an outline of the sections of a DocBook document.
diff --git a/org.eclipse.vex.releng/Vex.launch b/org.eclipse.vex.releng/Vex.launch
index ed05438..c577946 100644
--- a/org.eclipse.vex.releng/Vex.launch
+++ b/org.eclipse.vex.releng/Vex.launch
@@ -11,7 +11,7 @@
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Vex Development (1)"/>
 <booleanAttribute key="default" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.wst.xml.vex.core.tests,org.eclipse.wst.xml.vex.ui.tests,org.eclipse.wst.xml.vex.tests,org.eclipse.test,ft.vex.development"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.vex.core.tests,org.eclipse.vex.ui.tests,org.eclipse.vex.tests,org.eclipse.test,ft.vex.development"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-vex"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
@@ -20,7 +20,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <stringAttribute key="selected_target_plugins" value="org.eclipse.emf.ecore.change*2.5.0.v200906151043@default:default,org.eclipse.team.core*3.5.1.r35x_20100113-0800@default:default,org.eclipse.team.ui*3.5.0.I20090430-0408@default:default,org.eclipse.core.databinding.property*1.2.0.M20090819-0800@default:default,org.eclipse.update.configurator*3.3.0.v20090312@3:true,org.eclipse.wst.dtd.core*1.1.300.v200904181727@default:default,org.eclipse.ant.core*3.2.101.v20091110_r352@default:default,javax.xml*1.3.4.v201005080400@default:default,org.eclipse.osgi*3.5.2.R35x_v20100126@-1:true,org.eclipse.equinox.preferences*3.2.301.R35x_v20091117@default:default,org.eclipse.equinox.p2.core*1.0.101.R35x_v20090819@default:default,org.eclipse.wst.common.emfworkbench.integration*1.1.301.v200908101600@default:default,org.eclipse.wst.common.uriresolver*1.1.301.v200805140415@default:default,org.eclipse.compare.core*3.5.0.I20090430-0408@default:default,org.eclipse.ui.navigator*3.4.2.M20100120-0800@default:default,javax.activation*1.1.0.v201005080500@default:default,org.eclipse.update.ui*3.2.201.R35x_v20090813@default:default,javax.servlet*2.5.0.v200910301333@default:default,org.eclipse.jface*3.5.2.M20100120-0800@default:default,org.eclipse.ltk.ui.refactoring*3.4.101.r352_v20100209@default:default,org.eclipse.equinox.app*1.2.1.R35x_v20091203@default:default,org.eclipse.wst.common.core*1.1.201.v200806010600@default:default,org.eclipse.core.jobs*3.4.100.v20090429-1800@default:default,org.eclipse.help*3.4.1.v20090805_35x@default:default,org.eclipse.jface.text*3.5.2.r352_v20091118-0800@default:default,org.eclipse.core.variables*3.2.200.v20090521@default:default,org.eclipse.update.core*3.2.300.v20090525@default:default,org.eclipse.ltk.core.refactoring*3.5.0.v20090513-2000@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ui.intro*3.3.2.v20100111_35x@default:default,org.slf4j.api@default:default,org.eclipse.wst.common.environment*1.0.301.v200908101600@default:default,org.eclipse.equinox.concurrent*1.0.1.R35x_v20100209@default:default,org.eclipse.core.net.win32.x86_64*1.0.0.I20090306-1030@default:false,org.eclipse.ui.views*3.4.1.M20090826-0800@default:default,org.eclipse.emf.ecore*2.5.0.v200906151043@default:default,org.apache.xerces*2.9.0.v200909240008@default:default,org.eclipse.jface.databinding*1.3.1.M20090826-0800@default:default,org.eclipse.wst.common.emf*1.1.301.v200908181930@default:default,org.eclipse.core.commands*3.5.0.I20090525-2000@default:default,org.eclipse.ui.navigator.resources*3.4.1.M20090826-0800@default:default,com.ibm.icu*4.0.1.v20090822@default:default,org.eclipse.emf.common*2.5.0.v200906151043@default:default,org.eclipse.equinox.http.jetty*2.0.0.v20090520-1800@default:default,org.eclipse.ui.cheatsheets*3.3.200.v20090526@default:default,org.eclipse.swt.win32.win32.x86_64*3.5.2.v3557f@default:false,org.eclipse.jem.util*2.0.201.v201001252130@default:default,org.eclipse.core.net*1.2.1.r35x_20090812-1200@default:default,org.eclipse.core.runtime.compatibility*3.2.0.v20090413@default:default,org.eclipse.ui.ide*3.5.2.M20100113-0800@default:default,org.eclipse.ecf*3.0.0.v20090831-1906@default:default,org.eclipse.text*3.5.0.v20090513-2000@default:default,ch.qos.logback.core@default:default,org.eclipse.equinox.security*1.0.100.v20090520-1800@default:default,org.eclipse.emf.edit*2.5.0.v200906151043@default:default,org.eclipse.equinox.p2.metadata*1.0.101.R35x_v20100112@default:default,javax.mail.glassfish@default:default,org.eclipse.debug.core*3.5.1.v20091103_r352@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.console*3.4.0.v20090513@default:default,org.apache.xml.serializer*2.7.1.v200902170519@default:default,org.eclipse.platform*3.3.202.v201002111343@default:default,org.eclipse.ui.forms*3.4.1.v20090714_35x@default:default,org.eclipse.search*3.5.1.r351_v20090708-0800@default:default,org.eclipse.ecf.provider.filetransfer*3.0.1.v20090831-1906@default:default,org.eclipse.equinox.p2.jarprocessor*1.0.100.v20090520-1905@default:default,org.apache.ant*1.7.1.v20090120-1145@default:default,org.eclipse.ecf.provider.filetransfer.ssl*1.0.0.v20090831-1906@default:false,org.eclipse.osgi.services*3.2.0.v20090520-1800@default:default,org.w3c.css.sac*1.3.1.v200903091627@default:default,org.mortbay.jetty.util*6.1.15.v200905182336@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.ecf.identity*3.0.0.v20090831-1906@default:default,org.eclipse.equinox.p2.metadata.repository*1.0.101.R35x_v20090812@default:default,org.eclipse.ui.editors*3.5.0.v20090527-2000@default:default,org.eclipse.ecf.ssl*1.0.0.v20090831-1906@default:false,org.eclipse.core.filesystem*1.2.1.R35x_v20091203-1235@default:default,org.mortbay.jetty.server*6.1.15.v200905151201@default:default,org.eclipse.ui.workbench.texteditor*3.5.1.r352_v20100105@default:default,org.eclipse.update.core.win32*3.2.100.v20080107@default:false,org.eclipse.wst.common.project.facet.core*1.4.1.v200911141735@default:default,org.eclipse.compare*3.5.2.r35x_20100113-0800@default:default,org.eclipse.ui.views.properties.tabbed*3.5.0.I20090429-1800@default:default,org.eclipse.equinox.registry*3.4.100.v20090520-1800@default:default,org.eclipse.debug.ui*3.5.2.v20091028_r352@default:default,org.eclipse.help.base*3.4.0.v201002111343@default:default,org.eclipse.ui.intro.universal*3.2.300.v20090526@default:default,org.eclipse.wst.common.frameworks*1.1.300.v200904160730@default:default,org.eclipse.core.runtime*3.5.0.v20090525@default:true,org.eclipse.osgi.util*3.2.0.v20090520-1800@default:default,org.eclipse.core.runtime.compatibility.registry*3.2.200.v20090429-1800@default:false,org.eclipse.ecf.filetransfer*3.0.0.v20090831-1906@default:default,org.eclipse.equinox.http.servlet*1.0.200.v20090520-1800@default:default,org.eclipse.core.resources*3.5.2.R35x_v20091203-1235@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.wst.sse.core*1.1.402.v201001251516@default:default,org.apache.jasper*5.5.17.v200903231320@default:default,org.eclipse.wst.xml.ui*1.1.2.v201001222130@default:default,org.eclipse.core.databinding*1.2.0.M20090819-0800@default:default,org.eclipse.wst.validation*1.2.104.v200911120201@default:default,org.junit*3.8.2.v20090203-1005@default:default,org.apache.commons.el*1.0.0.v200806031608@default:default,org.eclipse.equinox.p2.repository*1.0.1.v20090901-1041@default:default,org.eclipse.ui.ide.application*1.0.101.M20090826-0800@default:default,org.eclipse.emf.ecore.edit*2.5.0.v200906151043@default:default,org.eclipse.help.ui*3.4.1.v20090819_35x@default:default,org.eclipse.equinox.p2.engine*1.0.102.R35x_v20091117@default:default,org.eclipse.core.runtime.compatibility.auth*3.2.100.v20090413@default:default,org.eclipse.wst.common.ui*1.1.402.v200901262305@default:default,org.eclipse.ui.workbench*3.5.2.M20100113-0800@default:default,org.eclipse.core.contenttype*3.4.1.R35x_v20090826-0451@default:default,org.apache.xml.resolver*1.2.0.v200902170519@default:default,javax.servlet.jsp@default:default,org.eclipse.core.resources.compatibility*3.4.1.R35x_v20100113-0530@default:false,org.eclipse.core.filesystem.win32.x86_64*1.1.0.v20090316-0910@default:false,org.eclipse.wst.sse.ui*1.1.102.v200910200227@default:default,org.eclipse.emf.ecore.xmi*2.5.0.v200906151043@default:default,org.apache.lucene.analysis*1.9.1.v20080530-1600@default:default,org.eclipse.swt*3.5.2.v3557f@default:default,org.eclipse.ui.win32*3.2.100.v20090429-1800@default:false,org.eclipse.wst.xml.core*1.1.402.v201001222130@default:default,org.eclipse.equinox.p2.artifact.repository*1.0.101.R35x_v20090721@default:default,org.eclipse.ui*3.5.2.M20100120-0800@default:default,org.eclipse.equinox.common*3.5.1.R35x_v20090807-1100@2:true,org.apache.lucene*1.9.1.v20080530-1600@default:default,org.eclipse.core.expressions*3.4.101.R35x_v20100209@default:default,org.eclipse.core.databinding.observable*1.2.0.M20090902-0800@default:default,org.eclipse.core.filebuffers*3.5.0.v20090526-2000@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.wst.xml.vex.documentation@default:default,org.eclipse.wst.xml.vex.docbook@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.wst.xml.vex.ui@default:default,org.eclipse.wst.xml.vex@default:default,org.eclipse.wst.xml.vex.dita@default:default,org.eclipse.wst.xml.vex.core@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.vex.documentation@default:default,org.eclipse.vex.docbook@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.vex.ui@default:default,org.eclipse.vex@default:default,org.eclipse.vex.dita@default:default,org.eclipse.vex.core@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.eclipse.vex.releng/build.properties b/org.eclipse.vex.releng/build.properties
index 72f12e8..9f2dee6 100644
--- a/org.eclipse.vex.releng/build.properties
+++ b/org.eclipse.vex.releng/build.properties
@@ -11,8 +11,8 @@
 incubation=-Incubation
 version=0.5.0
 buildType=N
-mainFeatureToBuildID=org.eclipse.wst.xml.vex.feature
-testFeatureToBuildID=org.eclipse.wst.xml.vex_tests.feature
+mainFeatureToBuildID=org.eclipse.vex.feature
+testFeatureToBuildID=org.eclipse.vex.tests.feature
 
 # MUST BE SET #
 JAVA50_HOME=${JAVA_HOME}
diff --git a/org.eclipse.vex.releng/build.xml b/org.eclipse.vex.releng/build.xml
index 4962180..166262c 100644
--- a/org.eclipse.vex.releng/build.xml
+++ b/org.eclipse.vex.releng/build.xml
@@ -102,7 +102,7 @@
          ================================= -->
 	<target name="findbugs" description="Run a find bugs analysis based on a ZIP file contents.">
 		<patternset id="vex">
-			<include name="eclipse/plugins/org.eclipse.wst.xml.vex.*.jar" />
+			<include name="eclipse/plugins/org.eclipse.vex.*.jar" />
 		</patternset>
 		<getFindBugs downloadDir="${writableBuildRoot}/downloads" destDir="${writableBuildRoot}/3rdPartyJars/findbugs" />
 		<extractJarsForAnalysis src="${sdkzipUrl}${zipPrefix}-SDK${incubation}-${buildType}${buildTimestamp}.zip" refid="vex" />
diff --git a/org.eclipse.vex.releng/testing.properties b/org.eclipse.vex.releng/testing.properties
index ebfe2fd..ab85fb0 100644
--- a/org.eclipse.vex.releng/testing.properties
+++ b/org.eclipse.vex.releng/testing.properties
@@ -1,7 +1,7 @@
 #csv list of test plugins to run
-testPluginsToRun=org.eclipse.wst.xml.vex.tests
+testPluginsToRun=org.eclipse.vex.tests
 #,org.eclipse.zest.tests # need an aggregate test suite first!
 
 #map name of test plugin to testsuite class to run
-org.eclipse.wst.xml.vex.tests.suite=org.eclipse.wst.xml.vex.tests.AllTestsSuite
+org.eclipse.vex.tests.suite=org.eclipse.vex.tests.AllTestsSuite
 extraVMargs=-Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc
\ No newline at end of file
diff --git a/org.eclipse.vex.sdk.feature/build.properties b/org.eclipse.vex.sdk.feature/build.properties
index 0f2cf5b..d54b5b6 100644
--- a/org.eclipse.vex.sdk.feature/build.properties
+++ b/org.eclipse.vex.sdk.feature/build.properties
@@ -4,4 +4,4 @@
                eclipse_update_120.jpg,\
                feature.properties
 
-generate.feature@org.eclipse.wst.xml.vex.feature.source=org.eclipse.wst.xml.vex.feature
+generate.feature@org.eclipse.vex.feature.source=org.eclipse.vex.feature
diff --git a/org.eclipse.vex.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.tests/META-INF/MANIFEST.MF
index cf092ee..8d35099 100644
--- a/org.eclipse.vex.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@
 Require-Bundle: org.junit;bundle-version="3.8.1",
  org.eclipse.vex.core.tests;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.vex.ui.tests;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.wst.xml.vex.tests
+Export-Package: org.eclipse.vex.tests
 Bundle-ClassPath: .
diff --git a/org.eclipse.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java b/org.eclipse.vex.tests/src/org/eclipse/vex/tests/AllTestsSuite.java
similarity index 90%
rename from org.eclipse.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java
rename to org.eclipse.vex.tests/src/org/eclipse/vex/tests/AllTestsSuite.java
index 40df2d9..788b721 100644
--- a/org.eclipse.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java
+++ b/org.eclipse.vex.tests/src/org/eclipse/vex/tests/AllTestsSuite.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     David Carver (STAR) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.tests;
+package org.eclipse.vex.tests;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.xml.vex.core.tests.VEXCoreTestSuite;
-import org.eclipse.wst.xml.vex.ui.tests.VexUiTestSuite;
+import org.eclipse.vex.core.tests.VEXCoreTestSuite;
+import org.eclipse.vex.ui.tests.VexUiTestSuite;
 
 /**
  * This class specifies all the bundles of this component that provide a test
diff --git a/org.eclipse.vex.tests/test.xml b/org.eclipse.vex.tests/test.xml
index 9e3f062..f997842 100644
--- a/org.eclipse.vex.tests/test.xml
+++ b/org.eclipse.vex.tests/test.xml
@@ -14,10 +14,10 @@
     
     <property
         name="plugin-name"
-        value="org.eclipse.wst.xml.vex.tests" />
+        value="org.eclipse.vex.tests" />
     <property
         name="classname"
-        value="org.eclipse.wst.xml.vex.tests.AllTestsSuite" />
+        value="org.eclipse.vex.tests.AllTestsSuite" />
     <property
         name="testType"
         value="ui-test" />
diff --git a/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
index 548f66a..f4f8436 100644
--- a/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.vex.ui;bundle-version="0.5.0",
+ org.eclipse.vex.ui;bundle-version="[1.0.0,2.0.0)",
  org.junit;bundle-version="3.8.1",
  org.eclipse.jface.text;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.wst.xml.vex.ui.internal.config.tests;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.editor.tests;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.tests;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.tests
+Export-Package: org.eclipse.vex.ui.internal.config.tests;x-internal:=true,
+ org.eclipse.vex.ui.internal.editor.tests;x-internal:=true,
+ org.eclipse.vex.ui.internal.tests;x-internal:=true,
+ org.eclipse.vex.ui.tests
 Bundle-Localization: plugin
 Bundle-ClassPath: .
diff --git a/org.eclipse.vex.ui.tests/plugin.xml b/org.eclipse.vex.ui.tests/plugin.xml
index 3e3f131..657600e 100644
--- a/org.eclipse.vex.ui.tests/plugin.xml
+++ b/org.eclipse.vex.ui.tests/plugin.xml
@@ -2,8 +2,8 @@
 <?eclipse version="3.4"?>

 <plugin>

 	<extension point="org.eclipse.core.contenttype.contentTypes">

-		<content-type id="org.eclipse.wst.xml.vex.ui.tests" name="%contentType.name"

-			base-type="org.eclipse.wst.xml.vex.ui.XmlDocument" file-extensions="xml">

+		<content-type id="org.eclipse.vex.ui.tests" name="%contentType.name"

+			base-type="org.eclipse.vex.ui.XmlDocument" file-extensions="xml">

 		</content-type>

 	</extension>

  <extension

diff --git a/org.eclipse.vex.ui.tests/pom.xml b/org.eclipse.vex.ui.tests/pom.xml
index 234cafc..8394ec5 100644
--- a/org.eclipse.vex.ui.tests/pom.xml
+++ b/org.eclipse.vex.ui.tests/pom.xml
@@ -23,7 +23,7 @@
 				<configuration>
 					<useUIHarness>true</useUIHarness>
 					<testSuite>org.eclipse.vex.ui.tests</testSuite>
-					<testClass>org.eclipse.wst.xml.vex.ui.tests.VexUiTestSuite</testClass>
+					<testClass>org.eclipse.vex.ui.tests.VexUiTestSuite</testClass>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigLoaderJobTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
similarity index 95%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
index a77d33c..1fdd851 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.config.tests;

+package org.eclipse.vex.ui.internal.config.tests;

 

 import static org.junit.Assert.assertFalse;

 import static org.junit.Assert.assertNotNull;

@@ -20,8 +20,8 @@
 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IResource;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigLoaderJob;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigSource;

+import org.eclipse.vex.ui.internal.config.ConfigLoaderJob;

+import org.eclipse.vex.ui.internal.config.ConfigSource;

 import org.junit.Rule;

 import org.junit.Test;

 import org.junit.rules.TestName;

diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigurationRegistryTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
similarity index 90%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
index 1f4a3c7..18bb810 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.config.tests;

+package org.eclipse.vex.ui.internal.config.tests;

 

 import static org.junit.Assert.assertFalse;

 import static org.junit.Assert.assertNotNull;

@@ -19,13 +19,13 @@
 import java.util.List;

 

 import org.eclipse.core.resources.IProject;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigEvent;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigSource;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigurationLoader;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigurationRegistry;

-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigurationRegistryImpl;

-import org.eclipse.wst.xml.vex.ui.internal.config.IConfigListener;

-import org.eclipse.wst.xml.vex.ui.internal.config.PluginProject;

+import org.eclipse.vex.ui.internal.config.ConfigEvent;

+import org.eclipse.vex.ui.internal.config.ConfigSource;

+import org.eclipse.vex.ui.internal.config.ConfigurationLoader;

+import org.eclipse.vex.ui.internal.config.ConfigurationRegistry;

+import org.eclipse.vex.ui.internal.config.ConfigurationRegistryImpl;

+import org.eclipse.vex.ui.internal.config.IConfigListener;

+import org.eclipse.vex.ui.internal.config.PluginProject;

 import org.junit.After;

 import org.junit.Rule;

 import org.junit.Test;

diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/PluginProjectTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/PluginProjectTest.java
similarity index 94%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/PluginProjectTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/PluginProjectTest.java
index 72ffb9e..d8ed493 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/PluginProjectTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/config/tests/PluginProjectTest.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.config.tests;

+package org.eclipse.vex.ui.internal.config.tests;

 

 import java.io.ByteArrayInputStream;

 import java.io.PrintWriter;

@@ -18,8 +18,8 @@
 import org.eclipse.core.resources.IProjectDescription;

 import org.eclipse.core.resources.ResourcesPlugin;

 import org.eclipse.core.runtime.CoreException;

-import org.eclipse.wst.xml.vex.ui.internal.config.PluginProject;

-import org.eclipse.wst.xml.vex.ui.internal.config.PluginProjectNature;

+import org.eclipse.vex.ui.internal.config.PluginProject;

+import org.eclipse.vex.ui.internal.config.PluginProjectNature;

 

 /**

  * @author Florian Thienel

diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/editor/tests/FindReplaceTargetTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
similarity index 98%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
index f2815e4..7e3fbb2 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Holger Voormann - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.editor.tests;

+package org.eclipse.vex.ui.internal.editor.tests;

 

 import java.util.regex.PatternSyntaxException;

 

 import junit.framework.TestCase;

 

 import org.eclipse.swt.graphics.Point;

-import org.eclipse.wst.xml.vex.ui.internal.editor.AbstractRegExFindReplaceTarget;

+import org.eclipse.vex.ui.internal.editor.AbstractRegExFindReplaceTarget;

 

 @SuppressWarnings("restriction")

 public class FindReplaceTargetTest extends TestCase {

diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/tests/ResourceTrackerTest.java
similarity index 93%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/tests/ResourceTrackerTest.java
index 92bfafa..ce69fe5 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/internal/tests/ResourceTrackerTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.tests;
+package org.eclipse.vex.ui.internal.tests;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/IconTest.java
similarity index 89%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/IconTest.java
index 4051e7a..cfa880e 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/IconTest.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.tests;
+package org.eclipse.vex.ui.tests;
 
-import org.eclipse.wst.xml.vex.ui.internal.Icon;
+import org.eclipse.vex.ui.internal.Icon;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java
similarity index 75%
rename from org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java
index 45051d2..ac10c14 100644
--- a/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java
+++ b/org.eclipse.vex.ui.tests/src/org/eclipse/vex/ui/tests/VexUiTestSuite.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.tests;
+package org.eclipse.vex.ui.tests;
 
 import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.xml.vex.ui.internal.config.tests.ConfigLoaderJobTest;
-import org.eclipse.wst.xml.vex.ui.internal.config.tests.ConfigurationRegistryTest;
-import org.eclipse.wst.xml.vex.ui.internal.editor.tests.FindReplaceTargetTest;
-import org.eclipse.wst.xml.vex.ui.internal.tests.ResourceTrackerTest;
+import org.eclipse.vex.ui.internal.config.tests.ConfigLoaderJobTest;
+import org.eclipse.vex.ui.internal.config.tests.ConfigurationRegistryTest;
+import org.eclipse.vex.ui.internal.editor.tests.FindReplaceTargetTest;
+import org.eclipse.vex.ui.internal.tests.ResourceTrackerTest;
 
 public class VexUiTestSuite extends TestSuite {
 
diff --git a/org.eclipse.vex.ui/META-INF/MANIFEST.MF b/org.eclipse.vex.ui/META-INF/MANIFEST.MF
index df190fa..8699536 100644
--- a/org.eclipse.vex.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xml.vex.ui.internal.VexPlugin
+Bundle-Activator: org.eclipse.vex.ui.internal.VexPlugin
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.vex.ui;singleton:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -21,16 +21,16 @@
  org.eclipse.wst.xml.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.1,3.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.wst.xml.vex.ui.internal;x-friends:="org.eclipse.vex.ui.tests",
- org.eclipse.wst.xml.vex.ui.internal.config;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.editor;x-friends:="org.eclipse.vex.docbook",
- org.eclipse.wst.xml.vex.ui.internal.handlers;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.outline;x-friends:="org.eclipse.vex.docbook",
- org.eclipse.wst.xml.vex.ui.internal.perspective;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.property;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.swt;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.views;x-internal:=true,
- org.eclipse.wst.xml.vex.ui.internal.wizards;x-internal:=true
+Export-Package: org.eclipse.vex.ui.internal;x-friends:="org.eclipse.vex.ui.tests",
+ org.eclipse.vex.ui.internal.config;x-internal:=true,
+ org.eclipse.vex.ui.internal.editor;x-friends:="org.eclipse.vex.docbook",
+ org.eclipse.vex.ui.internal.handlers;x-internal:=true,
+ org.eclipse.vex.ui.internal.outline;x-friends:="org.eclipse.vex.docbook",
+ org.eclipse.vex.ui.internal.perspective;x-internal:=true,
+ org.eclipse.vex.ui.internal.property;x-internal:=true,
+ org.eclipse.vex.ui.internal.swt;x-internal:=true,
+ org.eclipse.vex.ui.internal.views;x-internal:=true,
+ org.eclipse.vex.ui.internal.wizards;x-internal:=true
 ion: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.vex.ui/plugin.properties b/org.eclipse.vex.ui/plugin.properties
index f6ed707..6ac359b 100644
--- a/org.eclipse.vex.ui/plugin.properties
+++ b/org.eclipse.vex.ui/plugin.properties
@@ -40,9 +40,9 @@
 command.addElement.name= Add Element...
 command.duplicateSelection.name= &Duplicate Selection
 command.convertElement.name= Convert Element To...
-# dynamic names for 'Remove Tag' see org.eclipse.wst.xml.vex.ui.internal.editor.messages.properties
+# dynamic names for 'Remove Tag' see org.eclipse.vex.ui.internal.editor.messages.properties
 command.removeTag.name= Remove Tag
-# dynamic names for 'Remove Tag' see org.eclipse.wst.xml.vex.ui.internal.editor.messages.properties
+# dynamic names for 'Remove Tag' see org.eclipse.vex.ui.internal.editor.messages.properties
 command.addRowAbove.name= Add Row Above
 command.addRowBelow.name= Add Row Below
 command.moveRowUp.name= Move Row Up
diff --git a/org.eclipse.vex.ui/plugin.xml b/org.eclipse.vex.ui/plugin.xml
index 998fa90..2bb4fba 100644
--- a/org.eclipse.vex.ui/plugin.xml
+++ b/org.eclipse.vex.ui/plugin.xml
@@ -10,7 +10,7 @@
 		<content-type
         base-type="org.eclipse.core.runtime.xml"
         file-extensions="*.xml"
-        id="org.eclipse.wst.xml.vex.ui.XmlDocument"
+        id="org.eclipse.vex.ui.XmlDocument"
         name="%contentType.XmlDocument.name">
 		</content-type>
 	</extension>
@@ -21,11 +21,11 @@
             name="%VexEditor.name"
             extensions="xml"
             icon="$nl$/vex16.gif"
-            class="org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor"
-            contributorClass="org.eclipse.wst.xml.vex.ui.internal.editor.VexActionBarContributor"
-            id="org.eclipse.wst.xml.vex.ui.VexEditor">
+            class="org.eclipse.vex.ui.internal.editor.VexEditor"
+            contributorClass="org.eclipse.vex.ui.internal.editor.VexActionBarContributor"
+            id="org.eclipse.vex.ui.VexEditor">
          <contentTypeBinding
-               contentTypeId="org.eclipse.wst.xml.vex.ui.XmlDocument">
+               contentTypeId="org.eclipse.vex.ui.XmlDocument">
          </contentTypeBinding>
       </editor>
    </extension>
@@ -35,17 +35,17 @@
          point="org.eclipse.ui.newWizards">
       <category
             name="%NewWizardCategory.name"
-            id="org.eclipse.wst.xml.vex.XMLAuthoringCategory">
+            id="org.eclipse.vex.XMLAuthoringCategory">
       </category>
       <wizard
             name="%NewDocumentWizard.name"
             icon="$nl$/vex16.gif"
-            category="org.eclipse.wst.xml.vex.XMLAuthoringCategory"
-            class="org.eclipse.wst.xml.vex.ui.internal.wizards.NewDocumentWizard"
-            id="org.eclipse.wst.xml.vex.ui.NewDocumentWizard">
+            category="org.eclipse.vex.XMLAuthoringCategory"
+            class="org.eclipse.vex.ui.internal.wizards.NewDocumentWizard"
+            id="org.eclipse.vex.ui.NewDocumentWizard">
          <description>%NewDocumentWizard.desc</description>
          <keywordReference
-               id="org.eclipse.wst.xml.vex.ui.KeywordVex">
+               id="org.eclipse.vex.ui.KeywordVex">
          </keywordReference>
       </wizard>
    </extension>
@@ -54,112 +54,112 @@
       <perspective
             name="%DocumentPerspective.name"
             icon="$nl$/vex16.gif"
-            class="org.eclipse.wst.xml.vex.ui.internal.perspective.DocumentPerspective"
-            id="org.eclipse.wst.xml.vex.ui.DocumentPerspective">
+            class="org.eclipse.vex.ui.internal.perspective.DocumentPerspective"
+            id="org.eclipse.vex.ui.DocumentPerspective">
       </perspective>
    </extension>
    <extension
          point="org.eclipse.ui.contexts">
       <context
             name="%VexEditorContext.name"
-            id="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            id="org.eclipse.vex.ui.VexEditorContext"
             parentId="org.eclipse.ui.textEditorScope">
       </context>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
       <category
-            id="org.eclipse.wst.xml.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.commands.category"
             name="%command.category.name">
       </category>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.AddElementCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.AddElementCommand"
             name="%command.addElement.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.DuplicateSelectionCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.DuplicateSelectionCommand"
             name="%command.duplicateSelection.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.ConvertElementCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.ConvertElementCommand"
             name="%command.convertElement.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.RemoveTagCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.RemoveTagCommand"
             name="%command.removeTag.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.AddRowAboveCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.AddRowAboveCommand"
             name="%command.addRowAbove.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.AddRowBelowCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.AddRowBelowCommand"
             name="%command.addRowBelow.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.MoveRowUpCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.MoveRowUpCommand"
             name="%command.moveRowUp.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.MoveRowDownCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.MoveRowDownCommand"
             name="%command.moveRowDown.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.RemoveRowCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.RemoveRowCommand"
             name="%command.removeRow.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.AddColumnLeftCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.AddColumnLeftCommand"
             name="%command.addColumnLeft.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.AddColumnRightCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.AddColumnRightCommand"
             name="%command.addColumnRight.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.MoveColumnLeftCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.MoveColumnLeftCommand"
             name="%command.moveColumnLeft.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.MoveColumnRightCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.MoveColumnRightCommand"
             name="%command.moveColumnRight.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.RemoveColumnCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.RemoveColumnCommand"
             name="%command.removeColumn.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.PreviousTableCellCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.PreviousTableCellCommand"
             name="%command.previousTableCell.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.NextTableCellCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.NextTableCellCommand"
             name="%command.nextTableCell.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.SplitBlockElementCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.SplitBlockElementCommand"
             name="%command.splitBlockElement.name">
       </command>
       <command
-            categoryId="org.eclipse.wst.xml.vex.ui.commands.category"
-            id="org.eclipse.wst.xml.vex.ui.SplitItemCommand"
+            categoryId="org.eclipse.vex.ui.commands.category"
+            id="org.eclipse.vex.ui.SplitItemCommand"
             name="%command.splitItem.name">
       </command>
       
@@ -167,51 +167,51 @@
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.AddElementCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.AddElementCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M1+SPACE">
       </key>
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.DuplicateSelectionCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.DuplicateSelectionCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="M1+M3+ARROW_DOWN"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
          
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.ConvertElementCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.ConvertElementCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="M1+M3+SPACE"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.NextTableCellCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.NextTableCellCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="TAB"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.PreviousTableCellCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.PreviousTableCellCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="M2+TAB"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.RemoveTagCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.RemoveTagCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="M2+DEL"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.SplitBlockElementCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.SplitBlockElementCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="RETURN"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
       <key
-            commandId="org.eclipse.wst.xml.vex.ui.SplitItemCommand"
-            contextId="org.eclipse.wst.xml.vex.ui.VexEditorContext"
+            commandId="org.eclipse.vex.ui.SplitItemCommand"
+            contextId="org.eclipse.vex.ui.VexEditorContext"
             sequence="M2+RETURN"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>key>
@@ -220,47 +220,47 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.AddElementHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.AddElementCommand">
+            class="org.eclipse.vex.ui.internal.handlers.AddElementHandler"
+            commandId="org.eclipse.vex.ui.AddElementCommand">
          <activeWhen>
             <reference
-                  definitionId="org.eclipse.wst.xml.vex.ui.activeVexEditor">
+                  definitionId="org.eclipse.vex.ui.activeVexEditor">
             </reference>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.DuplicateSelectionHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.DuplicateSelectionCommand">
+            class="org.eclipse.vex.ui.internal.handlers.DuplicateSelectionHandler"
+            commandId="org.eclipse.vex.ui.DuplicateSelectionCommand">
          <activeWhen>
             <reference
-                  definitionId="org.eclipse.wst.xml.vex.ui.activeVexEditor">
+                  definitionId="org.eclipse.vex.ui.activeVexEditor">
             </reference>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.ConvertElementHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.ConvertElementCommand">
+            class="org.eclipse.vex.ui.internal.handlers.ConvertElementHandler"
+            commandId="org.eclipse.vex.ui.ConvertElementCommand">
          <activeWhen>
             <reference
-                  definitionId="org.eclipse.wst.xml.vex.ui.activeVexEditor">
+                  definitionId="org.eclipse.vex.ui.activeVexEditor">
             </reference>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.RemoveTagHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.RemoveTagCommand">
+            class="org.eclipse.vex.ui.internal.handlers.RemoveTagHandler"
+            commandId="org.eclipse.vex.ui.RemoveTagCommand">
          <activeWhen>
             <reference
-                  definitionId="org.eclipse.wst.xml.vex.ui.activeVexEditor">
+                  definitionId="org.eclipse.vex.ui.activeVexEditor">
             </reference>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.AddRowAboveHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.AddRowAboveCommand">
+            class="org.eclipse.vex.ui.internal.handlers.AddRowAboveHandler"
+            commandId="org.eclipse.vex.ui.AddRowAboveCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isRow">
+                  variable="org.eclipse.vex.ui.isRow">
                <equals
                      value="true">
                </equals>
@@ -268,11 +268,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.AddRowBelowHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.AddRowBelowCommand">
+            class="org.eclipse.vex.ui.internal.handlers.AddRowBelowHandler"
+            commandId="org.eclipse.vex.ui.AddRowBelowCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isRow">
+                  variable="org.eclipse.vex.ui.isRow">
                <equals
                      value="true">
                </equals>
@@ -280,18 +280,18 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.MoveRowUpHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.MoveRowUpCommand">
+            class="org.eclipse.vex.ui.internal.handlers.MoveRowUpHandler"
+            commandId="org.eclipse.vex.ui.MoveRowUpCommand">
          <enabledWhen>
             <and>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isRow">
+                     variable="org.eclipse.vex.ui.isRow">
                   <equals
                         value="true">
                   </equals>
                </with>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isFirstRow">
+                     variable="org.eclipse.vex.ui.isFirstRow">
                   <equals
                         value="false">
                   </equals>
@@ -300,18 +300,18 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.MoveRowDownHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.MoveRowDownCommand">
+            class="org.eclipse.vex.ui.internal.handlers.MoveRowDownHandler"
+            commandId="org.eclipse.vex.ui.MoveRowDownCommand">
          <enabledWhen>
             <and>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isRow">
+                     variable="org.eclipse.vex.ui.isRow">
                   <equals
                         value="true">
                   </equals>
                </with>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isLastRow">
+                     variable="org.eclipse.vex.ui.isLastRow">
                   <equals
                         value="false">
                   </equals>
@@ -320,11 +320,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.RemoveRowHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.RemoveRowCommand">
+            class="org.eclipse.vex.ui.internal.handlers.RemoveRowHandler"
+            commandId="org.eclipse.vex.ui.RemoveRowCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isRow">
+                  variable="org.eclipse.vex.ui.isRow">
                <equals
                      value="true">
                </equals>
@@ -332,11 +332,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.AddColumnLeftHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.AddColumnLeftCommand">
+            class="org.eclipse.vex.ui.internal.handlers.AddColumnLeftHandler"
+            commandId="org.eclipse.vex.ui.AddColumnLeftCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isColumn">
+                  variable="org.eclipse.vex.ui.isColumn">
                <equals
                      value="true">
                </equals>
@@ -344,11 +344,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.AddColumnRightHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.AddColumnRightCommand">
+            class="org.eclipse.vex.ui.internal.handlers.AddColumnRightHandler"
+            commandId="org.eclipse.vex.ui.AddColumnRightCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isColumn">
+                  variable="org.eclipse.vex.ui.isColumn">
                <equals
                      value="true">
                </equals>
@@ -356,18 +356,18 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.MoveColumnLeftHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.MoveColumnLeftCommand">
+            class="org.eclipse.vex.ui.internal.handlers.MoveColumnLeftHandler"
+            commandId="org.eclipse.vex.ui.MoveColumnLeftCommand">
          <enabledWhen>
             <and>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isColumn">
+                     variable="org.eclipse.vex.ui.isColumn">
                   <equals
                         value="true">
                   </equals>
                </with>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isFirstColumn">
+                     variable="org.eclipse.vex.ui.isFirstColumn">
                   <equals
                         value="false">
                   </equals>
@@ -376,18 +376,18 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.MoveColumnRightHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.MoveColumnRightCommand">
+            class="org.eclipse.vex.ui.internal.handlers.MoveColumnRightHandler"
+            commandId="org.eclipse.vex.ui.MoveColumnRightCommand">
          <enabledWhen>
             <and>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isColumn">
+                     variable="org.eclipse.vex.ui.isColumn">
                   <equals
                         value="true">
                   </equals>
                </with>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isLastColumn">
+                     variable="org.eclipse.vex.ui.isLastColumn">
                   <equals
                         value="false">
                   </equals>
@@ -396,11 +396,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.RemoveColumnHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.RemoveColumnCommand">
+            class="org.eclipse.vex.ui.internal.handlers.RemoveColumnHandler"
+            commandId="org.eclipse.vex.ui.RemoveColumnCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isColumn">
+                  variable="org.eclipse.vex.ui.isColumn">
                <equals
                      value="true">
                </equals>
@@ -408,11 +408,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.NextTableCellHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.NextTableCellCommand">
+            class="org.eclipse.vex.ui.internal.handlers.NextTableCellHandler"
+            commandId="org.eclipse.vex.ui.NextTableCellCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isRow">
+                  variable="org.eclipse.vex.ui.isRow">
                <equals
                      value="true">
                </equals>
@@ -420,11 +420,11 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.PreviousTableCellHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.PreviousTableCellCommand">
+            class="org.eclipse.vex.ui.internal.handlers.PreviousTableCellHandler"
+            commandId="org.eclipse.vex.ui.PreviousTableCellCommand">
          <enabledWhen>
             <with
-                  variable="org.eclipse.wst.xml.vex.ui.isRow">
+                  variable="org.eclipse.vex.ui.isRow">
                <equals
                      value="true">
                </equals>
@@ -432,32 +432,32 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.SplitBlockElementHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.SplitBlockElementCommand">
+            class="org.eclipse.vex.ui.internal.handlers.SplitBlockElementHandler"
+            commandId="org.eclipse.vex.ui.SplitBlockElementCommand">
       </handler>
       <handler
-            class="org.eclipse.wst.xml.vex.ui.internal.handlers.SplitItemHandler"
-            commandId="org.eclipse.wst.xml.vex.ui.SplitItemCommand">
+            class="org.eclipse.vex.ui.internal.handlers.SplitItemHandler"
+            commandId="org.eclipse.vex.ui.SplitItemCommand">
       </handler>
    </extension>
    <extension
          point="org.eclipse.ui.views">
       <category
             name="%VexViewCategory.name"
-            id="org.eclipse.wst.xml.vex.ui.views.VexViewCategory">
+            id="org.eclipse.vex.ui.views.VexViewCategory">
       </category>
       <view
             name="%DebugView.name"
             icon="$nl$/vex16.gif"
-            category="org.eclipse.wst.xml.vex.ui.views.VexViewCategory"
-            class="org.eclipse.wst.xml.vex.ui.internal.views.DebugView"
-            id="org.eclipse.wst.xml.vex.ui.views.debug">
+            category="org.eclipse.vex.ui.views.VexViewCategory"
+            class="org.eclipse.vex.ui.internal.views.DebugView"
+            id="org.eclipse.vex.ui.views.debug">
       </view>
       <view
-            category="org.eclipse.wst.xml.vex.ui.views.VexViewCategory"
-            class="org.eclipse.wst.xml.vex.ui.internal.config.ConfigurationView"
+            category="org.eclipse.vex.ui.views.VexViewCategory"
+            class="org.eclipse.vex.ui.internal.config.ConfigurationView"
             icon="$nl$/vex16.gif"
-            id="org.eclipse.wst.xml.vex.ui.views.configuration"
+            id="org.eclipse.vex.ui.views.configuration"
             name="%ConfigurationView.name">
       </view>
    </extension>
@@ -467,7 +467,7 @@
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-               class="org.eclipse.wst.xml.vex.ui.internal.config.PluginProjectNature">
+               class="org.eclipse.vex.ui.internal.config.PluginProjectNature">
          </run>
       </runtime>
    </extension>
@@ -475,18 +475,18 @@
          point="org.eclipse.ui.newWizards">
       <category
             name="%NewWizardCategory.name"
-            id="org.eclipse.wst.xml.vex.XMLAuthoringCategory">
+            id="org.eclipse.vex.XMLAuthoringCategory">
       </category>
       <wizard
             name="%NewPluginProjectWizard.name"
             icon="$nl$/icons/vex16.gif"
-            category="org.eclipse.wst.xml.vex.XMLAuthoringCategory"
-            class="org.eclipse.wst.xml.vex.ui.internal.config.NewPluginProjectWizard"
+            category="org.eclipse.vex.XMLAuthoringCategory"
+            class="org.eclipse.vex.ui.internal.config.NewPluginProjectWizard"
             project="true"
-            id="org.eclipse.wst.xml.vex.ui.config.NewPluginProjectWizard">
+            id="org.eclipse.vex.ui.config.NewPluginProjectWizard">
          <description>%NewPluginProjectWizard.desc</description>
          <keywordReference
-               id="org.eclipse.wst.xml.vex.ui.KeywordVex">
+               id="org.eclipse.vex.ui.KeywordVex">
          </keywordReference>
       </wizard>
    </extension>
@@ -496,7 +496,7 @@
          point="org.eclipse.core.resources.builders">
       <builder>
          <run
-               class="org.eclipse.wst.xml.vex.ui.internal.config.PluginProjectBuilder">
+               class="org.eclipse.vex.ui.internal.config.PluginProjectBuilder">
          </run>
       </builder>
    </extension>
@@ -506,8 +506,8 @@
             lightweight="true"
             label="%PluginProjectDecorator.name"
             state="true"
-            class="org.eclipse.wst.xml.vex.ui.internal.config.PluginProjectDecorator"
-            id="org.eclipse.wst.xml.vex.ui.config.vexPluginProjectDecorator">
+            class="org.eclipse.vex.ui.internal.config.PluginProjectDecorator"
+            id="org.eclipse.vex.ui.config.vexPluginProjectDecorator">
          <enablement>
             <objectClass
                   name="org.eclipse.core.resources.IProject">
@@ -515,8 +515,8 @@
          </enablement>
       </decorator>
       <decorator
-            class="org.eclipse.wst.xml.vex.ui.internal.config.BuildProblemDecorator"
-            id="org.eclipse.wst.xml.vex.ui.config.buildProblemDecorator"
+            class="org.eclipse.vex.ui.internal.config.BuildProblemDecorator"
+            id="org.eclipse.vex.ui.config.buildProblemDecorator"
             label="%BuildProblemDecorator.name"
             lightweight="true"
             state="true">
@@ -531,12 +531,12 @@
          point="org.eclipse.ui.propertyPages">
       <page
             name="%DoctypePropertyPage.name"
-            class="org.eclipse.wst.xml.vex.ui.internal.config.DoctypePropertyPage"
+            class="org.eclipse.vex.ui.internal.config.DoctypePropertyPage"
             nameFilter="*.dtd"
-            id="org.eclipse.wst.xml.vex.ui.config.DoctypePropertyPage">
+            id="org.eclipse.vex.ui.config.DoctypePropertyPage">
          <filter
                name="projectNature"
-               value="org.eclipse.wst.xml.vex.ui.pluginNature">
+               value="org.eclipse.vex.ui.pluginNature">
          </filter>
          <enabledWhen>
             <instanceof
@@ -545,13 +545,13 @@
          </enabledWhen>
       </page>
       <page
-            class="org.eclipse.wst.xml.vex.ui.internal.config.StylePropertyPage"
-            id="org.eclipse.wst.xml.vex.ui.config.StylePropertyPage"
+            class="org.eclipse.vex.ui.internal.config.StylePropertyPage"
+            id="org.eclipse.vex.ui.config.StylePropertyPage"
             name="%StylePropertyPage.name"
             nameFilter="*.css">
          <filter
                name="projectNature"
-               value="org.eclipse.wst.xml.vex.ui.pluginNature">
+               value="org.eclipse.vex.ui.pluginNature">
          </filter>
          <enabledWhen>
             <instanceof
@@ -563,35 +563,35 @@
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
-            id="org.eclipse.wst.xml.vex.ui.activeVexEditor">
+            id="org.eclipse.vex.ui.activeVexEditor">
          <or>
             <with
                   variable="activeEditorId">
                <equals
-                     value="org.eclipse.wst.xml.vex.ui.VexEditor">
+                     value="org.eclipse.vex.ui.VexEditor">
                </equals>
             </with>
             <with
                   variable="activeEditorId">
                <equals
-                     value="org.eclipse.wst.xml.vex.ui.VexEditorMultiPage">
+                     value="org.eclipse.vex.ui.VexEditorMultiPage">
                </equals>
             </with>
          </or>
       </definition>
       <definition
-            id="org.eclipse.wst.xml.vex.ui.focusedVexEditor">
+            id="org.eclipse.vex.ui.focusedVexEditor">
          <or>
             <with
                   variable="activePartId">
                <equals
-                     value="org.eclipse.wst.xml.vex.ui.VexEditor">
+                     value="org.eclipse.vex.ui.VexEditor">
                </equals>
             </with>
             <with
                   variable="activePartId">
                <equals
-                     value="org.eclipse.wst.xml.vex.ui.VexEditorMultiPage">
+                     value="org.eclipse.vex.ui.VexEditorMultiPage">
                </equals>
             </with>
          </or>
@@ -600,29 +600,29 @@
    <extension
          point="org.eclipse.ui.services">
       <sourceProvider
-            provider="org.eclipse.wst.xml.vex.ui.internal.editor.DocumentContextSourceProvider">
+            provider="org.eclipse.vex.ui.internal.editor.DocumentContextSourceProvider">
          <variable
-               name="org.eclipse.wst.xml.vex.ui.isColumn"
+               name="org.eclipse.vex.ui.isColumn"
                priorityLevel="workbench">
          </variable>
          <variable
-               name="org.eclipse.wst.xml.vex.ui.isFirstColumn"
+               name="org.eclipse.vex.ui.isFirstColumn"
                priorityLevel="workbench">
          </variable>
          <variable
-               name="org.eclipse.wst.xml.vex.ui.isLastColumn"
+               name="org.eclipse.vex.ui.isLastColumn"
                priorityLevel="workbench">
          </variable>
          <variable
-               name="org.eclipse.wst.xml.vex.ui.isRow"
+               name="org.eclipse.vex.ui.isRow"
                priorityLevel="workbench">
          </variable>
          <variable
-               name="org.eclipse.wst.xml.vex.ui.isFirstRow"
+               name="org.eclipse.vex.ui.isFirstRow"
                priorityLevel="workbench">
          </variable>
          <variable
-               name="org.eclipse.wst.xml.vex.ui.isLastRow"
+               name="org.eclipse.vex.ui.isLastRow"
                priorityLevel="workbench">
          </variable>
       </sourceProvider>
@@ -635,88 +635,88 @@
                label="%menu.Document.name">
             <visibleWhen>
                <reference
-                     definitionId="org.eclipse.wst.xml.vex.ui.activeVexEditor">
+                     definitionId="org.eclipse.vex.ui.activeVexEditor">
                </reference>
             </visibleWhen>
             <menu
                   label="%menu.Add.name">
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.AddElementCommand"
+                     commandId="org.eclipse.vex.ui.AddElementCommand"
                      label="%menu.Add.Element.name">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.AddRowAboveCommand"
+                     commandId="org.eclipse.vex.ui.AddRowAboveCommand"
                      label="%menu.Add.RowAbove.name">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.AddRowBelowCommand"
+                     commandId="org.eclipse.vex.ui.AddRowBelowCommand"
                      label="%menu.Add.RowBelow.name">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.AddColumnLeftCommand"
+                     commandId="org.eclipse.vex.ui.AddColumnLeftCommand"
                      label="%menu.Add.ColumnLeft.name">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.AddColumnRightCommand"
+                     commandId="org.eclipse.vex.ui.AddColumnRightCommand"
                      label="%menu.Add.ColumnRight.name">
                </command>
             </menu>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.DuplicateSelectionCommand">
+                  commandId="org.eclipse.vex.ui.DuplicateSelectionCommand">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.ConvertElementCommand">
+                  commandId="org.eclipse.vex.ui.ConvertElementCommand">
             </command>
             <menu
                   label="%menu.Move.name">
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.MoveRowUpCommand"
+                     commandId="org.eclipse.vex.ui.MoveRowUpCommand"
                      label="%menu.Move.RowUp">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.MoveRowDownCommand"
+                     commandId="org.eclipse.vex.ui.MoveRowDownCommand"
                      label="%menu.Move.RowDown">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.MoveColumnLeftCommand"
+                     commandId="org.eclipse.vex.ui.MoveColumnLeftCommand"
                      label="%menu.Move.ColumnLeft">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.MoveColumnRightCommand"
+                     commandId="org.eclipse.vex.ui.MoveColumnRightCommand"
                      label="%menu.Move.ColumnRight">
                </command>
             </menu>
             <menu
                   label="%menu.Remove.name">
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.RemoveTagCommand">
+                     commandId="org.eclipse.vex.ui.RemoveTagCommand">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.RemoveRowCommand"
+                     commandId="org.eclipse.vex.ui.RemoveRowCommand"
                      label="%menu.Remove.Row.name">
                </command>
                <command
-                     commandId="org.eclipse.wst.xml.vex.ui.RemoveColumnCommand"
+                     commandId="org.eclipse.vex.ui.RemoveColumnCommand"
                      label="%menu.Remove.Column.name">
                </command>
             </menu>
             <separator
-                  name="org.eclipse.wst.xml.vex.ui.popup.style"
+                  name="org.eclipse.vex.ui.popup.style"
                   visible="true">
             </separator>
             <menu
                   label="%menu.Style.name">
                <dynamic
-                     class="org.eclipse.wst.xml.vex.ui.internal.handlers.StyleMenu"
-                     id="org.eclipse.wst.xml.vex.ui.StyleMenu">
+                     class="org.eclipse.vex.ui.internal.handlers.StyleMenu"
+                     id="org.eclipse.vex.ui.StyleMenu">
                </dynamic>
             </menu>
          </menu>
       </menuContribution>
       <menuContribution
-            locationURI="popup:org.eclipse.wst.xml.vex.ui.popup">
+            locationURI="popup:org.eclipse.vex.ui.popup">
          <separator
-               name="org.eclipse.wst.xml.vex.ui.popup.undoRevertSave"
+               name="org.eclipse.vex.ui.popup.undoRevertSave"
                visible="true">
          </separator>
          <command
@@ -729,54 +729,54 @@
                commandId="org.eclipse.ui.file.save">
          </command>
          <separator
-               name="org.eclipse.wst.xml.vex.ui.popup.vexCommands"
+               name="org.eclipse.vex.ui.popup.vexCommands"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.wst.xml.vex.ui.AddElementCommand">
+               commandId="org.eclipse.vex.ui.AddElementCommand">
          </command>
          <command
-               commandId="org.eclipse.wst.xml.vex.ui.DuplicateSelectionCommand">
+               commandId="org.eclipse.vex.ui.DuplicateSelectionCommand">
          </command>
          <command
-               commandId="org.eclipse.wst.xml.vex.ui.ConvertElementCommand"
-               label="org.eclipse.wst.xml.vex.ui.popupmenu.ConvertElement">
+               commandId="org.eclipse.vex.ui.ConvertElementCommand"
+               label="org.eclipse.vex.ui.popupmenu.ConvertElement">
          </command>
          <command
-               commandId="org.eclipse.wst.xml.vex.ui.RemoveTagCommand">
+               commandId="org.eclipse.vex.ui.RemoveTagCommand">
          </command>
          <separator
-               name="org.eclipse.wst.xml.vex.ui.popup.vexTableItems"
+               name="org.eclipse.vex.ui.popup.vexTableItems"
                visible="true">
          </separator>
          <menu
                label="%menu.Row.name">
             <visibleWhen>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isRow">
+                     variable="org.eclipse.vex.ui.isRow">
                   <equals
                         value="true">
                   </equals>
                </with>
             </visibleWhen>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.AddRowAboveCommand"
+                  commandId="org.eclipse.vex.ui.AddRowAboveCommand"
                   label="%menu.Row.AddAbove.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.AddRowBelowCommand"
+                  commandId="org.eclipse.vex.ui.AddRowBelowCommand"
                   label="%menu.Row.AddBelow.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.MoveRowUpCommand"
+                  commandId="org.eclipse.vex.ui.MoveRowUpCommand"
                   label="%menu.Row.MoveUp.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.MoveRowDownCommand"
+                  commandId="org.eclipse.vex.ui.MoveRowDownCommand"
                   label="%menu.Row.MoveDown.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.RemoveRowCommand"
+                  commandId="org.eclipse.vex.ui.RemoveRowCommand"
                   label="%menu.Row.Remove.name">
             </command>
          </menu>
@@ -784,35 +784,35 @@
                label="%menu.Column.name">
             <visibleWhen>
                <with
-                     variable="org.eclipse.wst.xml.vex.ui.isRow">
+                     variable="org.eclipse.vex.ui.isRow">
                   <equals
                         value="true">
                   </equals>
                </with>
             </visibleWhen>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.AddColumnLeftCommand"
+                  commandId="org.eclipse.vex.ui.AddColumnLeftCommand"
                   label="%menu.Column.AddLeft.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.AddColumnRightCommand"
+                  commandId="org.eclipse.vex.ui.AddColumnRightCommand"
                   label="%menu.Column.AddRight.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.MoveColumnLeftCommand"
+                  commandId="org.eclipse.vex.ui.MoveColumnLeftCommand"
                   label="%menu.Column.MoveLeft.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.MoveColumnRightCommand"
+                  commandId="org.eclipse.vex.ui.MoveColumnRightCommand"
                   label="%menu.Column.MoveRight.name">
             </command>
             <command
-                  commandId="org.eclipse.wst.xml.vex.ui.RemoveColumnCommand"
+                  commandId="org.eclipse.vex.ui.RemoveColumnCommand"
                   label="%menu.Column.Remove.name">
             </command>
          </menu>
          <separator
-               name="org.eclipse.wst.xml.vex.ui.popup.cutCopyPaste"
+               name="org.eclipse.vex.ui.popup.cutCopyPaste"
                visible="true">
          </separator>
          <command
@@ -828,18 +828,18 @@
                commandId="org.eclipse.ui.edit.delete">
          </command>
          <separator
-               name="org.eclipse.wst.xml.vex.ui.popup.style"
+               name="org.eclipse.vex.ui.popup.style"
                visible="true">
          </separator>
          <menu
                label="%menu.Style.name">
             <dynamic
-                  class="org.eclipse.wst.xml.vex.ui.internal.handlers.StyleMenu"
-                  id="org.eclipse.wst.xml.vex.ui.StyleMenu">
+                  class="org.eclipse.vex.ui.internal.handlers.StyleMenu"
+                  id="org.eclipse.vex.ui.StyleMenu">
             </dynamic>
          </menu>
          <separator
-               name="org.eclipse.wst.xml.vex.ui.popup.any"
+               name="org.eclipse.vex.ui.popup.any"
                visible="true">
          </separator>
       </menuContribution>
@@ -847,7 +847,7 @@
    <extension
          point="org.eclipse.ui.keywords">
       <keyword
-            id="org.eclipse.wst.xml.vex.ui.KeywordVex"
+            id="org.eclipse.vex.ui.KeywordVex"
             label="%Keyword.Vex">
       </keyword>
    </extension>
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/Icon.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/Icon.java
index 04e524e..352a80c 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/Icon.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal;
+package org.eclipse.vex.ui.internal;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPlugin.java
similarity index 89%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPlugin.java
index 4a631fc..109c13b 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPlugin.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal;
+package org.eclipse.vex.ui.internal;
 
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigLoaderJob;
-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigurationRegistry;
-import org.eclipse.wst.xml.vex.ui.internal.config.ConfigurationRegistryImpl;
-import org.eclipse.wst.xml.vex.ui.internal.swt.SwtDisplayDevice;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.ui.internal.config.ConfigLoaderJob;
+import org.eclipse.vex.ui.internal.config.ConfigurationRegistry;
+import org.eclipse.vex.ui.internal.config.ConfigurationRegistryImpl;
+import org.eclipse.vex.ui.internal.swt.SwtDisplayDevice;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/BuildProblem.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/BuildProblem.java
index 673e76d..3f4e308 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/BuildProblem.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 /**
  * Represents a problem found when parsing a configuration resource.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/BuildProblemDecorator.java
similarity index 92%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/BuildProblemDecorator.java
index 70db10a..302b688 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/BuildProblemDecorator.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Torsten Stolpmann - bug 250837 - fixed id used for builder.
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.net.URL;
 
@@ -23,7 +23,7 @@
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Decorates Vex resources that build problems.
@@ -31,7 +31,7 @@
 public class BuildProblemDecorator extends LabelProvider implements
 		ILightweightLabelDecorator {
 
-	public static final String ID = "org.eclipse.wst.xml.vex.ui.config.buildProblemDecorator"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.vex.ui.config.buildProblemDecorator"; //$NON-NLS-1$
 
 	public void decorate(Object element, IDecoration decoration) {
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigEvent.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigEvent.java
index 827af48..5c3be6a 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigEvent.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.util.EventObject;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigItem.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigItem.java
index 6eb1ade..96fb55b 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigItem.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigLoaderJob.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigLoaderJob.java
index f1a5bfa..f0b4f5c 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigLoaderJob.java
@@ -10,7 +10,7 @@
  *     Ed Burnette - 7/23/2006 -  Changes needed to build on 3.2.
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigPlugin.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigPlugin.java
index 0ac9fd2..0668d63 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigPlugin.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.IOException;
 import java.net.URL;
@@ -18,7 +18,7 @@
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * An installed Eclipse bundle that provides Vex configuration items.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigSource.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigSource.java
index b284ea1..58def4f 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigSource.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.IOException;
 import java.net.URL;
@@ -22,9 +22,9 @@
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.vex.ui.internal.VexPlugin;
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
 
 /**
  * Base class for an installed bundle or plug-in project that contributes
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationElement.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationElement.java
index e222f2d..23b13fb 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationElement.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationElementWrapper.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationElementWrapper.java
index b2f1700..656d57b 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationElementWrapper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationLoader.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationLoader.java
index a817bd8..5336e0a 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationLoader.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.config;

+package org.eclipse.vex.ui.internal.config;

 

 import java.util.List;

 

diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationRegistry.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationRegistry.java
index eac1a5c..ce950ee 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationRegistry.java
@@ -8,7 +8,7 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.config;

+package org.eclipse.vex.ui.internal.config;

 

 import org.eclipse.core.resources.IProject;

 

diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationRegistryImpl.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationRegistryImpl.java
index c1de421..66f850d 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationRegistryImpl.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,8 +24,8 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.jobs.ILock;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.xml.vex.core.internal.core.ListenerList;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.core.internal.core.ListenerList;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 public class ConfigurationRegistryImpl implements ConfigurationRegistry {
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationView.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationView.java
index d94fd7c..3e920bf 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/ConfigurationView.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -20,7 +20,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.part.ViewPart;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * View showing all configuration items defined in Vex.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java
index 1dac964..eefedc0 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java
@@ -9,12 +9,12 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.IOException;
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
 
 /**
  * Factory for DocumentType objects.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypePropertyPage.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypePropertyPage.java
index 9793b4d..ca776e1 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypePropertyPage.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -35,8 +35,8 @@
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Property page for .dtd files.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DocumentType.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DocumentType.java
index c98beb0..fd340c1 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DocumentType.java
@@ -9,9 +9,9 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.dom.Validator;
 
 /**
  * A registered document type.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DomConfigurationElement.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DomConfigurationElement.java
index 840551f..ba2387d 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DomConfigurationElement.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IBuildProblemHandler.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IBuildProblemHandler.java
index d2c9d3b..8b7e6de 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IBuildProblemHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 /**
  * Interface through which a resource parser notifies an interested party of
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigElement.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigElement.java
index 18feb38..c6386c8 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 /**
  * Represents the XML element for a Vex config item in plugin.xml. Vex-specific
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigItemFactory.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigItemFactory.java
index 273a224..0e27b96 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigItemFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigListener.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigListener.java
index 83d920a..4b5d5c0 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/IConfigListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.util.EventListener;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/Messages.java
similarity index 87%
copy from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
copy to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/Messages.java
index dde4c1a..a1d9a50 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/Messages.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Handler for language-specific strings in Vex.
@@ -34,7 +34,7 @@
 	public static String getString(String key) {
 		if (resources == null) {
 			resources = ResourceBundle
-					.getBundle("org.eclipse.wst.xml.vex.ui.internal.config.messages"); //$NON-NLS-1$
+					.getBundle("org.eclipse.vex.ui.internal.config.messages"); //$NON-NLS-1$
 		}
 
 		try {
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/NewPluginProjectWizard.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/NewPluginProjectWizard.java
index a83460c..f5d27c7 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/NewPluginProjectWizard.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -23,7 +23,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Wizard for creating a new Vex Plugin Project.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProject.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProject.java
index 83f57f4..cfc9bef 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProject.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,8 +33,8 @@
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.core.internal.dom.DocumentWriter;
+import org.eclipse.vex.ui.internal.VexPlugin;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectBuilder.java
similarity index 95%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectBuilder.java
index 2fd8027..a5603c0 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectBuilder.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.text.MessageFormat;
 import java.util.Map;
@@ -21,14 +21,14 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IDecoratorManager;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Parses and registers Vex configuration objects in a Vex Plug-in project.
  */
 public class PluginProjectBuilder extends IncrementalProjectBuilder {
 
-	public static final String ID = "org.eclipse.wst.xml.vex.ui.pluginBuilder"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.vex.ui.pluginBuilder"; //$NON-NLS-1$
 
 	final IBuildProblemHandler buildProblemHandler = new IBuildProblemHandler() {
 		public void foundProblem(final BuildProblem problem) {
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectDecorator.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectDecorator.java
index c676668..5cf5695 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectDecorator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.net.URL;
 
@@ -20,7 +20,7 @@
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Decorates Vex projects with the Vex logo.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectNature.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectNature.java
index 066c381..e606836 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/PluginProjectNature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IMarker;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/Style.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/Style.java
index a593c60..4477130 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/Style.java
@@ -9,14 +9,14 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.layout.BoxFactory;
 
 /**
  * Represents the combination of a style sheet and a box factory that defines
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/StyleFactory.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/StyleFactory.java
index c9113f6..b7898e7 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/StyleFactory.java
@@ -9,12 +9,12 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.io.IOException;
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
+import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.CSSParseException;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/StylePropertyPage.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/StylePropertyPage.java
index a3e385d..919385a 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/StylePropertyPage.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.config;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Property page for .css files.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/messages.properties
similarity index 100%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/messages.properties
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/messages_fr.properties
similarity index 100%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/messages_fr.properties
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/vex-config-1.0.dtd b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/vex-config-1.0.dtd
similarity index 100%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/vex-config-1.0.dtd
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/vex-config-1.0.dtd
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
similarity index 98%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
index 0d5f05e..e6d4223 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Holger Voormann - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.editor;

+package org.eclipse.vex.ui.internal.editor;

 

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentContextSourceProvider.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentContextSourceProvider.java
index bc191be..994cbc7 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentContextSourceProvider.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.ui.AbstractSourceProvider;
 import org.eclipse.ui.ISources;
-import org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil;
-import org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil.RowColumnInfo;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.handlers.VexHandlerUtil;
+import org.eclipse.vex.ui.internal.handlers.VexHandlerUtil.RowColumnInfo;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * If this class is declared in {@code org.eclipse.ui.services} extension then
@@ -31,27 +31,27 @@
 
     /** Variable ID of the <em>is-column</em> flag.*/
     public static final String IS_COLUMN =
-        "org.eclipse.wst.xml.vex.ui.isColumn";
+        "org.eclipse.vex.ui.isColumn";
 
     /** Variable ID of the <em>is-first-column</em> flag.*/
     public static final String IS_FIRST_COLUMN =
-        "org.eclipse.wst.xml.vex.ui.isFirstColumn";
+        "org.eclipse.vex.ui.isFirstColumn";
 
     /** Variable ID of the <em>is-last-column</em> flag.*/
     public static final String IS_LAST_COLUMN =
-        "org.eclipse.wst.xml.vex.ui.isLastColumn";
+        "org.eclipse.vex.ui.isLastColumn";
 
     /** Variable ID of the <em>is-row</em> flag.*/
     public static final String IS_ROW =
-        "org.eclipse.wst.xml.vex.ui.isRow";
+        "org.eclipse.vex.ui.isRow";
 
     /** Variable ID of the <em>is-fist-row</em> flag.*/
     public static final String IS_FIRST_ROW =
-        "org.eclipse.wst.xml.vex.ui.isFirstRow";
+        "org.eclipse.vex.ui.isFirstRow";
 
     /** Variable ID of the <em>is-last-row</em> flag.*/
     public static final String IS_LAST_ROW =
-        "org.eclipse.wst.xml.vex.ui.isLastRow";
+        "org.eclipse.vex.ui.isLastRow";
 
     private boolean isColumn;
     private boolean isFirstColumn;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentFileCreationPage.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentFileCreationPage.java
index f3d5f04..735cda4 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentFileCreationPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.io.InputStream;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
index 9b9175d..1098a28 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -25,8 +25,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
-import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.config.DocumentType;
 
 /**
  * Dialog presented to the user to select a document type it cannot be
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentTypeSelectionPage.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentTypeSelectionPage.java
index a222bb7..018a4ea 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/DocumentTypeSelectionPage.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -25,9 +25,9 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
-import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.config.DocumentType;
 
 /**
  * Wizard page for selecting the document type and root element for the new
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/IVexEditorListener.java
similarity index 95%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/IVexEditorListener.java
index e6a140f..897dd66 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/IVexEditorListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 /**
  * Event interface through which VexEditor events are published.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/Messages.java
similarity index 87%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/Messages.java
index dde4c1a..03f5fbf 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/Messages.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.config;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Handler for language-specific strings in Vex.
@@ -34,7 +34,7 @@
 	public static String getString(String key) {
 		if (resources == null) {
 			resources = ResourceBundle
-					.getBundle("org.eclipse.wst.xml.vex.ui.internal.config.messages"); //$NON-NLS-1$
+					.getBundle("org.eclipse.vex.ui.internal.editor.messages"); //$NON-NLS-1$
 		}
 
 		try {
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/PageInitializationData.java
similarity index 92%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/PageInitializationData.java
index 2322645..31fd256 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/PageInitializationData.java
@@ -1,4 +1,4 @@
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/SelectionProvider.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/SelectionProvider.java
index 387a9d2..271f4fc 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/SelectionProvider.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.wst.xml.vex.core.internal.core.ListenerList;
+import org.eclipse.vex.core.internal.core.ListenerList;
 
 /**
  * Implementation of ISelectionProvider. This class is also an
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/TextInputListener.java
similarity index 90%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/TextInputListener.java
index 4517766..62cede1 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/TextInputListener.java
@@ -1,4 +1,4 @@
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextInputListener;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexActionBarContributor.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexActionBarContributor.java
index 670ab5c..79c52a9 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexActionBarContributor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.util.ResourceBundle;
 
@@ -25,9 +25,9 @@
 import org.eclipse.ui.texteditor.FindReplaceAction;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
+import org.eclipse.vex.core.internal.dom.DocumentValidationException;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 /**
  * Contribute actions on behalf of the VexEditor.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexEditor.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexEditor.java
index 74061f8..89aefa6 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexEditor.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -66,26 +66,26 @@
 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.core.ListenerList;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-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.validator.WTPVEXValidator;
-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.config.ConfigEvent;
-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.handlers.ConvertElementHandler;
-import org.eclipse.wst.xml.vex.ui.internal.handlers.RemoveTagHandler;
-import org.eclipse.wst.xml.vex.ui.internal.outline.DocumentOutlinePage;
-import org.eclipse.wst.xml.vex.ui.internal.property.ElementPropertySource;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.core.ListenerList;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentReader;
+import org.eclipse.vex.core.internal.dom.DocumentWriter;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicyFactory;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.config.ConfigEvent;
+import org.eclipse.vex.ui.internal.config.DocumentType;
+import org.eclipse.vex.ui.internal.config.IConfigListener;
+import org.eclipse.vex.ui.internal.config.Style;
+import org.eclipse.vex.ui.internal.handlers.ConvertElementHandler;
+import org.eclipse.vex.ui.internal.handlers.RemoveTagHandler;
+import org.eclipse.vex.ui.internal.outline.DocumentOutlinePage;
+import org.eclipse.vex.ui.internal.property.ElementPropertySource;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 import org.osgi.service.prefs.BackingStoreException;
 import org.osgi.service.prefs.Preferences;
 import org.xml.sax.EntityResolver;
@@ -101,7 +101,7 @@
 	/**
 	 * ID of this editor extension.
 	 */
-	public static final String ID = "org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.vex.ui.internal.editor.VexEditor"; //$NON-NLS-1$
 
 	/**
 	 * Class constructor.
@@ -569,14 +569,14 @@
 		vexWidget.setLayoutData(gd);
 
 		final MenuManager menuManager = new MenuManager();
-		getSite().registerContextMenu("org.eclipse.wst.xml.vex.ui.popup", menuManager, vexWidget);
+		getSite().registerContextMenu("org.eclipse.vex.ui.popup", menuManager, vexWidget);
 		vexWidget.setMenu(menuManager.createContextMenu(vexWidget));
 
 		savedUndoDepth = vexWidget.getUndoDepth();
 
 		// new for scopes
 		final IContextService cs = (IContextService) getSite().getService(IContextService.class);
-		cs.activateContext("org.eclipse.wst.xml.vex.ui.VexEditorContext");
+		cs.activateContext("org.eclipse.vex.ui.VexEditorContext");
 
 		vexWidget.addSelectionChangedListener(selectionProvider);
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexEditorEvent.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexEditorEvent.java
index 530c105..ed64c49 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexEditorEvent.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
+package org.eclipse.vex.ui.internal.editor;
 
 import java.util.EventObject;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/messages.properties
similarity index 100%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/messages.properties
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/messages_fr.properties
similarity index 100%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/messages_fr.properties
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractAddColumnHandler.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractAddColumnHandler.java
index 100bb9c..5928efa 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractAddColumnHandler.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,8 +17,8 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Inserts a single table column before (left of) or after (right of) the
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractAddRowHandler.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractAddRowHandler.java
index 3639bce..21c532a 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractAddRowHandler.java
@@ -9,14 +9,14 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Inserts one or more table rows either above or below the currently selected
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
index 89899ef..3c0a1da 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,8 +16,8 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Moves the current table column either to the left or to the right.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractMoveRowHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractMoveRowHandler.java
index 62f4bca..2d33009 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractMoveRowHandler.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil.SelectedRows;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.ui.internal.handlers.VexHandlerUtil.SelectedRows;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Moves the current table row either down below its next sibling or up above
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
similarity index 84%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
index 7225bff..ca5a66c 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.TableRowBox;
+import org.eclipse.vex.core.internal.widget.IBoxFilter;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Navigates either to the next or previous table cell (usual shortcut: {@code
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
index 4516fa4..5dd5973 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Deletes a given list of table cells (see
- * {@link #collectCellsToDelete(VexWidget, org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil.RowColumnInfo)}
+ * {@link #collectCellsToDelete(VexWidget, org.eclipse.vex.ui.internal.handlers.VexHandlerUtil.RowColumnInfo)}
  * ).
  *
  * @see RemoveColumnHandler
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
index b3b6506..9973d55 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.text.MessageFormat;
 import java.util.Map;
@@ -19,8 +19,8 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.menus.UIElement;
 import org.eclipse.ui.services.IServiceScopes;
-import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.editor.Messages;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Abstract supper class of all command handlers which can be performed on a
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddColumnLeftHandler.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddColumnLeftHandler.java
index 34e524e..f61ba7d 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddColumnLeftHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * Inserts a single table column before (left of) the current one.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddColumnRightHandler.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddColumnRightHandler.java
index 14983d9..b3b47fb 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddColumnRightHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * Inserts a single table column after (right of) the current one.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddElementHandler.java
similarity index 83%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddElementHandler.java
index fe7c090..e83b598 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddElementHandler.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.ui.internal.swt.ContentAssist;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.swt.ContentAssist;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Shows the content assist to add a new element ({@link InsertAssistant}).
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddRowAboveHandler.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddRowAboveHandler.java
index 904f424..ae3d9dc 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddRowAboveHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * Inserts one or more table rows above the currently selected one(s). If more
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddRowBelowHandler.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddRowBelowHandler.java
index d0f672b..839967e 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/AddRowBelowHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * Inserts one or more table rows below the currently selected one(s). If more
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/ConvertElementHandler.java
similarity index 84%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/ConvertElementHandler.java
index e867599..681dfc0 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/ConvertElementHandler.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.commands.IElementUpdater;
 import org.eclipse.ui.menus.UIElement;
-import org.eclipse.wst.xml.vex.ui.internal.swt.ContentAssist;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.swt.ContentAssist;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Shows the content assist to convert current element ({@link MorphAssistant}).
@@ -25,7 +25,7 @@
 
     /** ID of the corresponding convert element command. */
     public static final String COMMAND_ID =
-        "org.eclipse.wst.xml.vex.ui.ConvertElementCommand"; //$NON-NLS-1$
+        "org.eclipse.vex.ui.ConvertElementCommand"; //$NON-NLS-1$
 
     private static final String LABEL_ID =
         "command.convertElement.dynamicName"; //$NON-NLS-1$
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/DuplicateSelectionHandler.java
similarity index 90%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/DuplicateSelectionHandler.java
index f40cd0b..dda8cf3 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/DuplicateSelectionHandler.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Duplicates current element or current selection.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/ITableCellCallback.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/ITableCellCallback.java
index 31db646..206e56f 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/ITableCellCallback.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * Callback interface to iterate over table cells (visitor pattern).
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/IVexWidgetHandler.java
similarity index 89%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/IVexWidgetHandler.java
index a8f728b..3d7c3ab 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/IVexWidgetHandler.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Interface implemented by handler objects that can act on a {@link VexWidget}.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveColumnLeftHandler.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveColumnLeftHandler.java
index 12b93a0..3195d98 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveColumnLeftHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * Moves the current table column to the left.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveColumnRightHandler.java
similarity index 87%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveColumnRightHandler.java
index 3594b26..388be77 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveColumnRightHandler.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
-import org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil.RowColumnInfo;
+import org.eclipse.vex.ui.internal.handlers.VexHandlerUtil.RowColumnInfo;
 
 /**
  * Moves the current table column to the right.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveRowDownHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveRowDownHandler.java
index d3ab76c..d2efc2f 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveRowDownHandler.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
-import org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil.SelectedRows;
+import org.eclipse.vex.ui.internal.handlers.VexHandlerUtil.SelectedRows;
 
 /**
  * Moves the current table row down below its next sibling.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveRowUpHandler.java
similarity index 89%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveRowUpHandler.java
index db661f1..48c9db7 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveRowUpHandler.java
@@ -9,11 +9,11 @@
  *     Holger Voormann - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.ui.internal.handlers.VexHandlerUtil.SelectedRows;
+import org.eclipse.vex.ui.internal.handlers.VexHandlerUtil.SelectedRows;
 
 /**
  * Moves the current table row up above its previous sibling.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveSelectionUpHandler.java
similarity index 89%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveSelectionUpHandler.java
index e16a0e5..bf554cc 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/MoveSelectionUpHandler.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.layout.BlockBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.layout.BlockBox;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.widget.IBoxFilter;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Moves the current selection or block element above the previous sibling.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/NextTableCellHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/NextTableCellHandler.java
index 9f947fd..0730a0e 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/NextTableCellHandler.java
@@ -9,11 +9,11 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.TableRowBox;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Navigates to the next table cell (usual shortcut: {@code Tab}).
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/PreviousTableCellHandler.java
similarity index 87%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/PreviousTableCellHandler.java
index 1cc84f8..eb06738 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/PreviousTableCellHandler.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.TableRowBox;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Navigates to the previous table cell (usual shortcut: {@code Shift+Tab}).
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveColumnHandler.java
similarity index 92%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveColumnHandler.java
index 6166994..881270f 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveColumnHandler.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Deletes current column.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveRowHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveRowHandler.java
index 8f2e837..1d78843 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveRowHandler.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Deletes selected row(s).
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveTagHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveTagHandler.java
index 1548cd5..5a512d1 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/RemoveTagHandler.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.commands.IElementUpdater;
 import org.eclipse.ui.menus.UIElement;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.dom.DocumentFragment;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Removes the current tag: deletes the element but adds its content to the
@@ -28,7 +28,7 @@
 
     /** ID of the corresponding remove element command. */
     public static final String COMMAND_ID =
-        "org.eclipse.wst.xml.vex.ui.RemoveTagCommand"; //$NON-NLS-1$
+        "org.eclipse.vex.ui.RemoveTagCommand"; //$NON-NLS-1$
 
     /**
      * The message ID of the command label which is in window scope displayed
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/SplitBlockElementHandler.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/SplitBlockElementHandler.java
index f7f5de0..03955f6 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/SplitBlockElementHandler.java
@@ -9,20 +9,20 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.VEXCorePlugin;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.VEXCorePlugin;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.Styles;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentFragment;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.widget.IVexWidget;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Splits the current block element, for instance to create new block/paragraph
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/SplitItemHandler.java
similarity index 80%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/SplitItemHandler.java
index 18e6ac6..222efb2 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/SplitItemHandler.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-import org.eclipse.wst.xml.vex.core.internal.widget.IBoxFilter;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.TableRowBox;
+import org.eclipse.vex.core.internal.widget.IBoxFilter;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Splits the nearest enclosing table row or list item (usually by hitting
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/StyleMenu.java
similarity index 89%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/StyleMenu.java
index f9d50d1..4691155 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/StyleMenu.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.swt.SWT;
@@ -19,9 +19,9 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
-import org.eclipse.wst.xml.vex.ui.internal.config.Style;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.config.Style;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
 
 /**
  * Menu of all registered styles available for the current document to choose
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/TableCellCallbackAdapter.java
similarity index 95%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/TableCellCallbackAdapter.java
index 89ff9f8..ecfca21 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/TableCellCallbackAdapter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Holger Voormann - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 /**
  * This adapter class provides empty default implementations for the methods
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/VexHandlerUtil.java
similarity index 95%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/VexHandlerUtil.java
index 1e8d5b4..a55d3a9 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/handlers/VexHandlerUtil.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.handlers;
+package org.eclipse.vex.ui.internal.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,21 +19,21 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Node;
-import org.eclipse.wst.xml.vex.core.internal.layout.BlockBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.ElementOrRangeCallback;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutUtils;
-import org.eclipse.wst.xml.vex.core.internal.layout.TableRowBox;
-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.ui.internal.editor.VexEditor;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.core.IntRange;
+import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Node;
+import org.eclipse.vex.core.internal.layout.BlockBox;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.ElementOrRangeCallback;
+import org.eclipse.vex.core.internal.layout.LayoutUtils;
+import org.eclipse.vex.core.internal.layout.TableRowBox;
+import org.eclipse.vex.core.internal.widget.IBoxFilter;
+import org.eclipse.vex.core.internal.widget.IVexWidget;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Static helper methods used across handlers.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java
index 476aa66..dd84bf6 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.outline;
+package org.eclipse.vex.ui.internal.outline;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,12 +18,12 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.IWhitespacePolicy;
-import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
 
 /**
  * Default implementation of IOutlineProvider. Simply displays all block-level
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DocumentOutlinePage.java
similarity index 92%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DocumentOutlinePage.java
index be76212..45caf4d 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DocumentOutlinePage.java
@@ -10,7 +10,7 @@
  *     Torsten Stolpmann - bug 257946 - fixed outline view to work with multipage editor.
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.outline;
+package org.eclipse.vex.ui.internal.outline;
 
 import java.text.MessageFormat;
 
@@ -31,15 +31,15 @@
 import org.eclipse.ui.part.IPageSite;
 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.ui.internal.VexPlugin;
-import org.eclipse.wst.xml.vex.ui.internal.config.DocumentType;
-import org.eclipse.wst.xml.vex.ui.internal.editor.IVexEditorListener;
-import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
-import org.eclipse.wst.xml.vex.ui.internal.editor.SelectionProvider;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditorEvent;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.config.DocumentType;
+import org.eclipse.vex.ui.internal.editor.IVexEditorListener;
+import org.eclipse.vex.ui.internal.editor.Messages;
+import org.eclipse.vex.ui.internal.editor.SelectionProvider;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.ui.internal.editor.VexEditorEvent;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/IOutlineProvider.java
similarity index 90%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/IOutlineProvider.java
index dfa4bda..50b608d 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/IOutlineProvider.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.outline;
+package org.eclipse.vex.ui.internal.outline;
 
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
 
 /**
  * Implemented by objects that can provide a document outline.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/perspective/DocumentPerspective.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/perspective/DocumentPerspective.java
index 3ced2cb..a814864 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/perspective/DocumentPerspective.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.perspective;
+package org.eclipse.vex.ui.internal.perspective;
 
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
@@ -30,7 +30,7 @@
 	public void defineActions(IPageLayout layout) {
 		// Add "new wizards".
 		layout
-				.addNewWizardShortcut("org.eclipse.wst.xml.vex.ui.NewDocumentWizard");//$NON-NLS-1$
+				.addNewWizardShortcut("org.eclipse.vex.ui.NewDocumentWizard");//$NON-NLS-1$
 		layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
 		layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/property/ElementPropertySource.java
similarity index 92%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/property/ElementPropertySource.java
index b774114..78ceb93 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/property/ElementPropertySource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.property;
+package org.eclipse.vex.ui.internal.property;
 
 import java.util.List;
 
@@ -17,12 +17,12 @@
 import org.eclipse.ui.views.properties.IPropertySource2;
 import org.eclipse.ui.views.properties.PropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-import org.eclipse.wst.xml.vex.core.internal.dom.Attribute;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Validator;
-import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
-import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
+import org.eclipse.vex.core.internal.dom.Attribute;
+import org.eclipse.vex.core.internal.dom.DocumentValidationException;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Validator;
+import org.eclipse.vex.core.internal.validator.AttributeDefinition;
+import org.eclipse.vex.ui.internal.editor.Messages;
 
 /**
  * Property source that treats element attributes as properties.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/ContentAssist.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/ContentAssist.java
index d51a9e0..ab1dd58 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/ContentAssist.java
@@ -10,7 +10,7 @@
  *     Holger Voormann
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import java.text.MessageFormat;
 import java.util.LinkedList;
@@ -50,10 +50,10 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.ui.internal.Icon;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
-import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.ui.internal.Icon;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.editor.Messages;
 
 /**
  * Content assist dialog that is popped up to show a list of actions to select
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/DocumentFragmentTransfer.java
similarity index 95%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/DocumentFragmentTransfer.java
index 9a74c8d..2f2eab1 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/DocumentFragmentTransfer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -18,7 +18,7 @@
 
 import org.eclipse.swt.dnd.ByteArrayTransfer;
 import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
+import org.eclipse.vex.core.internal.dom.DocumentFragment;
 
 /**
  * Transfer object that handles Vex DocumentFragments.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/KeyStroke.java
similarity index 96%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/KeyStroke.java
index a2336e6..170a53b 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/KeyStroke.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import org.eclipse.swt.events.KeyEvent;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtColor.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtColor.java
index 883e463..3bb2bab 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtColor.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
-import org.eclipse.wst.xml.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.ColorResource;
 
 /**
  * Wrapper for the SWT Color class.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtDisplayDevice.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtDisplayDevice.java
index 499a466..77ffbc0 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtDisplayDevice.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
 
 /**
  * Adapts the DisplayDevice display to the current SWT display.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtFont.java
similarity index 88%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtFont.java
index eb964ca..2dc041e 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtFont.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.FontResource;
 
 /**
  * Wrapper for the SWT Font class.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtFontMetrics.java
similarity index 73%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtFontMetrics.java
index 846ddd4..da00664 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtFontMetrics.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
-import org.eclipse.wst.xml.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontMetrics;
 
 /**
  * Wrapper for the SWT FontMetrics class.
@@ -24,28 +24,28 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.core.FontMetrics#getAscent()
+	 * @see org.eclipse.vex.core.internal.core.FontMetrics#getAscent()
 	 */
 	public int getAscent() {
 		return this.swtFontMetrics.getAscent();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.core.FontMetrics#getDescent()
+	 * @see org.eclipse.vex.core.internal.core.FontMetrics#getDescent()
 	 */
 	public int getDescent() {
 		return this.swtFontMetrics.getDescent();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.core.FontMetrics#getHeight()
+	 * @see org.eclipse.vex.core.internal.core.FontMetrics#getHeight()
 	 */
 	public int getHeight() {
 		return this.swtFontMetrics.getHeight();
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.core.FontMetrics#getLeading()
+	 * @see org.eclipse.vex.core.internal.core.FontMetrics#getLeading()
 	 */
 	public int getLeading() {
 		return this.swtFontMetrics.getLeading();
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtGraphics.java
similarity index 92%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtGraphics.java
index 606bee9..dbbc6ad 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtGraphics.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Mohamadou Nassourou - Bug 298912 - rudimentary support for images 
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,15 +25,15 @@
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.widgets.Display;
-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.FontMetrics;
-import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
-import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Image;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.FontMetrics;
+import org.eclipse.vex.core.internal.core.FontResource;
+import org.eclipse.vex.core.internal.core.FontSpec;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Image;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.ui.internal.VexPlugin;
 
 /**
  * Implementation of the Vex Graphics interface, mapping it to a
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtImage.java
similarity index 89%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtImage.java
index 646b908..238be73 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/SwtImage.java
@@ -8,10 +8,10 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.ui.internal.swt;

+package org.eclipse.vex.ui.internal.swt;

 

 import org.eclipse.swt.graphics.ImageData;

-import org.eclipse.wst.xml.vex.core.internal.core.Image;

+import org.eclipse.vex.core.internal.core.Image;

 

 /**

  * @author Florian Thienel

diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/Timer.java
similarity index 97%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/Timer.java
index e514a07..687fc3a 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/Timer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import org.eclipse.swt.widgets.Display;
 
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java
index 0ed0589..3f8b982 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.swt;
+package org.eclipse.vex.ui.internal.swt;
 
 import java.io.IOException;
 import java.net.URL;
@@ -51,25 +51,25 @@
 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.core.Caret;
-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;
-import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
-import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentFragment;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.Node;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.BoxFactory;
-import org.eclipse.wst.xml.vex.core.internal.widget.HostComponent;
-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.handlers.IVexWidgetHandler;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Color;
+import org.eclipse.vex.core.internal.core.ColorResource;
+import org.eclipse.vex.core.internal.core.DisplayDevice;
+import org.eclipse.vex.core.internal.core.Graphics;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentFragment;
+import org.eclipse.vex.core.internal.dom.DocumentValidationException;
+import org.eclipse.vex.core.internal.dom.Element;
+import org.eclipse.vex.core.internal.dom.Node;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.layout.BoxFactory;
+import org.eclipse.vex.core.internal.widget.HostComponent;
+import org.eclipse.vex.core.internal.widget.IBoxFilter;
+import org.eclipse.vex.core.internal.widget.IVexWidget;
+import org.eclipse.vex.core.internal.widget.VexWidgetImpl;
+import org.eclipse.vex.ui.internal.handlers.IVexWidgetHandler;
 import org.xml.sax.SAXException;
 
 /**
@@ -139,7 +139,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget#canPasteText()
+	 * @see org.eclipse.vex.core.internal.widget.IVexWidget#canPasteText()
 	 */
 	public boolean canPasteText() {
 		// TODO Auto-generated method stub
@@ -350,7 +350,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget#paste()
+	 * @see org.eclipse.vex.core.internal.widget.IVexWidget#paste()
 	 */
 	public void paste() throws DocumentValidationException {
 		Clipboard clipboard = new Clipboard(this.getDisplay());
@@ -364,7 +364,7 @@
 	}
 
 	/**
-	 * @see org.eclipse.wst.xml.vex.core.internal.widget.IVexWidget#pasteText()
+	 * @see org.eclipse.vex.core.internal.widget.IVexWidget#pasteText()
 	 */
 	public void pasteText() throws DocumentValidationException {
 		Clipboard clipboard = new Clipboard(this.getDisplay());
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/views/DebugView.java
similarity index 93%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/views/DebugView.java
index 0b91ae3..c489319 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/views/DebugView.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.views;
+package org.eclipse.vex.ui.internal.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -22,8 +22,8 @@
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.part.PageBook;
 import org.eclipse.ui.part.PageBookView;
-import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.ui.internal.editor.Messages;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
 
 /**
  * A view that shows stats about the current Vex editor as a debugging aid.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/views/DebugViewPage.java
similarity index 94%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/views/DebugViewPage.java
index d125f31..3145f89 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/views/DebugViewPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     John Krasnay - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.views;
+package org.eclipse.vex.ui.internal.views;
 
 import java.lang.reflect.Field;
 
@@ -36,13 +36,13 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.IPageBookViewPage;
 import org.eclipse.ui.part.IPageSite;
-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.widget.HostComponent;
-import org.eclipse.wst.xml.vex.core.internal.widget.VexWidgetImpl;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
-import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
+import org.eclipse.vex.core.internal.core.Caret;
+import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.layout.Box;
+import org.eclipse.vex.core.internal.widget.HostComponent;
+import org.eclipse.vex.core.internal.widget.VexWidgetImpl;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.ui.internal.swt.VexWidget;
 
 /**
  * Page in the debug view.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java
similarity index 90%
rename from org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
rename to org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java
index c77017e..4b61bc3 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Igor Jacy Lino Campista - Java 5 warnings fixed (bug 311325)
  *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.wizards;
+package org.eclipse.vex.ui.internal.wizards;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -30,16 +30,16 @@
 import org.eclipse.ui.internal.registry.EditorRegistry;
 import org.eclipse.ui.internal.registry.FileEditorMapping;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-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.config.Style;
-import org.eclipse.wst.xml.vex.ui.internal.editor.DocumentFileCreationPage;
-import org.eclipse.wst.xml.vex.ui.internal.editor.DocumentTypeSelectionPage;
-import org.eclipse.wst.xml.vex.ui.internal.editor.Messages;
-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
+import org.eclipse.vex.core.internal.dom.Document;
+import org.eclipse.vex.core.internal.dom.DocumentWriter;
+import org.eclipse.vex.core.internal.dom.RootElement;
+import org.eclipse.vex.core.internal.widget.CssWhitespacePolicy;
+import org.eclipse.vex.ui.internal.VexPlugin;
+import org.eclipse.vex.ui.internal.config.Style;
+import org.eclipse.vex.ui.internal.editor.DocumentFileCreationPage;
+import org.eclipse.vex.ui.internal.editor.DocumentTypeSelectionPage;
+import org.eclipse.vex.ui.internal.editor.Messages;
+import org.eclipse.vex.ui.internal.editor.VexEditor;
  
 /**
  * Wizard for creating a new Vex document.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/Messages.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/Messages.java
deleted file mode 100644
index 70b8e54..0000000
--- a/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/Messages.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     John Krasnay - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.vex.ui.internal.editor;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
-
-/**
- * Handler for language-specific strings in Vex.
- */
-public class Messages {
-
-	private static ResourceBundle resources;
-
-	private Messages() {
-	}
-
-	/**
-	 * Returns the language-specific string for the given key, or the key itself
-	 * if not found.
-	 */
-	public static String getString(String key) {
-		if (resources == null) {
-			resources = ResourceBundle
-					.getBundle("org.eclipse.wst.xml.vex.ui.internal.editor.messages"); //$NON-NLS-1$
-		}
-
-		try {
-			return resources.getString(key);
-		} catch (MissingResourceException ex) {
-			String message = Messages.getString("Messages.cantFindResource"); //$NON-NLS-1$
-			VexPlugin.getInstance().log(IStatus.WARNING,
-					MessageFormat.format(message, new Object[] { key }));
-			return key;
-		}
-	}
-
-}
diff --git a/org.eclipse.vex.xhtml/plugin.xml b/org.eclipse.vex.xhtml/plugin.xml
index ab541f4..451a25c 100644
--- a/org.eclipse.vex.xhtml/plugin.xml
+++ b/org.eclipse.vex.xhtml/plugin.xml
@@ -2,8 +2,8 @@
 <?eclipse version="3.4"?>

 <plugin>

 	<extension point="org.eclipse.core.contenttype.contentTypes">

-		<content-type id="org.eclipse.wst.xml.vex.ui.xhtml" name="%contentType.name"

-			base-type="org.eclipse.wst.xml.vex.ui.XmlDocument" file-extensions="xml, xhtml">

+		<content-type id="org.eclipse.vex.ui.xhtml" name="%contentType.name"

+			base-type="org.eclipse.vex.ui.XmlDocument" file-extensions="xml, xhtml">

 		</content-type>

 	</extension>

 

@@ -13,7 +13,7 @@
 		<doctype 

 			publicId="-//W3C//DTD XHTML 1.0 Strict//EN"

 			systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"

-			outlineProvider="org.eclipse.wst.xml.vex.xhtml.XhtmlOutlineProvider" >

+			outlineProvider="org.eclipse.vex.xhtml.XhtmlOutlineProvider" >

 			<rootElement name="html">

 			</rootElement>

 		</doctype>

diff --git a/org.eclipse.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java b/org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java
similarity index 94%
rename from org.eclipse.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java
rename to org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java
index e7c2b70..9b77d37 100644
--- a/org.eclipse.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java
+++ b/org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     John Krasnay - initial API and implementation

  *******************************************************************************/

-package org.eclipse.wst.xml.vex.xhtml;

+package org.eclipse.vex.xhtml;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -18,10 +18,10 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.wst.xml.vex.core.internal.dom.Document;

-import org.eclipse.wst.xml.vex.core.internal.dom.Element;

-import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;

-import org.eclipse.wst.xml.vex.ui.internal.outline.IOutlineProvider;

+import org.eclipse.vex.core.internal.dom.Document;

+import org.eclipse.vex.core.internal.dom.Element;

+import org.eclipse.vex.ui.internal.editor.VexEditor;

+import org.eclipse.vex.ui.internal.outline.IOutlineProvider;

 

 /**

  * Provides an outline of the sections of an XHTML document.