rename bundles, projects and adopt the poms
Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/org.eclipse.wst.xml.vex.core.tests/.classpath b/org.eclipse.vex.core.tests/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/.classpath
rename to org.eclipse.vex.core.tests/.classpath
diff --git a/org.eclipse.vex.core.tests/.gitignore b/org.eclipse.vex.core.tests/.gitignore
new file mode 100644
index 0000000..fe07c27
--- /dev/null
+++ b/org.eclipse.vex.core.tests/.gitignore
@@ -0,0 +1,2 @@
+bin

+/target
diff --git a/org.eclipse.wst.xml.vex.xhtml/.project b/org.eclipse.vex.core.tests/.project
similarity index 94%
copy from org.eclipse.wst.xml.vex.xhtml/.project
copy to org.eclipse.vex.core.tests/.project
index d8bebca..756d4b7 100644
--- a/org.eclipse.wst.xml.vex.xhtml/.project
+++ b/org.eclipse.vex.core.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.wst.xml.vex.xhtml</name>

+	<name>org.eclipse.vex.core.tests</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/org.eclipse.wst.xml.vex.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.core.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.core.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.core.tests/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
similarity index 90%
rename from org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF
rename to org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
index b520e1a..038f763 100644
--- a/org.eclipse.wst.xml.vex.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.core.tests;singleton:=true
+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-Vendor: %providerName
 Require-Bundle: org.apache.xerces;bundle-version="2.9.0",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.vex.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.vex.core;bundle-version="[1.0.0,2.0.0)",
  org.junit;bundle-version="3.8.1",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
diff --git a/org.eclipse.wst.xml.vex.core.tests/build.properties b/org.eclipse.vex.core.tests/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/build.properties
rename to org.eclipse.vex.core.tests/build.properties
diff --git a/org.eclipse.wst.xml.vex.core.tests/plugin.properties b/org.eclipse.vex.core.tests/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/plugin.properties
rename to org.eclipse.vex.core.tests/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.core.tests/plugin.xml b/org.eclipse.vex.core.tests/plugin.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/plugin.xml
rename to org.eclipse.vex.core.tests/plugin.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/pom.xml b/org.eclipse.vex.core.tests/pom.xml
similarity index 92%
rename from org.eclipse.wst.xml.vex.core.tests/pom.xml
rename to org.eclipse.vex.core.tests/pom.xml
index 7b32688..0cebcaa 100644
--- a/org.eclipse.wst.xml.vex.core.tests/pom.xml
+++ b/org.eclipse.vex.core.tests/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 	
 	<build>
@@ -22,7 +22,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<useUIHarness>true</useUIHarness>
-					<testSuite>org.eclipse.wst.xml.vex.core.tests</testSuite>
+					<testSuite>org.eclipse.vex.core.tests</testSuite>
 					<testClass>org.eclipse.wst.xml.vex.core.tests.VEXCoreTestSuite</testClass>
 					<dependencies>
 						<dependency>
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/CssTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockDisplayDevice.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/MockLU.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/expansion.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/expansion.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/expansion.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/expansion.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.xml b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test1.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test2.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test2.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test2.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/test2.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testImportant.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testImportant.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testImportant.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testImportant.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testLexicalUnits.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testLexicalUnits.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testLexicalUnits.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testLexicalUnits.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testRules.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testRules.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testRules.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/testRules.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DTDValidatorTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContentTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStackTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SchemaValidatorTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeGraphics.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/FakeImage.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBoxTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/MockBoxFactory.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TableLayoutTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestParagraphBox.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.css
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/core/internal/layout/before-after.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.xml b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/before-after.xml
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/core/internal/layout/before-after.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.css
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/core/internal/layout/block-inline.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.xml b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/block-inline.xml
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/core/internal/layout/block-inline.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.xml b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/linebreaks.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.xml b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.xml
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/tables.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/test.css b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/test.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/test.css
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/test.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/MockHostComponent.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/ListenerListTest.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/TestResources.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java b/org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestPlugin.java
diff --git a/org.eclipse.wst.xml.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
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
rename to org.eclipse.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/DocumentWriterTest1.xml b/org.eclipse.vex.core.tests/testResources/DocumentWriterTest1.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/DocumentWriterTest1.xml
rename to org.eclipse.vex.core.tests/testResources/DocumentWriterTest1.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/SecuringYourApacheServer.xml b/org.eclipse.vex.core.tests/testResources/SecuringYourApacheServer.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/SecuringYourApacheServer.xml
rename to org.eclipse.vex.core.tests/testResources/SecuringYourApacheServer.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/content.xsd b/org.eclipse.vex.core.tests/testResources/content.xsd
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/content.xsd
rename to org.eclipse.vex.core.tests/testResources/content.xsd
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/document.xml b/org.eclipse.vex.core.tests/testResources/document.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/document.xml
rename to org.eclipse.vex.core.tests/testResources/document.xml
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/structure.xsd b/org.eclipse.vex.core.tests/testResources/structure.xsd
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/structure.xsd
rename to org.eclipse.vex.core.tests/testResources/structure.xsd
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/test.css b/org.eclipse.vex.core.tests/testResources/test.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/test.css
rename to org.eclipse.vex.core.tests/testResources/test.css
diff --git a/org.eclipse.wst.xml.vex.core.tests/testResources/test1.dtd b/org.eclipse.vex.core.tests/testResources/test1.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.core.tests/testResources/test1.dtd
rename to org.eclipse.vex.core.tests/testResources/test1.dtd
diff --git a/org.eclipse.wst.xml.vex.core/.classpath b/org.eclipse.vex.core/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.classpath
rename to org.eclipse.vex.core/.classpath
diff --git a/org.eclipse.wst.xml.vex.core/.cvsignore b/org.eclipse.vex.core/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.cvsignore
rename to org.eclipse.vex.core/.cvsignore
diff --git a/org.eclipse.vex.core/.gitignore b/org.eclipse.vex.core/.gitignore
new file mode 100644
index 0000000..fe07c27
--- /dev/null
+++ b/org.eclipse.vex.core/.gitignore
@@ -0,0 +1,2 @@
+bin

+/target
diff --git a/org.eclipse.wst.xml.vex.core/.project b/org.eclipse.vex.core/.project
similarity index 95%
rename from org.eclipse.wst.xml.vex.core/.project
rename to org.eclipse.vex.core/.project
index ecd6aaf..fb62b4d 100644
--- a/org.eclipse.wst.xml.vex.core/.project
+++ b/org.eclipse.vex.core/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.core</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sourceforge.metrics.builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>net.sourceforge.metrics.nature</nature>

+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.wst.xml.vex.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.core/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.core/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.core/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex.core/.settings/org.eclipse.wst.html.core.prefs b/org.eclipse.vex.core/.settings/org.eclipse.wst.html.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.settings/org.eclipse.wst.html.core.prefs
rename to org.eclipse.vex.core/.settings/org.eclipse.wst.html.core.prefs
diff --git a/org.eclipse.wst.xml.vex.core/.template b/org.eclipse.vex.core/.template
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/.template
rename to org.eclipse.vex.core/.template
diff --git a/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF b/org.eclipse.vex.core/META-INF/MANIFEST.MF
similarity index 82%
rename from org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
rename to org.eclipse.vex.core/META-INF/MANIFEST.MF
index e566c93..1205d5d 100644
--- a/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.core;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.core;singleton:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
@@ -16,13 +16,13 @@
  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.core.tests,org.eclipse.wst.xml.vex.ui",
- org.eclipse.wst.xml.vex.core.internal.css;x-friends:="org.eclipse.wst.xml.vex.core.tests,org.eclipse.wst.xml.vex.ui",
- org.eclipse.wst.xml.vex.core.internal.dom;x-friends:="org.eclipse.wst.xml.vex.core.tests,org.eclipse.wst.xml.vex.ui",
- org.eclipse.wst.xml.vex.core.internal.layout;x-friends:="org.eclipse.wst.xml.vex.core.tests,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.core.tests,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",
  org.w3c.flute.parser,
  org.w3c.flute.parser.selectors,
  org.w3c.flute.util
