diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/build.properties b/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/build.properties
deleted file mode 100644
index c1b8141..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = runtime/ecore.utilities.jar,\
-               runtime/workbench.jar,\
-               plugin.xml
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/ecore.utilities.jar b/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/ecore.utilities.jar
deleted file mode 100644
index a45ca89..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/ecore.utilities.jar
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/workbench.jar b/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/workbench.jar
deleted file mode 100644
index 927ca36..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/workbench.jar
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/build.properties b/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/build.properties
deleted file mode 100644
index 1a1cfe2..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = runtime/emfworkbench.jar,\
-               plugin.xml
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/runtime/emfworkbench.jar b/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/runtime/emfworkbench.jar
deleted file mode 100644
index 1e83f27..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/runtime/emfworkbench.jar
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/feature.xml b/features/org.eclipse.jem-feature/feature.xml
index 6b9ffe3..7c83000 100644
--- a/features/org.eclipse.jem-feature/feature.xml
+++ b/features/org.eclipse.jem-feature/feature.xml
@@ -50,7 +50,7 @@
          version="1.0.0"/>
 
    <plugin
-         id="com.ibm.etools.emf.ecore.utilities"
+         id="org.eclipse.wtp.emf"
          download-size="0"
          install-size="0"
          version="0.5.0"/>
@@ -62,7 +62,7 @@
          version="3.0.0.1"/>
 
    <plugin
-         id="com.ibm.etools.emf.workbench"
+         id="org.eclipse.wtp.emf.workbench"
          download-size="0"
          install-size="0"
          version="0.5.0"/>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common.jar b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common.jar
