diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
index 0c43dc3..ad39e96 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.4 2004/05/20 19:22:09 khussey Exp $
+ * $Id: plugin.xml,v 1.5 2004/05/21 17:37:12 khussey Exp $
  */
 -->
 
@@ -26,8 +26,6 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.uml2.editor" export="true"/>
       <import plugin="org.eclipse.uml2.examples" export="true"/>
diff --git a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
index c4d2e38..3da88ec 100644
--- a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.2 2004/05/20 19:22:02 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/21 17:37:01 khussey Exp $
  */
 -->
 
@@ -26,8 +26,7 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.uml2.edit" export="true"/>
+      <import plugin="org.eclipse.uml2" export="true"/>
    </requires>
 
    <runtime>
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml b/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
index 946315c..89986ae 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.3 2004/05/04 19:16:48 khussey Exp $
+ * $Id: plugin.xml,v 1.4 2004/05/21 17:37:08 khussey Exp $
  */
 -->
 
@@ -26,12 +26,13 @@
    <runtime>
       <library name="uml2.edit.jar">
          <export name="*"/>
-         <packages prefixes="org.eclipse.uml2.edit.util,org.eclipse.uml2.provider"/>
+         <packages prefixes="org.eclipse.uml2.edit.internal.command,org.eclipse.uml2.edit.util,org.eclipse.uml2.provider"/>
       </library>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.emf.ecore.change.edit"/>
+      <import plugin="org.eclipse.emf.edit" export="true"/>
       <import plugin="org.eclipse.uml2" export="true"/>
    </requires>
 
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
index e9ca392..e804677 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.4 2004/05/20 19:22:05 khussey Exp $
+ * $Id: plugin.xml,v 1.5 2004/05/21 17:37:04 khussey Exp $
  */
 -->
 
@@ -26,9 +26,7 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore.edit"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
+      <import plugin="org.eclipse.emf.edit.ui" export="true"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.uml2.edit" export="true"/>
    </requires>
@@ -36,7 +34,7 @@
    <runtime>
       <library name="uml2.editor.jar">
         <export name="*"/>
-        <packages prefixes="org.eclipse.uml2.presentation"/>
+        <packages prefixes="org.eclipse.uml2.editor.internal.presentation,org.eclipse.uml2.presentation"/>
       </library>
    </runtime>
 
diff --git a/deprecated/plugins/org.eclipse.uml2/plugin.xml b/deprecated/plugins/org.eclipse.uml2/plugin.xml
index 82dd8db..1342e66 100644
--- a/deprecated/plugins/org.eclipse.uml2/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.5 2004/05/20 19:22:12 khussey Exp $
+ * $Id: plugin.xml,v 1.6 2004/05/21 17:37:15 khussey Exp $
  */
 -->
 
@@ -33,7 +33,7 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.emf.ecore.xmi" export="true"/>
    </requires>
 
    <extension
diff --git a/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml
index bcd089a..c65f261 100644
--- a/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.1 2004/04/29 14:43:45 khussey Exp $
+ * $Id: plugin.xml,v 1.2 2004/05/21 17:36:57 khussey Exp $
  */
 -->
 
@@ -27,7 +27,6 @@
    </runtime>
 
    <requires>
-      <import plugin="org.eclipse.emf.ecore.edit"/>
       <import plugin="org.eclipse.uml2.edit"/>
       <import plugin="org.junit"/>
    </requires>
diff --git a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
index 59f5a7d..4f99f38 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.3 2004/05/20 19:21:55 khussey Exp $
+ * $Id: plugin.xml,v 1.4 2004/05/21 17:36:53 khussey Exp $
  */
 -->
 
@@ -27,7 +27,6 @@
    </runtime>
 
    <requires>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.uml2"/>
       <import plugin="org.junit"/>
    </requires>