diff --git a/org.eclipse.wst.xml.vex.core/build.properties b/org.eclipse.vex.core/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/build.properties
rename to org.eclipse.vex.core/build.properties
diff --git a/org.eclipse.wst.xml.vex.core/lib/.cvsignore b/org.eclipse.vex.core/lib/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/lib/.cvsignore
rename to org.eclipse.vex.core/lib/.cvsignore
diff --git a/org.eclipse.wst.xml.vex.core/lib/flute.jar b/org.eclipse.vex.core/lib/flute.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/lib/flute.jar
rename to org.eclipse.vex.core/lib/flute.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.core/plugin.properties b/org.eclipse.vex.core/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/plugin.properties
rename to org.eclipse.vex.core/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.core/pom.xml b/org.eclipse.vex.core/pom.xml
similarity index 95%
rename from org.eclipse.wst.xml.vex.core/pom.xml
rename to org.eclipse.vex.core/pom.xml
index 4366e6e..7c7b86f 100644
--- a/org.eclipse.wst.xml.vex.core/pom.xml
+++ b/org.eclipse.vex.core/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/VEXCorePlugin.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Caret.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Color.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ColorResource.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/DisplayDevice.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Drawable.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontMetrics.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontResource.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/FontSpec.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Graphics.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Image.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Insets.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/IntRange.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/ListenerList.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Point.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/QualifiedNameComparator.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/core/Rectangle.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/AbstractProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BackgroundImageProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderSpacingProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderStyleProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/BorderWidthProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/CSS.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ColorProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/DisplayProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontFamilyProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontSizeProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontStyleProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontVariantProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/FontWeightProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/IProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LengthProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/LineHeightProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/ListStyleTypeProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyDecl.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/PseudoElement.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/RelativeLength.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Rule.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheetReader.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/Styles.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextAlignProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/TextDecorationProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/WhiteSpaceProperty.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/package.html b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/package.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/package.html
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/package.html
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Attribute.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Content.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Document.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentEvent.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentListener.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentReader.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentValidationException.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriter.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/GapContent.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicy.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/IWhitespacePolicyFactory.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Namespace.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/NamespaceStack.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Node.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Position.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/RootElement.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Text.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapper.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Validator.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/package.html b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/package.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/package.html
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/package.html
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBlockBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractInlineBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AnonymousBlockBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BoxFactory.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CompositeInlineBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/CssBoxFactory.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DocumentTextBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ElementOrRangeCallback.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/HCaret.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ImageBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/InlineElementBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutUtils.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/SpaceBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBodyBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableCellBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TableRowGroupBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextCaret.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/package.html b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/package.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/package.html
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/package.html
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotRedoException.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CannotUndoException.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/CompoundEdit.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/undo/IUndoableEdit.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/AttributeDefinition.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/WTPVEXValidator.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/CssWhitespacePolicy.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/HostComponent.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IBoxFilter.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/IVexWidget.java
diff --git a/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java b/org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
rename to org.eclipse.vex.core/src/org/eclipse/wst/xml/vex/core/internal/widget/VexWidgetImpl.java
diff --git a/org.eclipse.wst.xml.vex.dita/.classpath b/org.eclipse.vex.dita/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/.classpath
rename to org.eclipse.vex.dita/.classpath
diff --git a/org.eclipse.wst.xml.vex.dita/.cvsignore b/org.eclipse.vex.dita/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/.cvsignore
rename to org.eclipse.vex.dita/.cvsignore
diff --git a/org.eclipse.vex.dita/.gitignore b/org.eclipse.vex.dita/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/org.eclipse.vex.dita/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.wst.xml.vex/.project b/org.eclipse.vex.dita/.project
similarity index 91%
copy from org.eclipse.wst.xml.vex/.project
copy to org.eclipse.vex.dita/.project
index ad62e0a..970918c 100644
--- a/org.eclipse.wst.xml.vex/.project
+++ b/org.eclipse.vex.dita/.project
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.dita</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.dita/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.dita/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.dita/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.vex.dita/META-INF/MANIFEST.MF b/org.eclipse.vex.dita/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f6ba557
--- /dev/null
+++ b/org.eclipse.vex.dita/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.vex.dita;singleton:=true
+Require-Bundle: org.eclipse.vex.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.vex.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.wst.xml.core
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.wst.xml.vex.dita/build.properties b/org.eclipse.vex.dita/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/build.properties
rename to org.eclipse.vex.dita/build.properties
diff --git a/org.eclipse.wst.xml.vex.dita/css/common.css b/org.eclipse.vex.dita/css/common.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/common.css
rename to org.eclipse.vex.dita/css/common.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/concept.css b/org.eclipse.vex.dita/css/concept.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/concept.css
rename to org.eclipse.vex.dita/css/concept.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/dita_classed_shell.css b/org.eclipse.vex.dita/css/dita_classed_shell.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/dita_classed_shell.css
rename to org.eclipse.vex.dita/css/dita_classed_shell.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/dita_classed_shell_vex.css b/org.eclipse.vex.dita/css/dita_classed_shell_vex.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/dita_classed_shell_vex.css
rename to org.eclipse.vex.dita/css/dita_classed_shell_vex.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/dita_shell.css b/org.eclipse.vex.dita/css/dita_shell.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/dita_shell.css
rename to org.eclipse.vex.dita/css/dita_shell.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/domains.css b/org.eclipse.vex.dita/css/domains.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/domains.css
rename to org.eclipse.vex.dita/css/domains.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/domains_classed.css b/org.eclipse.vex.dita/css/domains_classed.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/domains_classed.css
rename to org.eclipse.vex.dita/css/domains_classed.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/domains_unclassed.css b/org.eclipse.vex.dita/css/domains_unclassed.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/domains_unclassed.css
rename to org.eclipse.vex.dita/css/domains_unclassed.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/map_shell.css b/org.eclipse.vex.dita/css/map_shell.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/map_shell.css
rename to org.eclipse.vex.dita/css/map_shell.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/reference.css b/org.eclipse.vex.dita/css/reference.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/reference.css
rename to org.eclipse.vex.dita/css/reference.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/task.css b/org.eclipse.vex.dita/css/task.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/task.css
rename to org.eclipse.vex.dita/css/task.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/topic-alt.css b/org.eclipse.vex.dita/css/topic-alt.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/topic-alt.css
rename to org.eclipse.vex.dita/css/topic-alt.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/topic.css b/org.eclipse.vex.dita/css/topic.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/topic.css
rename to org.eclipse.vex.dita/css/topic.css
diff --git a/org.eclipse.wst.xml.vex.dita/css/topic_classed.css b/org.eclipse.vex.dita/css/topic_classed.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/css/topic_classed.css
rename to org.eclipse.vex.dita/css/topic_classed.css
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/bookmap.dtd b/org.eclipse.vex.dita/dita11/bookmap.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/bookmap.dtd
rename to org.eclipse.vex.dita/dita11/bookmap.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/bookmap.mod b/org.eclipse.vex.dita/dita11/bookmap.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/bookmap.mod
rename to org.eclipse.vex.dita/dita11/bookmap.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/catalog-dita.txt b/org.eclipse.vex.dita/dita11/catalog-dita.txt
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/catalog-dita.txt
rename to org.eclipse.vex.dita/dita11/catalog-dita.txt
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/catalog-dita.xml b/org.eclipse.vex.dita/dita11/catalog-dita.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/catalog-dita.xml
rename to org.eclipse.vex.dita/dita11/catalog-dita.xml
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/commonElements.ent b/org.eclipse.vex.dita/dita11/commonElements.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/commonElements.ent
rename to org.eclipse.vex.dita/dita11/commonElements.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/commonElements.mod b/org.eclipse.vex.dita/dita11/commonElements.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/commonElements.mod
rename to org.eclipse.vex.dita/dita11/commonElements.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/concept.dtd b/org.eclipse.vex.dita/dita11/concept.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/concept.dtd
rename to org.eclipse.vex.dita/dita11/concept.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/concept.mod b/org.eclipse.vex.dita/dita11/concept.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/concept.mod
rename to org.eclipse.vex.dita/dita11/concept.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/ditabase.dtd b/org.eclipse.vex.dita/dita11/ditabase.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/ditabase.dtd
rename to org.eclipse.vex.dita/dita11/ditabase.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/glossary.dtd b/org.eclipse.vex.dita/dita11/glossary.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/glossary.dtd
rename to org.eclipse.vex.dita/dita11/glossary.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/glossary.mod b/org.eclipse.vex.dita/dita11/glossary.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/glossary.mod
rename to org.eclipse.vex.dita/dita11/glossary.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/highlightDomain.ent b/org.eclipse.vex.dita/dita11/highlightDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/highlightDomain.ent
rename to org.eclipse.vex.dita/dita11/highlightDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/highlightDomain.mod b/org.eclipse.vex.dita/dita11/highlightDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/highlightDomain.mod
rename to org.eclipse.vex.dita/dita11/highlightDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/indexingDomain.ent b/org.eclipse.vex.dita/dita11/indexingDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/indexingDomain.ent
rename to org.eclipse.vex.dita/dita11/indexingDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/indexingDomain.mod b/org.eclipse.vex.dita/dita11/indexingDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/indexingDomain.mod
rename to org.eclipse.vex.dita/dita11/indexingDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/map.dtd b/org.eclipse.vex.dita/dita11/map.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/map.dtd
rename to org.eclipse.vex.dita/dita11/map.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/map.mod b/org.eclipse.vex.dita/dita11/map.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/map.mod
rename to org.eclipse.vex.dita/dita11/map.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/mapGroup.ent b/org.eclipse.vex.dita/dita11/mapGroup.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/mapGroup.ent
rename to org.eclipse.vex.dita/dita11/mapGroup.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/mapGroup.mod b/org.eclipse.vex.dita/dita11/mapGroup.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/mapGroup.mod
rename to org.eclipse.vex.dita/dita11/mapGroup.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/metaDecl.mod b/org.eclipse.vex.dita/dita11/metaDecl.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/metaDecl.mod
rename to org.eclipse.vex.dita/dita11/metaDecl.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/programmingDomain.ent b/org.eclipse.vex.dita/dita11/programmingDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/programmingDomain.ent
rename to org.eclipse.vex.dita/dita11/programmingDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/programmingDomain.mod b/org.eclipse.vex.dita/dita11/programmingDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/programmingDomain.mod
rename to org.eclipse.vex.dita/dita11/programmingDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/reference.dtd b/org.eclipse.vex.dita/dita11/reference.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/reference.dtd
rename to org.eclipse.vex.dita/dita11/reference.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/reference.mod b/org.eclipse.vex.dita/dita11/reference.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/reference.mod
rename to org.eclipse.vex.dita/dita11/reference.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/softwareDomain.ent b/org.eclipse.vex.dita/dita11/softwareDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/softwareDomain.ent
rename to org.eclipse.vex.dita/dita11/softwareDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/softwareDomain.mod b/org.eclipse.vex.dita/dita11/softwareDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/softwareDomain.mod
rename to org.eclipse.vex.dita/dita11/softwareDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/task.dtd b/org.eclipse.vex.dita/dita11/task.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/task.dtd
rename to org.eclipse.vex.dita/dita11/task.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/task.mod b/org.eclipse.vex.dita/dita11/task.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/task.mod
rename to org.eclipse.vex.dita/dita11/task.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/tblDecl.mod b/org.eclipse.vex.dita/dita11/tblDecl.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/tblDecl.mod
rename to org.eclipse.vex.dita/dita11/tblDecl.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/topic.dtd b/org.eclipse.vex.dita/dita11/topic.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/topic.dtd
rename to org.eclipse.vex.dita/dita11/topic.dtd
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/topic.mod b/org.eclipse.vex.dita/dita11/topic.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/topic.mod
rename to org.eclipse.vex.dita/dita11/topic.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/topicDefn.ent b/org.eclipse.vex.dita/dita11/topicDefn.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/topicDefn.ent
rename to org.eclipse.vex.dita/dita11/topicDefn.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/uiDomain.ent b/org.eclipse.vex.dita/dita11/uiDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/uiDomain.ent
rename to org.eclipse.vex.dita/dita11/uiDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/uiDomain.mod b/org.eclipse.vex.dita/dita11/uiDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/uiDomain.mod
rename to org.eclipse.vex.dita/dita11/uiDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/utilitiesDomain.ent b/org.eclipse.vex.dita/dita11/utilitiesDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/utilitiesDomain.ent
rename to org.eclipse.vex.dita/dita11/utilitiesDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/utilitiesDomain.mod b/org.eclipse.vex.dita/dita11/utilitiesDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/utilitiesDomain.mod
rename to org.eclipse.vex.dita/dita11/utilitiesDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/xnalDomain.ent b/org.eclipse.vex.dita/dita11/xnalDomain.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/xnalDomain.ent
rename to org.eclipse.vex.dita/dita11/xnalDomain.ent
diff --git a/org.eclipse.wst.xml.vex.dita/dita11/xnalDomain.mod b/org.eclipse.vex.dita/dita11/xnalDomain.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/dita11/xnalDomain.mod
rename to org.eclipse.vex.dita/dita11/xnalDomain.mod
diff --git a/org.eclipse.wst.xml.vex.dita/plugin.properties b/org.eclipse.vex.dita/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.dita/plugin.properties
rename to org.eclipse.vex.dita/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.dita/plugin.xml b/org.eclipse.vex.dita/plugin.xml
similarity index 90%
rename from org.eclipse.wst.xml.vex.dita/plugin.xml
rename to org.eclipse.vex.dita/plugin.xml
index 29c5aef..37c5aa4 100644
--- a/org.eclipse.wst.xml.vex.dita/plugin.xml
+++ b/org.eclipse.vex.dita/plugin.xml
@@ -56,7 +56,7 @@
    <extension
          id="concept"
          name="%doctype.concept"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             systemId="concept.dtd"
             publicId="-//OASIS//DTD DITA 1.1 Concept//EN">
@@ -68,7 +68,7 @@
    <extension
          id="composite"
          name="%doctype.composite"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             systemId="ditabase.dtd"
             publicId="-//OASIS//DTD DITA Composite//EN">
@@ -77,7 +77,7 @@
    <extension
          id="reference"
          name="%doctype.reference"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             systemId="reference.dtd"
             publicId="-//OASIS//DTD DITA Reference//EN">
@@ -86,7 +86,7 @@
    <extension
          id="task"
          name="%doctype.task"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             systemId="task.dtd"
             publicId="-//OASIS//DTD DITA Task//EN">
@@ -95,7 +95,7 @@
    <extension
          id="topic"
          name="%doctype.topic"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             systemId="topic.dtd"
             publicId="-//OASIS//DTD DITA Topic//EN">
@@ -104,7 +104,7 @@
    <extension
          id="map"
          name="%doctype.map"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             systemId="map.dtd"
             publicId="-//OASIS//DTD DITA Map//EN">
@@ -113,7 +113,7 @@
    <extension
          id="classed"
          name="%style.classed"
-         point="org.eclipse.wst.xml.vex.ui.styles">
+         point="org.eclipse.vex.ui.styles">
       <style
             css="css/dita_classed_shell_vex.css">
          <doctypeRef
@@ -137,7 +137,7 @@
    <extension
          id="mapStyle"
          name="%style.mapStyle"
-         point="org.eclipse.wst.xml.vex.ui.styles">
+         point="org.eclipse.vex.ui.styles">
       <style
             css="css/map_shell.css">
          <doctypeRef
diff --git a/org.eclipse.wst.xml.vex.dita/pom.xml b/org.eclipse.vex.dita/pom.xml
similarity index 95%
rename from org.eclipse.wst.xml.vex.dita/pom.xml
rename to org.eclipse.vex.dita/pom.xml
index e5bf8d2..ecf1bf9 100644
--- a/org.eclipse.wst.xml.vex.dita/pom.xml
+++ b/org.eclipse.vex.dita/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.feature/.project b/org.eclipse.vex.docbook.feature/.project
similarity index 87%
copy from org.eclipse.wst.xml.vex.feature/.project
copy to org.eclipse.vex.docbook.feature/.project
index 122e295..49145f3 100644
--- a/org.eclipse.wst.xml.vex.feature/.project
+++ b/org.eclipse.vex.docbook.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.docbook.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.docbook.feature/build.properties b/org.eclipse.vex.docbook.feature/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook.feature/build.properties
rename to org.eclipse.vex.docbook.feature/build.properties
diff --git a/org.eclipse.wst.xml.vex.docbook.feature/feature.xml b/org.eclipse.vex.docbook.feature/feature.xml
similarity index 74%
rename from org.eclipse.wst.xml.vex.docbook.feature/feature.xml
rename to org.eclipse.vex.docbook.feature/feature.xml
index dfcddca..d096fee 100644
--- a/org.eclipse.wst.xml.vex.docbook.feature/feature.xml
+++ b/org.eclipse.vex.docbook.feature/feature.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml.vex.docbook.feature"
-      label="Docbook Incubating Feature"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.xml.vex.core" version="0.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.wst.xml.vex.ui" version="0.5.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.docbook"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.vex.docbook.feature"

+      label="Docbook Incubating Feature"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse.org">

+

+   <description url="http://www.example.com/description">

+      [Enter Feature Description here.]

+   </description>

+