index ed3f914..520b16e 100644
--- a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common.jar
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common.jar
Binary files differ
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common_core.jar b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common_core.jar
index 776bdd0..7ce5835 100644
--- a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common_core.jar
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/common_core.jar
Binary files differ
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/ExtendableOperation.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/ExtendableOperation.exsd
new file mode 100644
index 0000000..6128fe3
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/ExtendableOperation.exsd
@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.j2ee">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.j2ee" id="ExtendableOperation" name="ExtendabledOperation"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extendableOperation">
+      <complexType>
+         <sequence>
+         </sequence>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/J2EEOperationExtension.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/J2EEOperationExtension.exsd
new file mode 100644
index 0000000..eac36ff
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/J2EEOperationExtension.exsd
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.j2ee.com.ibm.etools.operations">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.j2ee.com.ibm.etools.operations" id="extension" name="J2EE Operation Extension"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="j2eeOperationExt">
+      <complexType>
+         <sequence>
+         </sequence>
+         <attribute name="groupID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="preOperationClass" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="postOperationClass" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/functionGroup.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/functionGroup.exsd
new file mode 100644
index 0000000..475e718
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/functionGroup.exsd
@@ -0,0 +1,159 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.emf.workbench">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.emf.workbench" id="group" name="Grouping for function contribution"/>
+      </appInfo>
+      <documentation>
+         A functionGroup provides a grouping of related function that can be contributed to the tools.  For example, a third party component may want to contribute actions, editor pages, edit model resources, and many other functions specific to a given product.  By associating all these functions with a group id, a mechanism is exposed for users to selectively enable and disable baskets of function.  Extension points that allow for a &quot;groupID&quot; attribute generally will hide those functions when the group id is disabled.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="functionGroup" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="functionGroup">
+      <annotation>
+         <documentation>
+            Extension point definition for a group.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="functionGroupID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique id for the group.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A human readable name.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A short description of the group.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="icon" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="url" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Ordering magnitude of plugins
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="initializerClassName" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Class used to determine plugin enablement
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         6.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;code&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;extension&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;point=&quot;org.eclipse.wtp.common.functionGroup&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;functionGroup&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;name=&quot;Acme&amp;nbsp;Co.&amp;nbsp;Function&amp;nbsp;Extension&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;functionGroupID=&quot;com.acme.acmepro&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;description=&quot;The&amp;nbsp;AcmePro&amp;nbsp;Extensions&amp;nbsp;add&amp;nbsp;integration&amp;nbsp;to&amp;nbsp;the&amp;nbsp;Acme&amp;nbsp;Web&amp;nbsp;Server.&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;enabledByDefault=&quot;true&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;icon=&quot;...&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;url=&quot;http://www.acme.com/&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;/&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/extension&amp;gt;&lt;br&gt;
+&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         WTP Function Groups can be referenced through org.eclipse.wtp.common.group.WTPFunctionGroupRegistry.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/uiContextSensitiveClass.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/uiContextSensitiveClass.exsd
new file mode 100644
index 0000000..f71f4ca
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/uiContextSensitiveClass.exsd
@@ -0,0 +1,136 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.emf.workbench">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.emf.workbench" id="uiContextSensitiveClass" name="UI Context Sensitive Class"/>
+      </appInfo>
+      <documentation>
+         Edit models provide a framework for managing a set of EMF resources within a unit of work.  For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources.  Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor.  By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="uiContextSensitiveClass" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="uiContextSensitiveClass">
+      <annotation>
+         <documentation>
+            An extension point that defines an instance of a class and its appropriate context (UI or Headless)
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="key" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The key that should be used to create an instance of the Context Sensitive super class/interface.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="className" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A concrete implementation for either a UI or Headless context.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="context" use="required">
+            <annotation>
+               <documentation>
+                  One of &quot;UI&quot; or &quot;Headless&quot;
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="UI">
+                  </enumeration>
+                  <enumeration value="Headless">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         6.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;extension&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;id=&quot;context.Sensitive.Class.workingCopyManager&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;name=&quot;Working&amp;nbsp;Copy&amp;nbsp;Manager&amp;nbsp;-&amp;nbsp;UI&amp;nbsp;Context&amp;nbsp;Class&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;point=&quot;org.eclipse.wtp.common.uiContextSensitiveClass&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;uiContextSensitiveClass&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;context=&quot;UI&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;key=&quot;workingCopyManager&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;className=&quot;org.eclipse.wtp.common.ui.WTPUIWorkingCopyManager&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/uiContextSensitiveClass&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/extension&amp;gt;&lt;br&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         See &lt;code&gt;org.eclipse.wtp.common.UIContextDetermination&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) IBM 2003.
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/uiTester.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/uiTester.exsd
new file mode 100644
index 0000000..310acff
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.common/schema/uiTester.exsd
@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.emf.workbench">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.emf.workbench" id="uiTester" name="UI Tester"/>
+      </appInfo>
+      <documentation>
+         Edit models provide a framework for managing a set of EMF resources within a unit of work.  For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources.  Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor.  By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="uiTester"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="uiTester">
+      <annotation>
+         <documentation>
+            The declaration for an edit model to be used in the workspace.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="className" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique identifier for the edit model.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         6.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/build.properties b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/build.properties
new file mode 100644
index 0000000..2b5f120
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/build.properties
@@ -0,0 +1,3 @@
+bin.includes = plugin.xml,\
+               runtime/emfworkbench.jar,\
+               schema/
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/plugin.xml
similarity index 85%
rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml
rename to features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/plugin.xml
index 06e9aa5..ca8c680 100644
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/plugin.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin
-   id="com.ibm.etools.emf.workbench"
+   id="org.eclipse.wtp.emf.workbench"
    name="EMF Workbench"
    version="0.5.0"
    provider-name="IBM"
-   class="com.ibm.etools.emf.workbench.plugin.EMFWorkbenchPlugin">
+   class="org.eclipse.wtp.emf.workbench.plugin.EMFWorkbenchPlugin">
 
    <runtime>
       <library name="runtime/emfworkbench.jar">
          <export name="*"/>
-         <packages prefixes="com.ibm.etools.emf.workbench"/>
       </library>
    </runtime>
    <requires>