+   <copyright url="http://www.example.com/copyright">

+      [Enter Copyright Description here.]

+   </copyright>

+

+   <license url="http://www.example.com/license">

+      [Enter License Description here.]

+   </license>

+

+   <requires>

+      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>

+      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>

+      <import plugin="org.eclipse.vex.core" version="0.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.vex.ui" version="0.0.0" match="greaterOrEqual"/>

+   </requires>

+

+   <plugin

+         id="org.eclipse.vex.docbook"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/org.eclipse.wst.xml.vex.docbook.feature/pom.xml b/org.eclipse.vex.docbook.feature/pom.xml
similarity index 88%
rename from org.eclipse.wst.xml.vex.docbook.feature/pom.xml
rename to org.eclipse.vex.docbook.feature/pom.xml
index cfb9236..0448c02 100644
--- a/org.eclipse.wst.xml.vex.docbook.feature/pom.xml
+++ b/org.eclipse.vex.docbook.feature/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 </project>
diff --git a/org.eclipse.wst.xml.vex.docbook/.classpath b/org.eclipse.vex.docbook/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/.classpath
rename to org.eclipse.vex.docbook/.classpath
diff --git a/org.eclipse.wst.xml.vex.docbook/.cvsignore b/org.eclipse.vex.docbook/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/.cvsignore
rename to org.eclipse.vex.docbook/.cvsignore
diff --git a/org.eclipse.vex.docbook/.gitignore b/org.eclipse.vex.docbook/.gitignore
new file mode 100644
index 0000000..fe07c27
--- /dev/null
+++ b/org.eclipse.vex.docbook/.gitignore
@@ -0,0 +1,2 @@
+bin

+/target
diff --git a/org.eclipse.wst.xml.vex.xhtml/.project b/org.eclipse.vex.docbook/.project
similarity index 94%
rename from org.eclipse.wst.xml.vex.xhtml/.project
rename to org.eclipse.vex.docbook/.project
index d8bebca..7eea5fd 100644
--- a/org.eclipse.wst.xml.vex.xhtml/.project
+++ b/org.eclipse.vex.docbook/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.wst.xml.vex.xhtml</name>

+	<name>org.eclipse.vex.docbook</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/org.eclipse.wst.xml.vex.docbook/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.docbook/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.docbook/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.vex.docbook/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.wst.xml.vex.docbook/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.docbook/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ChangeLog b/org.eclipse.vex.docbook/4.5/ChangeLog
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ChangeLog
rename to org.eclipse.vex.docbook/4.5/ChangeLog
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/README b/org.eclipse.vex.docbook/4.5/README
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/README
rename to org.eclipse.vex.docbook/4.5/README
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/calstblx.dtd b/org.eclipse.vex.docbook/4.5/calstblx.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/calstblx.dtd
rename to org.eclipse.vex.docbook/4.5/calstblx.dtd
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/catalog.xml b/org.eclipse.vex.docbook/4.5/catalog.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/catalog.xml
rename to org.eclipse.vex.docbook/4.5/catalog.xml
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/dbcentx.mod b/org.eclipse.vex.docbook/4.5/dbcentx.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/dbcentx.mod
rename to org.eclipse.vex.docbook/4.5/dbcentx.mod
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/dbgenent.mod b/org.eclipse.vex.docbook/4.5/dbgenent.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/dbgenent.mod
rename to org.eclipse.vex.docbook/4.5/dbgenent.mod
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/dbhierx.mod b/org.eclipse.vex.docbook/4.5/dbhierx.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/dbhierx.mod
rename to org.eclipse.vex.docbook/4.5/dbhierx.mod
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/dbnotnx.mod b/org.eclipse.vex.docbook/4.5/dbnotnx.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/dbnotnx.mod
rename to org.eclipse.vex.docbook/4.5/dbnotnx.mod
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/dbpoolx.mod b/org.eclipse.vex.docbook/4.5/dbpoolx.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/dbpoolx.mod
rename to org.eclipse.vex.docbook/4.5/dbpoolx.mod
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/docbook.cat b/org.eclipse.vex.docbook/4.5/docbook.cat
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/docbook.cat
rename to org.eclipse.vex.docbook/4.5/docbook.cat
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/docbookx.dtd b/org.eclipse.vex.docbook/4.5/docbookx.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/docbookx.dtd
rename to org.eclipse.vex.docbook/4.5/docbookx.dtd
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/README b/org.eclipse.vex.docbook/4.5/ent/README
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/README
rename to org.eclipse.vex.docbook/4.5/ent/README
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsa.ent b/org.eclipse.vex.docbook/4.5/ent/isoamsa.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsa.ent
rename to org.eclipse.vex.docbook/4.5/ent/isoamsa.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsb.ent b/org.eclipse.vex.docbook/4.5/ent/isoamsb.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsb.ent
rename to org.eclipse.vex.docbook/4.5/ent/isoamsb.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsc.ent b/org.eclipse.vex.docbook/4.5/ent/isoamsc.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsc.ent
rename to org.eclipse.vex.docbook/4.5/ent/isoamsc.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsn.ent b/org.eclipse.vex.docbook/4.5/ent/isoamsn.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsn.ent
rename to org.eclipse.vex.docbook/4.5/ent/isoamsn.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamso.ent b/org.eclipse.vex.docbook/4.5/ent/isoamso.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamso.ent
rename to org.eclipse.vex.docbook/4.5/ent/isoamso.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsr.ent b/org.eclipse.vex.docbook/4.5/ent/isoamsr.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isoamsr.ent
rename to org.eclipse.vex.docbook/4.5/ent/isoamsr.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isobox.ent b/org.eclipse.vex.docbook/4.5/ent/isobox.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isobox.ent
rename to org.eclipse.vex.docbook/4.5/ent/isobox.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isocyr1.ent b/org.eclipse.vex.docbook/4.5/ent/isocyr1.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isocyr1.ent
rename to org.eclipse.vex.docbook/4.5/ent/isocyr1.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isocyr2.ent b/org.eclipse.vex.docbook/4.5/ent/isocyr2.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isocyr2.ent
rename to org.eclipse.vex.docbook/4.5/ent/isocyr2.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isodia.ent b/org.eclipse.vex.docbook/4.5/ent/isodia.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isodia.ent
rename to org.eclipse.vex.docbook/4.5/ent/isodia.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk1.ent b/org.eclipse.vex.docbook/4.5/ent/isogrk1.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk1.ent
rename to org.eclipse.vex.docbook/4.5/ent/isogrk1.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk2.ent b/org.eclipse.vex.docbook/4.5/ent/isogrk2.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk2.ent
rename to org.eclipse.vex.docbook/4.5/ent/isogrk2.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk3.ent b/org.eclipse.vex.docbook/4.5/ent/isogrk3.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk3.ent
rename to org.eclipse.vex.docbook/4.5/ent/isogrk3.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk4.ent b/org.eclipse.vex.docbook/4.5/ent/isogrk4.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isogrk4.ent
rename to org.eclipse.vex.docbook/4.5/ent/isogrk4.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isolat1.ent b/org.eclipse.vex.docbook/4.5/ent/isolat1.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isolat1.ent
rename to org.eclipse.vex.docbook/4.5/ent/isolat1.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isolat2.ent b/org.eclipse.vex.docbook/4.5/ent/isolat2.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isolat2.ent
rename to org.eclipse.vex.docbook/4.5/ent/isolat2.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isonum.ent b/org.eclipse.vex.docbook/4.5/ent/isonum.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isonum.ent
rename to org.eclipse.vex.docbook/4.5/ent/isonum.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isopub.ent b/org.eclipse.vex.docbook/4.5/ent/isopub.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isopub.ent
rename to org.eclipse.vex.docbook/4.5/ent/isopub.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/ent/isotech.ent b/org.eclipse.vex.docbook/4.5/ent/isotech.ent
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/ent/isotech.ent
rename to org.eclipse.vex.docbook/4.5/ent/isotech.ent
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/htmltblx.mod b/org.eclipse.vex.docbook/4.5/htmltblx.mod
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/htmltblx.mod
rename to org.eclipse.vex.docbook/4.5/htmltblx.mod
diff --git a/org.eclipse.wst.xml.vex.docbook/4.5/soextblx.dtd b/org.eclipse.vex.docbook/4.5/soextblx.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/4.5/soextblx.dtd
rename to org.eclipse.vex.docbook/4.5/soextblx.dtd
diff --git a/org.eclipse.wst.xml.vex.docbook/META-INF/MANIFEST.MF b/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
similarity index 71%
rename from org.eclipse.wst.xml.vex.docbook/META-INF/MANIFEST.MF
rename to org.eclipse.vex.docbook/META-INF/MANIFEST.MF
index 9795fff..de6ed32 100644
--- a/org.eclipse.wst.xml.vex.docbook/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.docbook/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@
 Bundle-Name: %pluginName
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.docbook;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.docbook;singleton:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.vex.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xml.vex.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.vex.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.vex.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.1,3.0.0)",
  org.eclipse.wst.xml.core
 Bundle-Localization: plugin
diff --git a/org.eclipse.wst.xml.vex.docbook/build.properties b/org.eclipse.vex.docbook/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/build.properties
rename to org.eclipse.vex.docbook/build.properties
diff --git a/org.eclipse.wst.xml.vex.docbook/plugin.properties b/org.eclipse.vex.docbook/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/plugin.properties
rename to org.eclipse.vex.docbook/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.docbook/plugin.xml b/org.eclipse.vex.docbook/plugin.xml
similarity index 95%
rename from org.eclipse.wst.xml.vex.docbook/plugin.xml
rename to org.eclipse.vex.docbook/plugin.xml
index 2538b3e..f9b5f87 100644
--- a/org.eclipse.wst.xml.vex.docbook/plugin.xml
+++ b/org.eclipse.vex.docbook/plugin.xml
@@ -22,7 +22,7 @@
    <extension
          id="docbook4_5"
          name="%doctype.docbook4_5"
-         point="org.eclipse.wst.xml.vex.ui.doctypes">
+         point="org.eclipse.vex.ui.doctypes">
       <doctype
             outlineProvider="org.eclipse.wst.xml.vex.docbook.DocBookOutlineProvider"
             publicId="-//OASIS//DTD DocBook XML V4.5//EN"
@@ -64,7 +64,7 @@
    <extension
          id="docbook-plain"
          name="%style.docbook-plain"
-         point="org.eclipse.wst.xml.vex.ui.styles">
+         point="org.eclipse.vex.ui.styles">
       <style
             css="styles/docbook-plain.css">
          <doctypeRef publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN"/>
diff --git a/org.eclipse.wst.xml.vex.docbook/pom.xml b/org.eclipse.vex.docbook/pom.xml
similarity index 95%
rename from org.eclipse.wst.xml.vex.docbook/pom.xml
rename to org.eclipse.vex.docbook/pom.xml
index 2fbc683..0729369 100644
--- a/org.eclipse.wst.xml.vex.docbook/pom.xml
+++ b/org.eclipse.vex.docbook/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java b/org.eclipse.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
rename to org.eclipse.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
diff --git a/org.eclipse.wst.xml.vex.docbook/styles/docbook-plain.css b/org.eclipse.vex.docbook/styles/docbook-plain.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.docbook/styles/docbook-plain.css
rename to org.eclipse.vex.docbook/styles/docbook-plain.css
diff --git a/org.eclipse.wst.xml.vex.documentation/.cvsignore b/org.eclipse.vex.documentation/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/.cvsignore
rename to org.eclipse.vex.documentation/.cvsignore
diff --git a/org.eclipse.vex.documentation/.gitignore b/org.eclipse.vex.documentation/.gitignore
new file mode 100644
index 0000000..9095d63
--- /dev/null
+++ b/org.eclipse.vex.documentation/.gitignore
@@ -0,0 +1,2 @@
+/help
+/target
diff --git a/org.eclipse.wst.xml.vex/.project b/org.eclipse.vex.documentation/.project
similarity index 90%
copy from org.eclipse.wst.xml.vex/.project
copy to org.eclipse.vex.documentation/.project
index ad62e0a..14b1280 100644
--- a/org.eclipse.wst.xml.vex/.project
+++ b/org.eclipse.vex.documentation/.project
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.documentation</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.documentation/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.documentation/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.documentation/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex.documentation/.template b/org.eclipse.vex.documentation/.template
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/.template
rename to org.eclipse.vex.documentation/.template
diff --git a/org.eclipse.wst.xml.vex.documentation/META-INF/MANIFEST.MF b/org.eclipse.vex.documentation/META-INF/MANIFEST.MF
similarity index 75%
rename from org.eclipse.wst.xml.vex.documentation/META-INF/MANIFEST.MF
rename to org.eclipse.vex.documentation/META-INF/MANIFEST.MF
index 3acc6f5..6558034 100644
--- a/org.eclipse.wst.xml.vex.documentation/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.documentation/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.documentation;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.documentation;singleton:=true
 Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)"
 Bundle-Localization: plugin
diff --git a/org.eclipse.wst.xml.vex.documentation/build.properties b/org.eclipse.vex.documentation/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/build.properties
rename to org.eclipse.vex.documentation/build.properties
diff --git a/org.eclipse.wst.xml.vex.documentation/buildHelp.xml b/org.eclipse.vex.documentation/buildHelp.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/buildHelp.xml
rename to org.eclipse.vex.documentation/buildHelp.xml
diff --git a/org.eclipse.wst.xml.vex.documentation/html/concepts/editing.html b/org.eclipse.vex.documentation/html/concepts/editing.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/concepts/editing.html
rename to org.eclipse.vex.documentation/html/concepts/editing.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/concepts/extending.html b/org.eclipse.vex.documentation/html/concepts/extending.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/concepts/extending.html
rename to org.eclipse.vex.documentation/html/concepts/extending.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/concepts/inserting.html b/org.eclipse.vex.documentation/html/concepts/inserting.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/concepts/inserting.html
rename to org.eclipse.vex.documentation/html/concepts/inserting.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/concepts/selection.html b/org.eclipse.vex.documentation/html/concepts/selection.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/concepts/selection.html
rename to org.eclipse.vex.documentation/html/concepts/selection.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/concepts/split-join.html b/org.eclipse.vex.documentation/html/concepts/split-join.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/concepts/split-join.html
rename to org.eclipse.vex.documentation/html/concepts/split-join.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/concepts/unwrap-morph.html b/org.eclipse.vex.documentation/html/concepts/unwrap-morph.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/concepts/unwrap-morph.html
rename to org.eclipse.vex.documentation/html/concepts/unwrap-morph.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/tasks/create-plugin-project.html b/org.eclipse.vex.documentation/html/tasks/create-plugin-project.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/tasks/create-plugin-project.html
rename to org.eclipse.vex.documentation/html/tasks/create-plugin-project.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/tasks/register-css.html b/org.eclipse.vex.documentation/html/tasks/register-css.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/tasks/register-css.html
rename to org.eclipse.vex.documentation/html/tasks/register-css.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/tasks/register-dtd.html b/org.eclipse.vex.documentation/html/tasks/register-dtd.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/tasks/register-dtd.html
rename to org.eclipse.vex.documentation/html/tasks/register-dtd.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/tasks/show-configuration-view.html b/org.eclipse.vex.documentation/html/tasks/show-configuration-view.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/tasks/show-configuration-view.html
rename to org.eclipse.vex.documentation/html/tasks/show-configuration-view.html
diff --git a/org.eclipse.wst.xml.vex.documentation/html/toc.html b/org.eclipse.vex.documentation/html/toc.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/html/toc.html
rename to org.eclipse.vex.documentation/html/toc.html
diff --git a/org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.confluence.core_1.4.0.I20100805-0500-e3x.jar b/org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.confluence.core_1.4.0.I20100805-0500-e3x.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.confluence.core_1.4.0.I20100805-0500-e3x.jar
rename to org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.confluence.core_1.4.0.I20100805-0500-e3x.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.core_1.4.0.I20100805-0500-e3x.jar b/org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.core_1.4.0.I20100805-0500-e3x.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.core_1.4.0.I20100805-0500-e3x.jar
rename to org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.core_1.4.0.I20100805-0500-e3x.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.4.0.I20100805-0500-e3x.jar b/org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.4.0.I20100805-0500-e3x.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.4.0.I20100805-0500-e3x.jar
rename to org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.4.0.I20100805-0500-e3x.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.textile.core_1.4.0.I20100805-0500-e3x.jar b/org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.textile.core_1.4.0.I20100805-0500-e3x.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.textile.core_1.4.0.I20100805-0500-e3x.jar
rename to org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.textile.core_1.4.0.I20100805-0500-e3x.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.tracwiki.core_1.4.0.I20100805-0500-e3x.jar b/org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.tracwiki.core_1.4.0.I20100805-0500-e3x.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.tracwiki.core_1.4.0.I20100805-0500-e3x.jar
rename to org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.tracwiki.core_1.4.0.I20100805-0500-e3x.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.twiki.core_1.4.0.I20100805-0500-e3x.jar b/org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.twiki.core_1.4.0.I20100805-0500-e3x.jar
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/lib/org.eclipse.mylyn.wikitext.twiki.core_1.4.0.I20100805-0500-e3x.jar
rename to org.eclipse.vex.documentation/lib/org.eclipse.mylyn.wikitext.twiki.core_1.4.0.I20100805-0500-e3x.jar
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.documentation/plugin.properties b/org.eclipse.vex.documentation/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/plugin.properties
rename to org.eclipse.vex.documentation/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.documentation/plugin.xml b/org.eclipse.vex.documentation/plugin.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/plugin.xml
rename to org.eclipse.vex.documentation/plugin.xml
diff --git a/org.eclipse.wst.xml.vex.documentation/pom.xml b/org.eclipse.vex.documentation/pom.xml
similarity index 94%
rename from org.eclipse.wst.xml.vex.documentation/pom.xml
rename to org.eclipse.vex.documentation/pom.xml
index a6a27d9..585ce29 100644
--- a/org.eclipse.wst.xml.vex.documentation/pom.xml
+++ b/org.eclipse.vex.documentation/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.documentation/toc.xml b/org.eclipse.vex.documentation/toc.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/toc.xml
rename to org.eclipse.vex.documentation/toc.xml
diff --git a/org.eclipse.wst.xml.vex.documentation/toc.xsl b/org.eclipse.vex.documentation/toc.xsl
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/toc.xsl
rename to org.eclipse.vex.documentation/toc.xsl
diff --git a/org.eclipse.wst.xml.vex.documentation/tocconcepts.xml b/org.eclipse.vex.documentation/tocconcepts.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/tocconcepts.xml
rename to org.eclipse.vex.documentation/tocconcepts.xml
diff --git a/org.eclipse.wst.xml.vex.documentation/toctasks.xml b/org.eclipse.vex.documentation/toctasks.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.documentation/toctasks.xml
rename to org.eclipse.vex.documentation/toctasks.xml
diff --git a/org.eclipse.wst.xml.vex.feature/.cvsignore b/org.eclipse.vex.feature/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/.cvsignore
rename to org.eclipse.vex.feature/.cvsignore
diff --git a/org.eclipse.vex.feature/.gitignore b/org.eclipse.vex.feature/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/org.eclipse.vex.feature/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.wst.xml.vex.feature/.project b/org.eclipse.vex.feature/.project
similarity index 87%
rename from org.eclipse.wst.xml.vex.feature/.project
rename to org.eclipse.vex.feature/.project
index 122e295..d5d8948 100644
--- a/org.eclipse.wst.xml.vex.feature/.project
+++ b/org.eclipse.vex.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.feature/build.properties b/org.eclipse.vex.feature/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/build.properties
rename to org.eclipse.vex.feature/build.properties
diff --git a/org.eclipse.wst.xml.vex.feature/feature.properties b/org.eclipse.vex.feature/feature.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/feature.properties
rename to org.eclipse.vex.feature/feature.properties
diff --git a/org.eclipse.wst.xml.vex.feature/feature.xml b/org.eclipse.vex.feature/feature.xml
similarity index 82%
rename from org.eclipse.wst.xml.vex.feature/feature.xml
rename to org.eclipse.vex.feature/feature.xml
index 9c5f4de..fc2182e 100644
--- a/org.eclipse.wst.xml.vex.feature/feature.xml
+++ b/org.eclipse.vex.feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <feature

-      id="org.eclipse.wst.xml.vex.feature"

+      id="org.eclipse.vex.feature"

       label="%featureName"

       version="1.0.0.qualifier"

       provider-name="%providerName"

-      plugin="org.eclipse.wst.xml.vex"

+      plugin="org.eclipse.vex"

       image="eclipse_update_120.jpg"

       application="org.eclipse.ui.ide.workbench">

 

@@ -32,42 +32,42 @@
    </requires>

 

    <plugin

-         id="org.eclipse.wst.xml.vex"

+         id="org.eclipse.vex"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.xml.vex.ui"

+         id="org.eclipse.vex.ui"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.xml.vex.documentation"

+         id="org.eclipse.vex.documentation"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.xml.vex.core"

+         id="org.eclipse.vex.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.xml.vex.docbook"

+         id="org.eclipse.vex.docbook"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.xml.vex.dita"

+         id="org.eclipse.vex.dita"

          download-size="0"

          install-size="0"

          version="0.0.0"

@@ -81,7 +81,7 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.xml.vex.xhtml"

+         id="org.eclipse.vex.xhtml"

          download-size="0"

          install-size="0"

          version="0.0.0"

diff --git a/org.eclipse.wst.xml.vex.feature/feature_fr.properties b/org.eclipse.vex.feature/feature_fr.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/feature_fr.properties
rename to org.eclipse.vex.feature/feature_fr.properties
diff --git a/org.eclipse.wst.xml.vex.docbook.feature/pom.xml b/org.eclipse.vex.feature/pom.xml
similarity index 88%
copy from org.eclipse.wst.xml.vex.docbook.feature/pom.xml
copy to org.eclipse.vex.feature/pom.xml
index cfb9236..0448c02 100644
--- a/org.eclipse.wst.xml.vex.docbook.feature/pom.xml
+++ b/org.eclipse.vex.feature/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 </project>
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.html b/org.eclipse.vex.feature/sourceTemplateBundle/about.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.html
rename to org.eclipse.vex.feature/sourceTemplateBundle/about.html
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.ini b/org.eclipse.vex.feature/sourceTemplateBundle/about.ini
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.ini
rename to org.eclipse.vex.feature/sourceTemplateBundle/about.ini
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.mappings b/org.eclipse.vex.feature/sourceTemplateBundle/about.mappings
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.mappings
rename to org.eclipse.vex.feature/sourceTemplateBundle/about.mappings
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.properties b/org.eclipse.vex.feature/sourceTemplateBundle/about.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/about.properties
rename to org.eclipse.vex.feature/sourceTemplateBundle/about.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/build.properties b/org.eclipse.vex.feature/sourceTemplateBundle/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/build.properties
rename to org.eclipse.vex.feature/sourceTemplateBundle/build.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/plugin.properties b/org.eclipse.vex.feature/sourceTemplateBundle/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/plugin.properties
rename to org.eclipse.vex.feature/sourceTemplateBundle/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/wtp_prod32.gif b/org.eclipse.vex.feature/sourceTemplateBundle/wtp_prod32.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/wtp_prod32.gif
rename to org.eclipse.vex.feature/sourceTemplateBundle/wtp_prod32.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/wtp_prod32.png b/org.eclipse.vex.feature/sourceTemplateBundle/wtp_prod32.png
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateBundle/wtp_prod32.png
rename to org.eclipse.vex.feature/sourceTemplateBundle/wtp_prod32.png
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/build.properties b/org.eclipse.vex.feature/sourceTemplateFeature/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/build.properties
rename to org.eclipse.vex.feature/sourceTemplateFeature/build.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/eclipse_update_120.jpg b/org.eclipse.vex.feature/sourceTemplateFeature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/eclipse_update_120.jpg
rename to org.eclipse.vex.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/epl-v10.html b/org.eclipse.vex.feature/sourceTemplateFeature/epl-v10.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/epl-v10.html
rename to org.eclipse.vex.feature/sourceTemplateFeature/epl-v10.html
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/feature.properties b/org.eclipse.vex.feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/feature.properties
rename to org.eclipse.vex.feature/sourceTemplateFeature/feature.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/license.html b/org.eclipse.vex.feature/sourceTemplateFeature/license.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplateFeature/license.html
rename to org.eclipse.vex.feature/sourceTemplateFeature/license.html
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.html b/org.eclipse.vex.feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.html
rename to org.eclipse.vex.feature/sourceTemplatePlugin/about.html
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.ini b/org.eclipse.vex.feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.ini
rename to org.eclipse.vex.feature/sourceTemplatePlugin/about.ini
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.mappings b/org.eclipse.vex.feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.mappings
rename to org.eclipse.vex.feature/sourceTemplatePlugin/about.mappings
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.properties b/org.eclipse.vex.feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/about.properties
rename to org.eclipse.vex.feature/sourceTemplatePlugin/about.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/build.properties b/org.eclipse.vex.feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/build.properties
rename to org.eclipse.vex.feature/sourceTemplatePlugin/build.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.vex.feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/plugin.properties
rename to org.eclipse.vex.feature/sourceTemplatePlugin/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/wtp_prod32.gif b/org.eclipse.vex.feature/sourceTemplatePlugin/wtp_prod32.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/wtp_prod32.gif
rename to org.eclipse.vex.feature/sourceTemplatePlugin/wtp_prod32.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/wtp_prod32.png b/org.eclipse.vex.feature/sourceTemplatePlugin/wtp_prod32.png
similarity index 100%
rename from org.eclipse.wst.xml.vex.feature/sourceTemplatePlugin/wtp_prod32.png
rename to org.eclipse.vex.feature/sourceTemplatePlugin/wtp_prod32.png
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.releng/.cvsignore b/org.eclipse.vex.releng/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/.cvsignore
rename to org.eclipse.vex.releng/.cvsignore
diff --git a/org.eclipse.wst.xml.vex.releng/.project b/org.eclipse.vex.releng/.project
similarity index 79%
rename from org.eclipse.wst.xml.vex.releng/.project
rename to org.eclipse.vex.releng/.project
index f6581ea..c83f1c0 100644
--- a/org.eclipse.wst.xml.vex.releng/.project
+++ b/org.eclipse.vex.releng/.project
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.releng</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.releng</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+	</buildSpec>