-      <import plugin="com.ibm.etools.emf.ecore.utilities"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.wtp.common"/>
       <import plugin="org.eclipse.emf.edit"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.wtp.emf"/>
    </requires>
 
 
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/runtime/emfworkbench.jar b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/runtime/emfworkbench.jar
new file mode 100644
index 0000000..0869268
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/runtime/emfworkbench.jar
Binary files differ
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/adapterFactory.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/adapterFactory.exsd
new file mode 100644
index 0000000..f1ebf11
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/adapterFactory.exsd
@@ -0,0 +1,128 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.emf.workbench">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.emf.workbench" id="adapterFactory" name="Adapter Factory Extension"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="adapterFactory" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="adapterFactory">
+      <complexType>
+         <sequence>
+            <element ref="view" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="packageURI" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="className" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="functionGroupID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="view">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/editModel.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/editModel.exsd
new file mode 100644
index 0000000..51c79d4
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/editModel.exsd
@@ -0,0 +1,166 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etools.emf.workbench">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etools.emf.workbench" id="editModel" name="EMF Resource Edit Model"/>
+      </appInfo>
+      <documentation>
+         Edit models provide a framework for managing a set of EMF resources within a unit of work.  For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources.  Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor.  By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="editModel" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editModel">
+      <annotation>
+         <documentation>
+            The declaration for an edit model to be used in the workspace.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="editModelResource" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="editModelID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique identifier for the edit model.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  An optional factory class that is used for this edit model.  The class must implement the interface &lt;code&gt;com.ibm.etools.emf.workbench.edit.EditModelFactory&lt;/code&gt;. If none is specified, then a generic &lt;code&gt;EditModel&lt;/code&gt; is created.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="loadUnknownResourcesAsReadOnly" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="parentModelID" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editModelResource">
+      <complexType>
+         <attribute name="URI" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The URI of the resource relative to the root container from which EMF resources are loaded.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         6.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;br&gt;
+&lt;code&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;extension&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;id=&quot;editModel.acme.parent&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;name=&quot;Acme&amp;nbsp;Parent&amp;nbsp;Edit&amp;nbsp;Model&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;point=&quot;com.ibm.etools.emf.workbench.editModel&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModel&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;editModelID=&quot;com.acme.acmepro.parent.editModel&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;factoryClass=&quot;com.ibm.etools.emf.workbench.edit.EditModelFactory&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelResource&amp;nbsp;URI=&quot;DIR/resource0.xml&quot;&amp;nbsp;/&amp;gt;&amp;nbsp;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelResource&amp;nbsp;URI=&quot;DIR/resource1.xml&quot;&amp;nbsp;/&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/editModel&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/extension&amp;gt;&amp;nbsp;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;extension&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;id=&quot;editModel.acme.child&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;name=&quot;Acme&amp;nbsp;Child&amp;nbsp;Edit&amp;nbsp;Model&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;point=&quot;com.ibm.etools.emf.workbench.editModel&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModel&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;editModelID=&quot;com.acme.acmepro.child.editModel&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;factoryClass=&quot;com.ibm.etools.emf.workbench.edit.EditModelFactory&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;parentModelID=&quot;com.acme.acmepro.parent.editModel&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelResource&amp;nbsp;URI=&quot;DIR/resource2.xml&quot;&amp;nbsp;/&amp;gt;&amp;nbsp;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelResource&amp;nbsp;URI=&quot;DIR/resource3.xml&quot;&amp;nbsp;/&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/editModel&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/extension&amp;gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;br&gt;
+&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         Edit Models can be accessed through the com.ibm.etools.emf.workbench.EMFWorkbenchContext.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/editModelExtension.exsd b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/editModelExtension.exsd
new file mode 100644
index 0000000..90c9891
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf.workbench/schema/editModelExtension.exsd
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.ibm.etoosl.emf.workbench">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="com.ibm.etoosl.emf.workbench" id="geditModelExtension" name="Edit Model Extension"/>
+      </appInfo>
+      <documentation>
+         The Edit Model Extension allows third parties to contribute expected resources to Edit Models. The functionGroupID allows users to select which extensions they choose to have enabled.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="editModelExtension" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editModelExtension">
+      <annotation>
+         <documentation>
+            Edit model extensions allow components to contribute known resource URIs to an edit model.  Whenever an edit model is loaded, the resources will automatically be loaded and managed by the edit model.  Changes to the resources will be tracked and saved during operations or editor saves.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="editModelResource" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="functionGroupID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="editModelID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The unique id of the edit model being extended.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editModelResource">
+      <annotation>
+         <documentation>
+            This is an individual contribution of a resource to the edit model.  If more than one instance of the same URI is registered against an edit model id, the resource is still only loaded once.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="URI" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The relative path of the resource to be managed.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         6.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;br&gt;
+&lt;code&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;extension&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;point=&quot;com.ibm.etools.emf.workbench.editModelExtension&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelExtension&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;editModelID=&quot;com.ibm.etools.inheritance.parent.editModel&quot;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;functionGroupID=&quot;com.ibm.etools.websphere.group&quot;&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelResource&amp;nbsp;URI=&quot;DIR/extension0.xml&quot;/&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;editModelResource&amp;nbsp;URI=&quot;DIR/extension1.xml&quot;/&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/editModelExtension&amp;gt;&lt;br&gt;
+&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/extension&amp;gt;&lt;br&gt;
+&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/build.properties b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/build.properties
new file mode 100644
index 0000000..caa9821
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/build.properties
@@ -0,0 +1,3 @@
+bin.includes = runtime/wtpemf.jar,\
+               runtime/workbench.jar,\
+               plugin.xml
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/plugin.xml b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/plugin.xml
similarity index 79%
rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/plugin.xml
rename to features/org.eclipse.jem-feature/org.eclipse.wtp.emf/plugin.xml
index 45317fb..700d485 100644
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/plugin.xml
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/plugin.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin
-   id="com.ibm.etools.emf.ecore.utilities"
-   name="Ecore Utilities"
+   id="org.eclipse.wtp.emf"
+   name="EMF Utilities"
    version="0.5.0"
    provider-name="IBM"