+	<natures>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.releng/Vex.launch b/org.eclipse.vex.releng/Vex.launch
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/Vex.launch
rename to org.eclipse.vex.releng/Vex.launch
diff --git a/org.eclipse.wst.xml.vex.releng/bootstrap.xml b/org.eclipse.vex.releng/bootstrap.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/bootstrap.xml
rename to org.eclipse.vex.releng/bootstrap.xml
diff --git a/org.eclipse.wst.xml.vex.releng/build.properties b/org.eclipse.vex.releng/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/build.properties
rename to org.eclipse.vex.releng/build.properties
diff --git a/org.eclipse.wst.xml.vex.releng/build.xml b/org.eclipse.vex.releng/build.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/build.xml
rename to org.eclipse.vex.releng/build.xml
diff --git a/org.eclipse.wst.xml.vex.releng/buildUtils.xml b/org.eclipse.vex.releng/buildUtils.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/buildUtils.xml
rename to org.eclipse.vex.releng/buildUtils.xml
diff --git a/org.eclipse.wst.xml.vex.releng/findbugs.xml b/org.eclipse.vex.releng/findbugs.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/findbugs.xml
rename to org.eclipse.vex.releng/findbugs.xml
diff --git a/org.eclipse.wst.xml.vex.releng/maps/orbit.map b/org.eclipse.vex.releng/maps/orbit.map
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/maps/orbit.map
rename to org.eclipse.vex.releng/maps/orbit.map
diff --git a/org.eclipse.wst.xml.vex.releng/maps/vex.map b/org.eclipse.vex.releng/maps/vex.map
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/maps/vex.map
rename to org.eclipse.vex.releng/maps/vex.map
diff --git a/org.eclipse.wst.xml.vex.releng/pmd.xml b/org.eclipse.vex.releng/pmd.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/pmd.xml
rename to org.eclipse.vex.releng/pmd.xml
diff --git a/org.eclipse.wst.xml.vex.releng/pom.xml b/org.eclipse.vex.releng/pom.xml
similarity index 82%
rename from org.eclipse.wst.xml.vex.releng/pom.xml
rename to org.eclipse.vex.releng/pom.xml
index e805cde..7079a0c 100644
--- a/org.eclipse.wst.xml.vex.releng/pom.xml
+++ b/org.eclipse.vex.releng/pom.xml
@@ -28,18 +28,18 @@
 	</properties>
 
 	<modules>
-		<module>../org.eclipse.wst.xml.vex</module>
-		<module>../org.eclipse.wst.xml.vex.core</module>
-		<module>../org.eclipse.wst.xml.vex.ui</module>
-		<module>../org.eclipse.wst.xml.vex.dita</module>
-		<module>../org.eclipse.wst.xml.vex.docbook</module>
-		<module>../org.eclipse.wst.xml.vex.xhtml</module>
-		<module>../org.eclipse.wst.xml.vex.documentation</module>
-		<module>../org.eclipse.wst.xml.vex.feature</module>
-		<module>../org.eclipse.wst.xml.vex_sdk.feature</module>
-		<module>../org.eclipse.wst.xml.vex.repository</module>
-		<module>../org.eclipse.wst.xml.vex.core.tests</module>
-		<module>../org.eclipse.wst.xml.vex.ui.tests</module>
+		<module>../org.eclipse.vex</module>
+		<module>../org.eclipse.vex.core</module>
+		<module>../org.eclipse.vex.ui</module>
+		<module>../org.eclipse.vex.dita</module>
+		<module>../org.eclipse.vex.docbook</module>
+		<module>../org.eclipse.vex.xhtml</module>
+		<module>../org.eclipse.vex.documentation</module>
+		<module>../org.eclipse.vex.feature</module>
+		<module>../org.eclipse.vex.sdk.feature</module>
+		<module>../org.eclipse.vex.repository</module>
+		<module>../org.eclipse.vex.core.tests</module>
+		<module>../org.eclipse.vex.ui.tests</module>
 	</modules>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.releng/testing.properties b/org.eclipse.vex.releng/testing.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/testing.properties
rename to org.eclipse.vex.releng/testing.properties
diff --git a/org.eclipse.wst.xml.vex.releng/vex.helios.target b/org.eclipse.vex.releng/vex.helios.target
similarity index 100%
rename from org.eclipse.wst.xml.vex.releng/vex.helios.target
rename to org.eclipse.vex.releng/vex.helios.target
diff --git a/org.eclipse.vex.repository/.gitignore b/org.eclipse.vex.repository/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/org.eclipse.vex.repository/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.wst.xml.vex.repository/.project b/org.eclipse.vex.repository/.project
similarity index 87%
rename from org.eclipse.wst.xml.vex.repository/.project
rename to org.eclipse.vex.repository/.project
index 7433c3a..342cecb 100644
--- a/org.eclipse.wst.xml.vex.repository/.project
+++ b/org.eclipse.vex.repository/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.repository</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.repository</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.UpdateSiteBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.UpdateSiteNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.repository/pom.xml b/org.eclipse.vex.repository/pom.xml
similarity index 88%
rename from org.eclipse.wst.xml.vex.repository/pom.xml
rename to org.eclipse.vex.repository/pom.xml
index 546ecdb..8a78a0f 100644
--- a/org.eclipse.wst.xml.vex.repository/pom.xml
+++ b/org.eclipse.vex.repository/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 </project>
\ No newline at end of file
diff --git a/org.eclipse.wst.xml.vex.repository/site.xml b/org.eclipse.vex.repository/site.xml
similarity index 65%
rename from org.eclipse.wst.xml.vex.repository/site.xml
rename to org.eclipse.vex.repository/site.xml
index ac3449f..cdc910e 100644
--- a/org.eclipse.wst.xml.vex.repository/site.xml
+++ b/org.eclipse.vex.repository/site.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.wst.xml.vex.feature_1.0.0.qualifier.jar" id="org.eclipse.wst.xml.vex.feature" version="1.0.0.qualifier">
-      <category name="vex_core"/>
-   </feature>
-   <feature url="features/org.eclipse.wst.xml.vex_sdk.feature_1.0.0.qualifier.jar" id="org.eclipse.wst.xml.vex_sdk.feature" version="1.0.0.qualifier">
-      <category name="vex_sdk"/>
-   </feature>
-   <category-def name="vex_core" label="Vex Core">
-      <description>
-         Vex Core Plugins.  Contains the core functionality as well as built in support for DocBook and DITA.
-      </description>
-   </category-def>
-   <category-def name="vex_sdk" label="Vex SDK Source">
-      <description>
-         SDK Feature that contains source bundles that can be installed.
-      </description>
-   </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>

+<site>

+   <feature url="features/org.eclipse.vex.feature_1.0.0.qualifier.jar" id="org.eclipse.vex.feature" version="1.0.0.qualifier">

+      <category name="vex_core"/>

+   </feature>

+   <feature url="features/org.eclipse.vex.sdk.feature_1.0.0.qualifier.jar" id="org.eclipse.vex.sdk.feature" version="1.0.0.qualifier">

+      <category name="vex_sdk"/>

+   </feature>

+   <category-def name="vex_core" label="Vex Core">

+      <description>

+         Vex Core Plugins.  Contains the core functionality as well as built in support for DocBook and DITA.

+      </description>

+   </category-def>

+   <category-def name="vex_sdk" label="Vex SDK Source">

+      <description>

+         SDK Feature that contains source bundles that can be installed.

+      </description>

+   </category-def>

+</site>

diff --git a/org.eclipse.vex.sdk.feature/.gitignore b/org.eclipse.vex.sdk.feature/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/org.eclipse.vex.sdk.feature/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.wst.xml.vex.feature/.project b/org.eclipse.vex.sdk.feature/.project
similarity index 87%
copy from org.eclipse.wst.xml.vex.feature/.project
copy to org.eclipse.vex.sdk.feature/.project
index 122e295..b366899 100644
--- a/org.eclipse.wst.xml.vex.feature/.project
+++ b/org.eclipse.vex.sdk.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.sdk.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex_sdk.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.sdk.feature/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/build.properties b/org.eclipse.vex.sdk.feature/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/build.properties
rename to org.eclipse.vex.sdk.feature/build.properties
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/eclipse_update_120.jpg b/org.eclipse.vex.sdk.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/eclipse_update_120.jpg
rename to org.eclipse.vex.sdk.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/epl-v10.html b/org.eclipse.vex.sdk.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/epl-v10.html
rename to org.eclipse.vex.sdk.feature/epl-v10.html
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/feature.properties b/org.eclipse.vex.sdk.feature/feature.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/feature.properties
rename to org.eclipse.vex.sdk.feature/feature.properties
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/feature.xml b/org.eclipse.vex.sdk.feature/feature.xml
similarity index 77%
rename from org.eclipse.wst.xml.vex_sdk.feature/feature.xml
rename to org.eclipse.vex.sdk.feature/feature.xml
index e690b9c..9d7d8cd 100644
--- a/org.eclipse.wst.xml.vex_sdk.feature/feature.xml
+++ b/org.eclipse.vex.sdk.feature/feature.xml
@@ -1,58 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml.vex_sdk.feature"
-      label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.xml.vex.feature"
-         version="0.0.0"/>
-         
-   <plugin
-         id="org.eclipse.wst.xml.vex.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.docbook.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.xhtml.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.vex.sdk.feature"

+      label="%featureName"

+      version="1.0.0.qualifier"

+      provider-name="%providerName">

+

+   <description>

+      %description

+   </description>

+

+   <copyright>

+      %copyright

+   </copyright>

+

+   <license url="%licenseURL">

+      %license

+   </license>

+

+   <url>

+      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>

+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>

+   </url>

+

+   <includes

+         id="org.eclipse.vex.feature"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.vex.ui.source"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.vex.core.source"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.vex.docbook.source"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.vex.xhtml.source"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/org.eclipse.wst.xml.vex_sdk.feature/license.html b/org.eclipse.vex.sdk.feature/license.html
similarity index 100%
rename from org.eclipse.wst.xml.vex_sdk.feature/license.html
rename to org.eclipse.vex.sdk.feature/license.html
diff --git a/org.eclipse.wst.xml.vex_sdk.feature/pom.xml b/org.eclipse.vex.sdk.feature/pom.xml
similarity index 80%
rename from org.eclipse.wst.xml.vex_sdk.feature/pom.xml
rename to org.eclipse.vex.sdk.feature/pom.xml
index d29576c..104090c 100644
--- a/org.eclipse.wst.xml.vex_sdk.feature/pom.xml
+++ b/org.eclipse.vex.sdk.feature/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.vex_sdk.feature</artifactId>
+	<artifactId>org.eclipse.vex.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Vex SDK Feature</name>
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 </project>
diff --git a/org.eclipse.wst.xml.vex.feature/.project b/org.eclipse.vex.tests.feature/.project
similarity index 87%
copy from org.eclipse.wst.xml.vex.feature/.project
copy to org.eclipse.vex.tests.feature/.project
index 122e295..8437ca1 100644
--- a/org.eclipse.wst.xml.vex.feature/.project
+++ b/org.eclipse.vex.tests.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.tests.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex_tests.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.tests.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.vex.tests.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.wst.xml.vex_tests.feature/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.tests.feature/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.tests.feature/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex_tests.feature/build.properties b/org.eclipse.vex.tests.feature/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/build.properties
rename to org.eclipse.vex.tests.feature/build.properties
diff --git a/org.eclipse.wst.xml.vex_tests.feature/eclipse_update_120.jpg b/org.eclipse.vex.tests.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/eclipse_update_120.jpg
rename to org.eclipse.vex.tests.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.wst.xml.vex_tests.feature/epl-v10.html b/org.eclipse.vex.tests.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/epl-v10.html
rename to org.eclipse.vex.tests.feature/epl-v10.html
diff --git a/org.eclipse.wst.xml.vex_tests.feature/feature.properties b/org.eclipse.vex.tests.feature/feature.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/feature.properties
rename to org.eclipse.vex.tests.feature/feature.properties
diff --git a/org.eclipse.wst.xml.vex_tests.feature/feature.xml b/org.eclipse.vex.tests.feature/feature.xml
similarity index 81%
rename from org.eclipse.wst.xml.vex_tests.feature/feature.xml
rename to org.eclipse.vex.tests.feature/feature.xml
index b20894a..2a4ed06 100644
--- a/org.eclipse.wst.xml.vex_tests.feature/feature.xml
+++ b/org.eclipse.vex.tests.feature/feature.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml.vex_tests.feature"
-      label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.xml.vex.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml.vex.docbook.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.vex.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ant.optional.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.vex.tests.feature"

+      label="%featureName"

+      version="1.0.0.qualifier"

+      provider-name="%providerName">

+

+   <description>

+      %description

+   </description>

+

+   <copyright>

+      %copyright

+   </copyright>

+

+   <license url="%licenseURL">

+      %license

+   </license>

+

+   <url>

+      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>

+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>

+   </url>

+

+   <includes

+         id="org.eclipse.vex.feature"

+         version="0.0.0"/>

+

+   <includes

+         id="org.eclipse.vex.docbook.feature"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.vex.core.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.vex.ui.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.vex.tests"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.test"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.ant.optional.junit"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         fragment="true"/>

+

+   <plugin

+         id="org.junit"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+</feature>

diff --git a/org.eclipse.wst.xml.vex_tests.feature/license.html b/org.eclipse.vex.tests.feature/license.html
similarity index 100%
rename from org.eclipse.wst.xml.vex_tests.feature/license.html
rename to org.eclipse.vex.tests.feature/license.html
diff --git a/org.eclipse.wst.xml.vex.tests/.classpath b/org.eclipse.vex.tests/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/.classpath
rename to org.eclipse.vex.tests/.classpath
diff --git a/org.eclipse.wst.xml.vex.tests/.gitignore b/org.eclipse.vex.tests/.gitignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/.gitignore
rename to org.eclipse.vex.tests/.gitignore
diff --git a/org.eclipse.wst.xml.vex.tests/.project b/org.eclipse.vex.tests/.project
similarity index 93%
rename from org.eclipse.wst.xml.vex.tests/.project
rename to org.eclipse.vex.tests/.project
index 1f83399..fa93c29 100644
--- a/org.eclipse.wst.xml.vex.tests/.project
+++ b/org.eclipse.vex.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex.tests</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.vex.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.wst.xml.vex.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.tests/META-INF/MANIFEST.MF
similarity index 61%
rename from org.eclipse.wst.xml.vex.tests/META-INF/MANIFEST.MF
rename to org.eclipse.vex.tests/META-INF/MANIFEST.MF
index e8a17e9..cf092ee 100644
--- a/org.eclipse.wst.xml.vex.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Require-Bundle: org.junit;bundle-version="3.8.1",
- org.eclipse.wst.xml.vex.core.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xml.vex.ui.tests;bundle-version="[1.0.0,2.0.0)"
+ 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
 Bundle-ClassPath: .
diff --git a/org.eclipse.wst.xml.vex.tests/about.html b/org.eclipse.vex.tests/about.html
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/about.html
rename to org.eclipse.vex.tests/about.html
diff --git a/org.eclipse.wst.xml.vex.tests/build.properties b/org.eclipse.vex.tests/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/build.properties
rename to org.eclipse.vex.tests/build.properties
diff --git a/org.eclipse.wst.xml.vex.tests/plugin.properties b/org.eclipse.vex.tests/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/plugin.properties
rename to org.eclipse.vex.tests/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java b/org.eclipse.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java
rename to org.eclipse.vex.tests/src/org/eclipse/wst/xml/vex/tests/AllTestsSuite.java
diff --git a/org.eclipse.wst.xml.vex.tests/test.xml b/org.eclipse.vex.tests/test.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.tests/test.xml
rename to org.eclipse.vex.tests/test.xml
diff --git a/org.eclipse.wst.xml.vex.ui.tests/.classpath b/org.eclipse.vex.ui.tests/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/.classpath
rename to org.eclipse.vex.ui.tests/.classpath
diff --git a/org.eclipse.vex.ui.tests/.gitignore b/org.eclipse.vex.ui.tests/.gitignore
new file mode 100644
index 0000000..fe07c27
--- /dev/null
+++ b/org.eclipse.vex.ui.tests/.gitignore
@@ -0,0 +1,2 @@
+bin

+/target
diff --git a/org.eclipse.wst.xml.vex.xhtml/.project b/org.eclipse.vex.ui.tests/.project
similarity index 94%
copy from org.eclipse.wst.xml.vex.xhtml/.project
copy to org.eclipse.vex.ui.tests/.project
index d8bebca..9c235fb 100644
--- a/org.eclipse.wst.xml.vex.xhtml/.project
+++ b/org.eclipse.vex.ui.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.wst.xml.vex.xhtml</name>

+	<name>org.eclipse.vex.ui.tests</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/org.eclipse.wst.xml.vex.ui.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.wst.xml.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.ui.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex.ui.tests/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
similarity index 83%
rename from org.eclipse.wst.xml.vex.ui.tests/META-INF/MANIFEST.MF
rename to org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
index 097556e..548f66a 100644
--- a/org.eclipse.wst.xml.vex.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.ui.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.ui.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.wst.xml.vex.ui;bundle-version="0.5.0",
+ org.eclipse.vex.ui;bundle-version="0.5.0",
  org.junit;bundle-version="3.8.1",
  org.eclipse.jface.text;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.wst.xml.vex.ui.tests/build.properties b/org.eclipse.vex.ui.tests/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/build.properties
rename to org.eclipse.vex.ui.tests/build.properties
diff --git a/org.eclipse.wst.xml.vex.ui.tests/plugin.properties b/org.eclipse.vex.ui.tests/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/plugin.properties
rename to org.eclipse.vex.ui.tests/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.ui.tests/plugin.xml b/org.eclipse.vex.ui.tests/plugin.xml
similarity index 90%
rename from org.eclipse.wst.xml.vex.ui.tests/plugin.xml
rename to org.eclipse.vex.ui.tests/plugin.xml
index 84cd689..3e3f131 100644
--- a/org.eclipse.wst.xml.vex.ui.tests/plugin.xml
+++ b/org.eclipse.vex.ui.tests/plugin.xml
@@ -19,7 +19,7 @@
    <extension

          id="test-doctype"

          name="test doctype"

-         point="org.eclipse.wst.xml.vex.ui.doctypes">

+         point="org.eclipse.vex.ui.doctypes">

       <doctype

             systemId="test.dtd"

             publicId="-//Vex//DTD Test//EN">

@@ -28,7 +28,7 @@
    <extension

          id="test-style"

          name="test style"

-         point="org.eclipse.wst.xml.vex.ui.styles">

+         point="org.eclipse.vex.ui.styles">

       <style

             css="testdata/test.css">

          <doctypeRef

diff --git a/org.eclipse.wst.xml.vex.ui.tests/pom.xml b/org.eclipse.vex.ui.tests/pom.xml
similarity index 87%
rename from org.eclipse.wst.xml.vex.ui.tests/pom.xml
rename to org.eclipse.vex.ui.tests/pom.xml
index 9b54e42..234cafc 100644
--- a/org.eclipse.wst.xml.vex.ui.tests/pom.xml
+++ b/org.eclipse.vex.ui.tests/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 	
 	<build>
@@ -22,7 +22,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<useUIHarness>true</useUIHarness>
-					<testSuite>org.eclipse.wst.xml.vex.ui.tests</testSuite>
+					<testSuite>org.eclipse.vex.ui.tests</testSuite>
 					<testClass>org.eclipse.wst.xml.vex.ui.tests.VexUiTestSuite</testClass>
 				</configuration>
 			</plugin>
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigLoaderJobTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/ui/internal/config/tests/ConfigLoaderJobTest.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigurationRegistryTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/ui/internal/config/tests/ConfigurationRegistryTest.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/PluginProjectTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/config/tests/PluginProjectTest.java
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/ui/internal/config/tests/PluginProjectTest.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/editor/tests/FindReplaceTargetTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/ui/internal/editor/tests/FindReplaceTargetTest.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/internal/tests/ResourceTrackerTest.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/IconTest.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java b/org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java
rename to org.eclipse.vex.ui.tests/src/org/eclipse/wst/xml/vex/ui/tests/VexUiTestSuite.java
diff --git a/org.eclipse.wst.xml.vex.ui.tests/testdata/test.css b/org.eclipse.vex.ui.tests/testdata/test.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/testdata/test.css
rename to org.eclipse.vex.ui.tests/testdata/test.css
diff --git a/org.eclipse.wst.xml.vex.ui.tests/testdata/test.dtd b/org.eclipse.vex.ui.tests/testdata/test.dtd
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui.tests/testdata/test.dtd
rename to org.eclipse.vex.ui.tests/testdata/test.dtd
diff --git a/org.eclipse.wst.xml.vex.ui/.classpath b/org.eclipse.vex.ui/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.classpath
rename to org.eclipse.vex.ui/.classpath
diff --git a/org.eclipse.wst.xml.vex.ui/.cvsignore b/org.eclipse.vex.ui/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.cvsignore
rename to org.eclipse.vex.ui/.cvsignore
diff --git a/org.eclipse.vex.ui/.gitignore b/org.eclipse.vex.ui/.gitignore
new file mode 100644
index 0000000..fe07c27
--- /dev/null
+++ b/org.eclipse.vex.ui/.gitignore
@@ -0,0 +1,2 @@
+bin

+/target
diff --git a/org.eclipse.wst.xml.vex.ui/.options b/org.eclipse.vex.ui/.options
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.options
rename to org.eclipse.vex.ui/.options
diff --git a/org.eclipse.wst.xml.vex.xhtml/.project b/org.eclipse.vex.ui/.project
similarity index 94%
copy from org.eclipse.wst.xml.vex.xhtml/.project
copy to org.eclipse.vex.ui/.project
index d8bebca..051bdb1 100644
--- a/org.eclipse.wst.xml.vex.xhtml/.project
+++ b/org.eclipse.vex.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.wst.xml.vex.xhtml</name>

+	<name>org.eclipse.vex.ui</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/org.eclipse.wst.xml.vex.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.wst.xml.vex.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.vex.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.wst.xml.vex.ui/.template b/org.eclipse.vex.ui/.template
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/.template
rename to org.eclipse.vex.ui/.template
diff --git a/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF b/org.eclipse.vex.ui/META-INF/MANIFEST.MF
similarity index 87%
rename from org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
rename to org.eclipse.vex.ui/META-INF/MANIFEST.MF
index c4bcbee..df190fa 100644
--- a/org.eclipse.wst.xml.vex.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.wst.xml.vex.ui.internal.VexPlugin
 Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.ui;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.ui;singleton:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
@@ -12,7 +12,7 @@
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.vex.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.vex.core;bundle-version="[1.0.0,2.0.0)",
  org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
@@ -21,17 +21,17 @@
  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.wst.xml.vex.ui.tests",