-   class="com.ibm.etools.eclipse.integration.EcoreUtilitiesPlugin">
+   class="org.eclipse.wtp.internal.emf.plugin.EcoreUtilitiesPlugin">
 
    <runtime>
-      <library name="runtime/ecore.utilities.jar">
+      <library name="runtime/wtpemf.jar">
          <export name="*"/>
       </library>
       <library name="runtime/workbench.jar">
@@ -26,7 +26,7 @@
 
 <!-- Need to register the Ecore specific package mappings -->
    <extension
-         point="com.ibm.etools.emf.ecore.utilities.packageURIMap">
+         point="org.eclipse.wtp.emf.packageURIMap">
       <map
             uri="http://www.eclipse.org/emf/2002/Ecore"
             prefix="ecore">
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/runtime/workbench.jar b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/runtime/workbench.jar
new file mode 100644
index 0000000..033c652
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/runtime/workbench.jar
Binary files differ
diff --git a/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/runtime/wtpemf.jar b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/runtime/wtpemf.jar
new file mode 100644
index 0000000..aeb18f3
--- /dev/null
+++ b/features/org.eclipse.jem-feature/org.eclipse.wtp.emf/runtime/wtpemf.jar
Binary files differ
diff --git a/plugins/org.eclipse.jem.beaninfo/.project b/plugins/org.eclipse.jem.beaninfo/.project
index c04e2f7..5db4c2a 100644
--- a/plugins/org.eclipse.jem.beaninfo/.project
+++ b/plugins/org.eclipse.jem.beaninfo/.project
@@ -4,7 +4,6 @@
 	<comment></comment>
 	<projects>
 		<project>com.ibm.etools.emf.event</project>
-		<project>com.ibm.etools.emf.workbench</project>
 		<project>org.apache.xerces</project>
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>
@@ -16,6 +15,7 @@
 		<project>org.eclipse.jem</project>
 		<project>org.eclipse.jem.proxy</project>
 		<project>org.eclipse.jem.workbench</project>
+		<project>org.eclipse.wtp.emf.workbench</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
index 8ed83a7..c81b15c 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: BeaninfoNature.java,v $
- *  $Revision: 1.1.4.1 $  $Date: 2003/12/16 19:28:47 $ 
+ *  $Revision: 1.1.4.2 $  $Date: 2004/01/12 22:41:20 $ 
  */
 
 import java.io.*;
@@ -27,18 +27,20 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.internal.proxy.core.*;
 import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jdt.launching.VMRunnerConfiguration;
 import org.w3c.dom.*;
 import org.xml.sax.InputSource;
 
-import com.ibm.etools.emf.workbench.ResourceHandler;
+import org.eclipse.wtp.emf.workbench.ResourceHandler;
+
 import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
 import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
 import org.eclipse.jem.internal.java.init.JavaInit;
-import org.eclipse.jem.internal.plugin.*;
+import org.eclipse.jem.internal.plugin.JavaEMFNature;
+import org.eclipse.jem.internal.proxy.core.*;
+
 /**
  * The beaninfo nature. It is created for a project and holds the
  * necessary info for beaninfo to be performed on a project.
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
index 19730c5..94f0764 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
@@ -11,11 +11,11 @@
  *******************************************************************************/
 /*
  *  $RCSfile: SpecialResourceSet.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.1.4.1 $  $Date: 2004/01/12 22:41:20 $ 
  */
 
-import com.ibm.etools.emf.workbench.ProjectResourceSetImpl;
-import com.ibm.etools.emf.workbench.plugin.EMFWorkbenchPlugin;
+import org.eclipse.wtp.internal.emf.workbench.ProjectResourceSetImpl;
+import org.eclipse.wtp.emf.workbench.plugin.EMFWorkbenchPlugin;
 
 /**
  * A Special resource set that is used to link together to the beaninfo
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.xml b/plugins/org.eclipse.jem.beaninfo/plugin.xml
index be9868e..56f3cc4 100644
--- a/plugins/org.eclipse.jem.beaninfo/plugin.xml
+++ b/plugins/org.eclipse.jem.beaninfo/plugin.xml
@@ -23,7 +23,7 @@
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.jem"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="com.ibm.etools.emf.workbench"/>
+      <import plugin="org.eclipse.wtp.emf.workbench"/>
    </requires>
 
 
diff --git a/plugins/org.eclipse.jem.workbench/.project b/plugins/org.eclipse.jem.workbench/.project
index 0553afd..5e29e73 100644
--- a/plugins/org.eclipse.jem.workbench/.project
+++ b/plugins/org.eclipse.jem.workbench/.project
@@ -3,8 +3,6 @@
 	<name>org.eclipse.jem.workbench</name>
 	<comment></comment>
 	<projects>
-		<project>com.ibm.etools.emf.ecore.utilities</project>
-		<project>com.ibm.etools.emf.workbench</project>
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>
 		<project>org.eclipse.core.runtime</project>
@@ -12,6 +10,8 @@
 		<project>org.eclipse.jdt.core</project>
 		<project>org.eclipse.jem</project>
 		<project>org.eclipse.wtp.common</project>
+		<project>org.eclipse.wtp.emf</project>
+		<project>org.eclipse.wtp.emf.workbench</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/plugins/org.eclipse.jem.workbench/plugin.xml b/plugins/org.eclipse.jem.workbench/plugin.xml
index 9aec9bc..819ebf4 100644
--- a/plugins/org.eclipse.jem.workbench/plugin.xml
+++ b/plugins/org.eclipse.jem.workbench/plugin.xml
@@ -16,12 +16,13 @@
       <import plugin="org.eclipse.jem"/>
       <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="com.ibm.etools.emf.workbench"/>
       <import plugin="org.eclipse.wtp.common"/>
-      <import plugin="com.ibm.etools.emf.ecore.utilities"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.wtp.emf"/>
+      <import plugin="org.eclipse.wtp.emf.workbench"/>
    </requires>
 
+
    <extension
          id="JavaEMFNature"
          name="%JavaEMFNatureName"
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
index 48e5461..9470829 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
@@ -8,7 +8,7 @@
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
 /*
- * $RCSfile: JavaEMFNature.java,v $ $Revision: 1.1.2.1 $ $Date: 2003/12/16 19:29:09 $
+ * $RCSfile: JavaEMFNature.java,v $ $Revision: 1.1.2.2 $ $Date: 2004/01/12 22:41:16 $
  */
 
 import java.util.List;