+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.wst.xml.vex.docbook",
+ 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.wst.xml.vex.docbook",
+ 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
-Bundle-Localization: plugin
+ion: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 
diff --git a/org.eclipse.wst.xml.vex.ui/build.properties b/org.eclipse.vex.ui/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/build.properties
rename to org.eclipse.vex.ui/build.properties
diff --git a/org.eclipse.wst.xml.vex.ui/design.xml b/org.eclipse.vex.ui/design.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/design.xml
rename to org.eclipse.vex.ui/design.xml
diff --git a/org.eclipse.wst.xml.vex.ui/icons/convert.gif b/org.eclipse.vex.ui/icons/convert.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/convert.gif
rename to org.eclipse.vex.ui/icons/convert.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/icons/element_obj.gif b/org.eclipse.vex.ui/icons/element_obj.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/element_obj.gif
rename to org.eclipse.vex.ui/icons/element_obj.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/icons/error_co.gif b/org.eclipse.vex.ui/icons/error_co.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/error_co.gif
rename to org.eclipse.vex.ui/icons/error_co.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/icons/vex16.gif b/org.eclipse.vex.ui/icons/vex16.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/vex16.gif
rename to org.eclipse.vex.ui/icons/vex16.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/icons/vex8.gif b/org.eclipse.vex.ui/icons/vex8.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/vex8.gif
rename to org.eclipse.vex.ui/icons/vex8.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/icons/vex8.xcf b/org.eclipse.vex.ui/icons/vex8.xcf
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/vex8.xcf
rename to org.eclipse.vex.ui/icons/vex8.xcf
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/icons/warning_co.gif b/org.eclipse.vex.ui/icons/warning_co.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/icons/warning_co.gif
rename to org.eclipse.vex.ui/icons/warning_co.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.ui/lib/.cvsignore b/org.eclipse.vex.ui/lib/.cvsignore
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/lib/.cvsignore
rename to org.eclipse.vex.ui/lib/.cvsignore
diff --git a/org.eclipse.wst.xml.vex.ui/plugin.properties b/org.eclipse.vex.ui/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/plugin.properties
rename to org.eclipse.vex.ui/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.ui/plugin.xml b/org.eclipse.vex.ui/plugin.xml
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/plugin.xml
rename to org.eclipse.vex.ui/plugin.xml
diff --git a/org.eclipse.wst.xml.vex.ui/plugin_fr.properties b/org.eclipse.vex.ui/plugin_fr.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/plugin_fr.properties
rename to org.eclipse.vex.ui/plugin_fr.properties
diff --git a/org.eclipse.wst.xml.vex.ui/pom.xml b/org.eclipse.vex.ui/pom.xml
similarity index 95%
rename from org.eclipse.wst.xml.vex.ui/pom.xml
rename to org.eclipse.vex.ui/pom.xml
index 4033c08..a691230 100644
--- a/org.eclipse.wst.xml.vex.ui/pom.xml
+++ b/org.eclipse.vex.ui/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.ui/schema/doctype.exsd b/org.eclipse.vex.ui/schema/doctype.exsd
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/schema/doctype.exsd
rename to org.eclipse.vex.ui/schema/doctype.exsd
diff --git a/org.eclipse.wst.xml.vex.ui/schema/style.exsd b/org.eclipse.vex.ui/schema/style.exsd
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/schema/style.exsd
rename to org.eclipse.vex.ui/schema/style.exsd
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/Icon.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/VexPlugin.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblem.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/BuildProblemDecorator.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigEvent.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigItem.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigLoaderJob.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigPlugin.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigSource.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElement.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationElementWrapper.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationLoader.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistry.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationRegistryImpl.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/ConfigurationView.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypePropertyPage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DocumentType.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DomConfigurationElement.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IBuildProblemHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigElement.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigItemFactory.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/IConfigListener.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Messages.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/NewPluginProjectWizard.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProject.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectBuilder.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectDecorator.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/PluginProjectNature.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/Style.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StyleFactory.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/StylePropertyPage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/vex-config-1.0.dtd b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/vex-config-1.0.dtd
similarity index 100%
rename from org.eclipse.wst.xml.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/wst/xml/vex/ui/internal/config/vex-config-1.0.dtd
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/AbstractRegExFindReplaceTarget.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentContextSourceProvider.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentFileCreationPage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionDialog.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/DocumentTypeSelectionPage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/IVexEditorListener.java
diff --git a/org.eclipse.wst.xml.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
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/Messages.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/Messages.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/PageInitializationData.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/SelectionProvider.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/TextInputListener.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexActionBarContributor.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditorEvent.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddColumnHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractAddRowHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveColumnHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractMoveRowHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractNavigateTableCellHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractRemoveTableCellsHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AbstractVexWidgetHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnLeftHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddColumnRightHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddElementHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowAboveHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/AddRowBelowHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ConvertElementHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/DuplicateSelectionHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/ITableCellCallback.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/IVexWidgetHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnLeftHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveColumnRightHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowDownHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveRowUpHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/MoveSelectionUpHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/NextTableCellHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/PreviousTableCellHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveColumnHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveRowHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/RemoveTagHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitBlockElementHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/SplitItemHandler.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/StyleMenu.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/TableCellCallbackAdapter.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/handlers/VexHandlerUtil.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DefaultOutlineProvider.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/DocumentOutlinePage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/outline/IOutlineProvider.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/perspective/DocumentPerspective.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/property/ElementPropertySource.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/ContentAssist.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/DocumentFragmentTransfer.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/KeyStroke.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtColor.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtDisplayDevice.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFont.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtFontMetrics.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtGraphics.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/SwtImage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/Timer.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/swt/VexWidget.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugView.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/views/DebugViewPage.java
diff --git a/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java b/org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
rename to org.eclipse.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
diff --git a/org.eclipse.wst.xml.vex.ui/vex16.gif b/org.eclipse.vex.ui/vex16.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex.ui/vex16.gif
rename to org.eclipse.vex.ui/vex16.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.xhtml/.classpath b/org.eclipse.vex.xhtml/.classpath
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/.classpath
rename to org.eclipse.vex.xhtml/.classpath
diff --git a/org.eclipse.vex.xhtml/.gitignore b/org.eclipse.vex.xhtml/.gitignore
new file mode 100644
index 0000000..fe07c27
--- /dev/null
+++ b/org.eclipse.vex.xhtml/.gitignore
@@ -0,0 +1,2 @@
+bin

+/target
diff --git a/org.eclipse.wst.xml.vex.xhtml/.project b/org.eclipse.vex.xhtml/.project
similarity index 94%
copy from org.eclipse.wst.xml.vex.xhtml/.project
copy to org.eclipse.vex.xhtml/.project
index d8bebca..d546c09 100644
--- a/org.eclipse.wst.xml.vex.xhtml/.project
+++ b/org.eclipse.vex.xhtml/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.wst.xml.vex.xhtml</name>

+	<name>org.eclipse.vex.xhtml</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/org.eclipse.wst.xml.vex.xhtml/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.wst.xml.vex.xhtml/META-INF/MANIFEST.MF b/org.eclipse.vex.xhtml/META-INF/MANIFEST.MF
similarity index 67%
rename from org.eclipse.wst.xml.vex.xhtml/META-INF/MANIFEST.MF
rename to org.eclipse.vex.xhtml/META-INF/MANIFEST.MF
index 1f0471d..1950bec 100644
--- a/org.eclipse.wst.xml.vex.xhtml/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex.xhtml/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.xhtml;singleton:=true
+Bundle-SymbolicName: org.eclipse.vex.xhtml;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.wst.xml.vex.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xml.vex.core;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.vex.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.vex.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.4.1,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.1,4.0.0)",
diff --git a/org.eclipse.wst.xml.vex.xhtml/build.properties b/org.eclipse.vex.xhtml/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/build.properties
rename to org.eclipse.vex.xhtml/build.properties
diff --git a/org.eclipse.wst.xml.vex.xhtml/plugin.properties b/org.eclipse.vex.xhtml/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/plugin.properties
rename to org.eclipse.vex.xhtml/plugin.properties
diff --git a/org.eclipse.wst.xml.vex.xhtml/plugin.xml b/org.eclipse.vex.xhtml/plugin.xml
similarity index 86%
rename from org.eclipse.wst.xml.vex.xhtml/plugin.xml
rename to org.eclipse.vex.xhtml/plugin.xml
index 9388b1a..ab541f4 100644
--- a/org.eclipse.wst.xml.vex.xhtml/plugin.xml
+++ b/org.eclipse.vex.xhtml/plugin.xml
@@ -7,7 +7,7 @@
 		</content-type>

 	</extension>

 

-	<extension point="org.eclipse.wst.xml.vex.ui.doctypes"

+	<extension point="org.eclipse.vex.ui.doctypes"

 			   id="xhtml_1_0_strict" 

 			   name="XHTML 1.0 Strict">

 		<doctype 

@@ -19,21 +19,21 @@
 		</doctype>

 	</extension>

 	<extension id="xhtml_1_0_plain" name="XHTML Plain"

-		point="org.eclipse.wst.xml.vex.ui.styles">

+		point="org.eclipse.vex.ui.styles">

 		<style css="styles/xhtml1-plain.css">

 			<doctypeRef publicId="-//W3C//DTD XHTML 1.0 Strict//EN">

 			</doctypeRef>

 		</style>

 	</extension>

 	<extension id="xhtml_1_0_sans" name="XHTML Sans"

-		point="org.eclipse.wst.xml.vex.ui.styles">

+		point="org.eclipse.vex.ui.styles">

 		<style css="styles/xhtml1-sans.css">

 			<doctypeRef publicId="-//W3C//DTD XHTML 1.0 Strict//EN">

 			</doctypeRef>

 		</style>

 	</extension>

 	<extension id="xhtml_1_0_modern" name="XHTML Modern"

-		point="org.eclipse.wst.xml.vex.ui.styles">

+		point="org.eclipse.vex.ui.styles">

 		<style css="styles/xhtml1-modern.css">

 			<doctypeRef publicId="-//W3C//DTD XHTML 1.0 Strict//EN">

 			</doctypeRef>

diff --git a/org.eclipse.wst.xml.vex.xhtml/pom.xml b/org.eclipse.vex.xhtml/pom.xml
similarity index 95%
rename from org.eclipse.wst.xml.vex.xhtml/pom.xml
rename to org.eclipse.vex.xhtml/pom.xml
index 3a5435f..ece3a0c 100644
--- a/org.eclipse.wst.xml.vex.xhtml/pom.xml
+++ b/org.eclipse.vex.xhtml/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 	<build>
diff --git a/org.eclipse.wst.xml.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java b/org.eclipse.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java
rename to org.eclipse.vex.xhtml/src/org/eclipse/wst/xml/vex/xhtml/XhtmlOutlineProvider.java
diff --git a/org.eclipse.wst.xml.vex.xhtml/styles/xhtml1-modern.css b/org.eclipse.vex.xhtml/styles/xhtml1-modern.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/styles/xhtml1-modern.css
rename to org.eclipse.vex.xhtml/styles/xhtml1-modern.css
diff --git a/org.eclipse.wst.xml.vex.xhtml/styles/xhtml1-plain.css b/org.eclipse.vex.xhtml/styles/xhtml1-plain.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/styles/xhtml1-plain.css
rename to org.eclipse.vex.xhtml/styles/xhtml1-plain.css
diff --git a/org.eclipse.wst.xml.vex.xhtml/styles/xhtml1-sans.css b/org.eclipse.vex.xhtml/styles/xhtml1-sans.css
similarity index 100%
rename from org.eclipse.wst.xml.vex.xhtml/styles/xhtml1-sans.css
rename to org.eclipse.vex.xhtml/styles/xhtml1-sans.css
diff --git a/org.eclipse.wst.xml.vex/.project b/org.eclipse.vex/.project
similarity index 91%
rename from org.eclipse.wst.xml.vex/.project
rename to org.eclipse.vex/.project
index ad62e0a..bc7b1ce 100644
--- a/org.eclipse.wst.xml.vex/.project
+++ b/org.eclipse.vex/.project
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.vex</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.wst.xml.vex/.settings/org.eclipse.pde.prefs b/org.eclipse.vex/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex/.settings/org.eclipse.pde.prefs
rename to org.eclipse.vex/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.wst.xml.vex/.settings/org.eclipse.wst.html.core.prefs b/org.eclipse.vex/.settings/org.eclipse.wst.html.core.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex/.settings/org.eclipse.wst.html.core.prefs
rename to org.eclipse.vex/.settings/org.eclipse.wst.html.core.prefs
diff --git a/org.eclipse.wst.xml.vex/.settings/org.eclipse.wst.validation.prefs b/org.eclipse.vex/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from org.eclipse.wst.xml.vex/.settings/org.eclipse.wst.validation.prefs
rename to org.eclipse.vex/.settings/org.eclipse.wst.validation.prefs
diff --git a/org.eclipse.wst.xml.vex/META-INF/MANIFEST.MF b/org.eclipse.vex/META-INF/MANIFEST.MF
similarity index 78%
rename from org.eclipse.wst.xml.vex/META-INF/MANIFEST.MF
rename to org.eclipse.vex/META-INF/MANIFEST.MF
index cabe185..2fe8c3c 100644
--- a/org.eclipse.wst.xml.vex/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex
+Bundle-SymbolicName: org.eclipse.vex
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.wst.xml.vex/about.html b/org.eclipse.vex/about.html
similarity index 100%
rename from org.eclipse.wst.xml.vex/about.html
rename to org.eclipse.vex/about.html
diff --git a/org.eclipse.wst.xml.vex/about.ini b/org.eclipse.vex/about.ini
similarity index 100%
rename from org.eclipse.wst.xml.vex/about.ini
rename to org.eclipse.vex/about.ini
diff --git a/org.eclipse.wst.xml.vex/about.mappings b/org.eclipse.vex/about.mappings
similarity index 100%
rename from org.eclipse.wst.xml.vex/about.mappings
rename to org.eclipse.vex/about.mappings
diff --git a/org.eclipse.wst.xml.vex/about.properties b/org.eclipse.vex/about.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex/about.properties
rename to org.eclipse.vex/about.properties
diff --git a/org.eclipse.wst.xml.vex/build.properties b/org.eclipse.vex/build.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex/build.properties
rename to org.eclipse.vex/build.properties
diff --git a/org.eclipse.wst.xml.vex/plugin.properties b/org.eclipse.vex/plugin.properties
similarity index 100%
rename from org.eclipse.wst.xml.vex/plugin.properties
rename to org.eclipse.vex/plugin.properties
diff --git a/org.eclipse.wst.xml.vex/pom.xml b/org.eclipse.vex/pom.xml
similarity index 88%
rename from org.eclipse.wst.xml.vex/pom.xml
rename to org.eclipse.vex/pom.xml
index a53ac85..7c18e34 100644
--- a/org.eclipse.wst.xml.vex/pom.xml
+++ b/org.eclipse.vex/pom.xml
@@ -11,7 +11,7 @@
 		<artifactId>org.eclipse.vex-releng</artifactId>
 		<groupId>org.eclipse.vex</groupId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