@@ -19,14 +19,14 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
+import org.eclipse.wtp.emf.workbench.EMFWorkbenchContext;
+import org.eclipse.wtp.emf.workbench.WorkbenchURIConverter;
+import org.eclipse.wtp.emf.workbench.nature.EMFNature;
+
 import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
 import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
 import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
 
-import com.ibm.etools.emf.workbench.EMFWorkbenchContext;
-import com.ibm.etools.emf.workbench.WorkbenchURIConverter;
-import com.ibm.etools.emf.workbench.nature.EMFNature;
-
 public class JavaEMFNature extends EMFNature {
 	public static final String NATURE_ID = "org.eclipse.jem.workbench.JavaEMFNature";
 /**
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
index ea7529c..1d616ad 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
@@ -8,19 +8,19 @@
  * Contributors: IBM Corporation - initial API and implementation
  **************************************************************************************************/
 /*
- * $RCSfile: JavaPlugin.java,v $ $Revision: 1.1.4.1 $ $Date: 2003/12/16 19:29:09 $
+ * $RCSfile: JavaPlugin.java,v $ $Revision: 1.1.4.2 $ $Date: 2004/01/12 22:41:16 $
  */
 
 import org.eclipse.core.runtime.*;
 
+import org.eclipse.wtp.emf.workbench.plugin.EMFWorkbenchPlugin;
+
 import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
 import org.eclipse.jem.internal.core.EclipseLogMsgLogger;
 import org.eclipse.jem.internal.core.MsgLogger;
 import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
 import org.eclipse.jem.internal.java.impl.JavaRefFactoryImpl;
 
-import com.ibm.etools.emf.workbench.plugin.EMFWorkbenchPlugin;
-
 /**
  * This is a top-level class of the java plugin tool.
  * 
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java
index cd8f333..9d853e9 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ProjectUtilities.java,v $
- *  $Revision: 1.1.4.2 $  $Date: 2003/12/16 19:29:09 $ 
+ *  $Revision: 1.1.4.3 $  $Date: 2004/01/12 22:41:16 $ 
  */
 
 import java.net.MalformedURLException;
@@ -24,11 +24,11 @@
 import org.eclipse.jdt.internal.core.JavaModel;
 import org.eclipse.jdt.internal.core.JavaModelManager;
 
+import org.eclipse.wtp.emf.workbench.WorkbenchResourceHelper;
+
 import org.eclipse.jem.internal.java.JavaClass;
 import org.eclipse.jem.internal.java.impl.JavaClassImpl;
-
-import com.ibm.etools.emf.workbench.WorkbenchResourceHelper;
-public class ProjectUtilities extends com.ibm.etools.emf.workbench.ProjectUtilities {
+public class ProjectUtilities extends org.eclipse.wtp.emf.workbench.ProjectUtilities {
 	public final static String DOT_PROJECT = ".project"; //$NON-NLS-1$
 	public final static String DOT_CLASSPATH = ".classpath"; //$NON-NLS-1$
 	/**