+		<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
 	</parent>
 
 </project>
diff --git a/org.eclipse.wst.xml.vex/META-INF/MANIFEST.MF b/org.eclipse.vex/target/MANIFEST.MF
similarity index 62%
copy from org.eclipse.wst.xml.vex/META-INF/MANIFEST.MF
copy to org.eclipse.vex/target/MANIFEST.MF
index cabe185..2fe8993 100644
--- a/org.eclipse.wst.xml.vex/META-INF/MANIFEST.MF
+++ b/org.eclipse.vex/target/MANIFEST.MF
@@ -1,7 +1,8 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
+Manifest-Version: 1.0

+Bundle-Name: %pluginName

+Bundle-Vendor: %providerName

+Bundle-ManifestVersion: 2

+Bundle-Localization: plugin

+Bundle-SymbolicName: org.eclipse.vex

+Bundle-Version: 1.0.0.201111100010

+

diff --git a/org.eclipse.vex/target/maven-archiver/pom.properties b/org.eclipse.vex/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..2148f59
--- /dev/null
+++ b/org.eclipse.vex/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven

+#Thu Nov 10 00:10:28 CET 2011

+version=1.0.0-SNAPSHOT

+groupId=org.eclipse.vex

+artifactId=org.eclipse.vex

diff --git a/org.eclipse.vex/target/org.eclipse.vex-1.0.0-SNAPSHOT-sources.jar b/org.eclipse.vex/target/org.eclipse.vex-1.0.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..5750101
--- /dev/null
+++ b/org.eclipse.vex/target/org.eclipse.vex-1.0.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/org.eclipse.vex/target/org.eclipse.vex-1.0.0-SNAPSHOT.jar b/org.eclipse.vex/target/org.eclipse.vex-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000..2fb1e04
--- /dev/null
+++ b/org.eclipse.vex/target/org.eclipse.vex-1.0.0-SNAPSHOT.jar
Binary files differ
diff --git a/org.eclipse.vex/target/p2artifacts.xml b/org.eclipse.vex/target/p2artifacts.xml
new file mode 100644
index 0000000..0cc3904
--- /dev/null
+++ b/org.eclipse.vex/target/p2artifacts.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<?artifactRepository version='1.1.0'?>

+<artifacts size='2'>

+  <artifact classifier='osgi.bundle' id='org.eclipse.vex' version='1.0.0.201111100010'>

+    <properties size='6'>

+      <property name='artifact.size' value='8642'/>

+      <property name='download.size' value='8642'/>

+      <property name='download.md5' value='d0d120eb32173249a9d96896d17f7935'/>

+      <property name='maven-groupId' value='org.eclipse.vex'/>

+      <property name='maven-artifactId' value='org.eclipse.vex'/>

+      <property name='maven-version' value='1.0.0-SNAPSHOT'/>

+    </properties>

+  </artifact>

+  <artifact classifier='osgi.bundle' id='org.eclipse.vex.source' version='1.0.0.201111100010'>

+    <properties size='7'>

+      <property name='artifact.size' value='1166'/>

+      <property name='download.size' value='1166'/>

+      <property name='download.md5' value='4b8dd107c169f66660c7b92cfb8f6d0d'/>

+      <property name='maven-groupId' value='org.eclipse.vex'/>

+      <property name='maven-artifactId' value='org.eclipse.vex'/>

+      <property name='maven-version' value='1.0.0-SNAPSHOT'/>

+      <property name='maven-classifier' value='sources'/>

+    </properties>

+  </artifact>

+</artifacts>

diff --git a/org.eclipse.vex/target/p2content.xml b/org.eclipse.vex/target/p2content.xml
new file mode 100644
index 0000000..d306346
--- /dev/null
+++ b/org.eclipse.vex/target/p2content.xml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<units size='2'>

+  <unit id='org.eclipse.vex' version='1.0.0.201111100010' singleton='false'>

+    <update id='org.eclipse.vex' range='[0.0.0,1.0.0.201111100010)' severity='0'/>

+    <properties size='8'>

+      <property name='df_LT.providerName' value='Eclipse.org'/>

+      <property name='df_LT.pluginName' value='Vex'/>

+      <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>

+      <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>

+      <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>

+      <property name='maven-groupId' value='org.eclipse.vex'/>

+      <property name='maven-artifactId' value='org.eclipse.vex'/>

+      <property name='maven-version' value='1.0.0-SNAPSHOT'/>

+    </properties>

+    <provides size='4'>

+      <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.vex' version='1.0.0.201111100010'/>

+      <provided namespace='osgi.bundle' name='org.eclipse.vex' version='1.0.0.201111100010'/>

+      <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>

+      <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>

+    </provides>

+    <artifacts size='1'>

+      <artifact classifier='osgi.bundle' id='org.eclipse.vex' version='1.0.0.201111100010'/>

+    </artifacts>

+    <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>

+    <touchpointData size='1'>

+      <instructions size='1'>

+        <instruction key='manifest'>

+          Archiver-Version: Plexus Archiver&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Built-By: Florian&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.vex&#xA;Build-Jdk: 1.5.0_22&#xA;Bundle-Version: 1.0.0.201111100010&#xA;Created-By: Apache Maven&#xA;

+        </instruction>

+      </instructions>

+    </touchpointData>

+  </unit>

+  <unit id='org.eclipse.vex.source' version='1.0.0.201111100010' singleton='false'>

+    <update id='org.eclipse.vex.source' range='[0.0.0,1.0.0.201111100010)' severity='0'/>

+    <properties size='4'>

+      <property name='maven-groupId' value='org.eclipse.vex'/>

+      <property name='maven-artifactId' value='org.eclipse.vex'/>

+      <property name='maven-version' value='1.0.0-SNAPSHOT'/>

+      <property name='maven-classifier' value='sources'/>

+    </properties>

+    <provides size='3'>

+      <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.vex.source' version='1.0.0.201111100010'/>

+      <provided namespace='osgi.bundle' name='org.eclipse.vex.source' version='1.0.0.201111100010'/>

+      <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='source' version='1.0.0'/>

+    </provides>

+    <artifacts size='1'>

+      <artifact classifier='osgi.bundle' id='org.eclipse.vex.source' version='1.0.0.201111100010'/>

+    </artifacts>

+    <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>

+    <touchpointData size='1'>

+      <instructions size='1'>

+        <instruction key='manifest'>

+          Bundle-ManifestVersion: 2&#xA;Built-By: Florian&#xA;Bundle-Version: 1.0.0.201111100010&#xA;Build-Jdk: 1.5.0_22&#xA;Eclipse-SourceBundle: org.eclipse.vex;version=&quot;1.0.0.201111100010&quot;;roots:=&quot;.&quot;&#xA;Created-By: Apache Maven&#xA;Bundle-SymbolicName: org.eclipse.vex.source&#xA;Manifest-Version: 1.0&#xA;Archiver-Version: Plexus Archiver&#xA;

+        </instruction>

+      </instructions>

+    </touchpointData>

+  </unit>

+</units>

diff --git a/org.eclipse.wst.xml.vex/wtp_prod32.gif b/org.eclipse.vex/wtp_prod32.gif
similarity index 100%
rename from org.eclipse.wst.xml.vex/wtp_prod32.gif
rename to org.eclipse.vex/wtp_prod32.gif
Binary files differ
diff --git a/org.eclipse.wst.xml.vex/wtp_prod32.png b/org.eclipse.vex/wtp_prod32.png
similarity index 100%
rename from org.eclipse.wst.xml.vex/wtp_prod32.png
rename to org.eclipse.vex/wtp_prod32.png
Binary files differ
diff --git a/org.eclipse.wst.xml.vex.core.tests/.gitignore b/org.eclipse.wst.xml.vex.core.tests/.gitignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.wst.xml.vex.core.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.wst.xml.vex.core.tests/.project b/org.eclipse.wst.xml.vex.core.tests/.project
deleted file mode 100644
index 3a42ea2..0000000
--- a/org.eclipse.wst.xml.vex.core.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.core/.gitignore b/org.eclipse.wst.xml.vex.core/.gitignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.wst.xml.vex.core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.wst.xml.vex.dita/.project b/org.eclipse.wst.xml.vex.dita/.project
deleted file mode 100644
index f7bc347..0000000
--- a/org.eclipse.wst.xml.vex.dita/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.dita</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF b/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF
deleted file mode 100644
index faa5426..0000000
--- a/org.eclipse.wst.xml.vex.dita/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.wst.xml.vex.dita;singleton:=true
-Require-Bundle: org.eclipse.wst.xml.vex.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xml.vex.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xml.core
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.wst.xml.vex.docbook.feature/.project b/org.eclipse.wst.xml.vex.docbook.feature/.project
deleted file mode 100644
index 4ac7889..0000000
--- a/org.eclipse.wst.xml.vex.docbook.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.docbook.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.docbook/.gitignore b/org.eclipse.wst.xml.vex.docbook/.gitignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.wst.xml.vex.docbook/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.wst.xml.vex.docbook/.project b/org.eclipse.wst.xml.vex.docbook/.project
deleted file mode 100644
index 6a5196c..0000000
--- a/org.eclipse.wst.xml.vex.docbook/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.docbook</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.documentation/.gitignore b/org.eclipse.wst.xml.vex.documentation/.gitignore
deleted file mode 100644
index 448ac5d..0000000
--- a/org.eclipse.wst.xml.vex.documentation/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/help
diff --git a/org.eclipse.wst.xml.vex.documentation/.project b/org.eclipse.wst.xml.vex.documentation/.project
deleted file mode 100644
index 83dd99c..0000000
--- a/org.eclipse.wst.xml.vex.documentation/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.documentation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.feature/pom.xml b/org.eclipse.wst.xml.vex.feature/pom.xml
deleted file mode 100644
index cfb9236..0000000
--- a/org.eclipse.wst.xml.vex.feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.vex.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>Vex Feature</name>
-
-	<parent>
-		<artifactId>org.eclipse.vex-releng</artifactId>
-		<groupId>org.eclipse.vex</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.wst.xml.vex.releng/pom.xml</relativePath>
-	</parent>
-
-</project>
diff --git a/org.eclipse.wst.xml.vex.ui.tests/.gitignore b/org.eclipse.wst.xml.vex.ui.tests/.gitignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.wst.xml.vex.ui.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.wst.xml.vex.ui.tests/.project b/org.eclipse.wst.xml.vex.ui.tests/.project
deleted file mode 100644
index 1c68379..0000000
--- a/org.eclipse.wst.xml.vex.ui.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.ui/.gitignore b/org.eclipse.wst.xml.vex.ui/.gitignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.wst.xml.vex.ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.wst.xml.vex.ui/.project b/org.eclipse.wst.xml.vex.ui/.project
deleted file mode 100644
index 5fe39d7..0000000
--- a/org.eclipse.wst.xml.vex.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex.xhtml/.gitignore b/org.eclipse.wst.xml.vex.xhtml/.gitignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.wst.xml.vex.xhtml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.wst.xml.vex_sdk.feature/.project b/org.eclipse.wst.xml.vex_sdk.feature/.project
deleted file mode 100644
index 48b590b..0000000
--- a/org.eclipse.wst.xml.vex_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.wst.xml.vex_tests.feature/.project b/org.eclipse.wst.xml.vex_tests.feature/.project
deleted file mode 100644
index b689d34..0000000
--- a/org.eclipse.wst.xml.vex_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.vex_tests.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>