[90761] Investigate: Use manifest.mf
diff --git a/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..95fdec6
--- /dev/null
+++ b/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
@@ -0,0 +1,43 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.jst.jsp.core; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: jspmodel.jar
+Bundle-Activator: org.eclipse.jst.jsp.core.internal.JSPCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jst.jsp.core.internal,
+ org.eclipse.jst.jsp.core.internal.contentmodel,
+ org.eclipse.jst.jsp.core.internal.contentmodel.tld,
+ org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional,
+ org.eclipse.jst.jsp.core.internal.contenttype,
+ org.eclipse.jst.jsp.core.internal.document,
+ org.eclipse.jst.jsp.core.internal.domdocument,
+ org.eclipse.jst.jsp.core.internal.encoding,
+ org.eclipse.jst.jsp.core.internal.java,
+ org.eclipse.jst.jsp.core.internal.java.search,
+ org.eclipse.jst.jsp.core.internal.modelhandler,
+ org.eclipse.jst.jsp.core.internal.modelquery,
+ org.eclipse.jst.jsp.core.internal.parser,
+ org.eclipse.jst.jsp.core.internal.parser.internal,
+ org.eclipse.jst.jsp.core.internal.preferences,
+ org.eclipse.jst.jsp.core.internal.provisional,
+ org.eclipse.jst.jsp.core.internal.provisional.contenttype,
+ org.eclipse.jst.jsp.core.internal.provisional.text,
+ org.eclipse.jst.jsp.core.internal.regions,
+ org.eclipse.jst.jsp.core.internal.tasks,
+ org.eclipse.jst.jsp.core.internal.text,
+ org.eclipse.jst.jsp.core.internal.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.core.filebuffers,
+ org.eclipse.wst.html.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.xml.uriresolver,
+ org.eclipse.jdt.core,
+ org.eclipse.text,
+ org.eclipse.wst.common.uriresolver
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.jsp.core/build.properties b/bundles/org.eclipse.jst.jsp.core/build.properties
index 634f9a4..b76152a 100644
--- a/bundles/org.eclipse.jst.jsp.core/build.properties
+++ b/bundles/org.eclipse.jst.jsp.core/build.properties
@@ -12,7 +12,8 @@
                *.jar,\
                jsp.jar,\
                .options,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 src.includes = plugin.xml,\
                build.xml,\
                .options,\
diff --git a/bundles/org.eclipse.jst.jsp.core/plugin.xml b/bundles/org.eclipse.jst.jsp.core/plugin.xml
index e5cfeb3..24b531d 100644
--- a/bundles/org.eclipse.jst.jsp.core/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.core/plugin.xml
@@ -1,33 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.jsp.core"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.jst.jsp.core.internal.JSPCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="jspmodel.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.wst.html.core"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.xml.uriresolver"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.wst.common.uriresolver"/>
-   </requires>
-
-
-  <extension
+     <extension
          point="org.eclipse.wst.sse.core.modelHandler">
       <modelHandler
             class="org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP"
diff --git a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..35922fb
--- /dev/null
+++ b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,61 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.jst.jsp.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: jspeditor.jar
+Bundle-Activator: org.eclipse.jst.jsp.ui.internal.JSPUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jst.jsp.ui.internal,
+ org.eclipse.jst.jsp.ui.internal.autoedit,
+ org.eclipse.jst.jsp.ui.internal.breakpointproviders,
+ org.eclipse.jst.jsp.ui.internal.contentassist,
+ org.eclipse.jst.jsp.ui.internal.editor,
+ org.eclipse.jst.jsp.ui.internal.format,
+ org.eclipse.jst.jsp.ui.internal.hyperlink,
+ org.eclipse.jst.jsp.ui.internal.java.refactoring,
+ org.eclipse.jst.jsp.ui.internal.java.search,
+ org.eclipse.jst.jsp.ui.internal.java.search.ui,
+ org.eclipse.jst.jsp.ui.internal.preferences,
+ org.eclipse.jst.jsp.ui.internal.preferences.ui,
+ org.eclipse.jst.jsp.ui.internal.projection,
+ org.eclipse.jst.jsp.ui.internal.provisional,
+ org.eclipse.jst.jsp.ui.internal.reconcile,
+ org.eclipse.jst.jsp.ui.internal.registry,
+ org.eclipse.jst.jsp.ui.internal.style,
+ org.eclipse.jst.jsp.ui.internal.style.java,
+ org.eclipse.jst.jsp.ui.internal.taginfo,
+ org.eclipse.jst.jsp.ui.internal.templates,
+ org.eclipse.jst.jsp.ui.internal.text,
+ org.eclipse.jst.jsp.ui.internal.views.contentoutline,
+ org.eclipse.jst.jsp.ui.internal.wizard
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.html.ui,
+ org.eclipse.wst.css.ui,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.jst.jsp.core,
+ org.eclipse.wst.html.core,
+ org.eclipse.wst.css.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.uriresolver,
+ org.eclipse.wst.sse.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.debug,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.search,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring,
+ org.eclipse.wst.common.uriresolver,
+ org.eclipse.ui.ide,
+ org.eclipse.wst.javascript.ui
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.jsp.ui/build.properties b/bundles/org.eclipse.jst.jsp.ui/build.properties
index cca182e..42eecf1 100644
--- a/bundles/org.eclipse.jst.jsp.ui/build.properties
+++ b/bundles/org.eclipse.jst.jsp.ui/build.properties
@@ -14,7 +14,8 @@
                jspeditor.jar,\
                icons/,\
                plugin.properties,\
-               templates/
+               templates/,\
+               META-INF/
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
diff --git a/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index 4cd4b9c..1dcccf2 100644
--- a/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
@@ -1,47 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin id="org.eclipse.jst.jsp.ui" 
-	name="%pluginName" version="1.0.0"
-	provider-name="%providerName"
-	class="org.eclipse.jst.jsp.ui.internal.JSPUIPlugin">
+<plugin>
 
-	<runtime>
-		<library name="jspeditor.jar">
-			<export name="*" />
-		</library>
-	</runtime>
-	<requires>
-		<import plugin="org.eclipse.ui.ide" />
-		<import plugin="org.eclipse.ui.views" />
-		<import plugin="org.eclipse.jface.text" />
-		<import plugin="org.eclipse.ui.workbench.texteditor" />
-		<import plugin="org.eclipse.ui.editors" />
-		<import plugin="org.eclipse.ui" />
-		<import plugin="org.eclipse.wst.sse.ui" />
-		<import plugin="org.eclipse.wst.html.ui" />
-		<import plugin="org.eclipse.wst.css.ui" />
-		<import plugin="org.eclipse.wst.xml.ui" />
-		<import plugin="org.eclipse.jst.jsp.core" />
-		<import plugin="org.eclipse.wst.html.core" />
-		<import plugin="org.eclipse.wst.css.core" />
-		<import plugin="org.eclipse.wst.xml.core" />
-		<import plugin="org.eclipse.wst.xml.uriresolver" />
-		<import plugin="org.eclipse.wst.sse.core" />
-		<import plugin="org.eclipse.jdt.ui" />
-		<import plugin="org.eclipse.jdt.core" />
-		<import plugin="org.eclipse.debug.core" />
-		<import plugin="org.eclipse.jdt.debug" />
-		<import plugin="org.eclipse.core.resources" />
-		<import plugin="org.eclipse.core.runtime" />
-		<import plugin="org.eclipse.search" />
-		<import plugin="org.eclipse.ltk.core.refactoring" />
-		<import plugin="org.eclipse.ltk.ui.refactoring" />
-		<import plugin="org.eclipse.wst.common.uriresolver"/>
-		<import plugin="org.eclipse.ui.ide" />
-  		<import plugin="org.eclipse.wst.javascript.ui"/>
-	</requires>
-
-	<extension point="org.eclipse.ui.editors">
+			<extension point="org.eclipse.ui.editors">
 		<editor name="%JSP_Source_Page_Editor.name"
 			icon="icons/sourceEditor.gif" extensions="jsp, jsf, jspf, jspx, tag, tagf"
 			contributorClass="org.eclipse.jst.jsp.ui.internal.editor.ActionContributorJSP"
diff --git a/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0886286
--- /dev/null
+++ b/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
@@ -0,0 +1,42 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.css.core; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: cssmodel.jar
+Bundle-Activator: org.eclipse.wst.css.core.internal.CSSCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.css.core.internal,
+ org.eclipse.wst.css.core.internal.cleanup,
+ org.eclipse.wst.css.core.internal.contentmodel,
+ org.eclipse.wst.css.core.internal.contenttype,
+ org.eclipse.wst.css.core.internal.document,
+ org.eclipse.wst.css.core.internal.encoding,
+ org.eclipse.wst.css.core.internal.event,
+ org.eclipse.wst.css.core.internal.eventimpl,
+ org.eclipse.wst.css.core.internal.format,
+ org.eclipse.wst.css.core.internal.formatter,
+ org.eclipse.wst.css.core.internal.metamodel,
+ org.eclipse.wst.css.core.internal.metamodel.util,
+ org.eclipse.wst.css.core.internal.metamodelimpl,
+ org.eclipse.wst.css.core.internal.modelhandler,
+ org.eclipse.wst.css.core.internal.parser,
+ org.eclipse.wst.css.core.internal.parser.regions,
+ org.eclipse.wst.css.core.internal.parserz,
+ org.eclipse.wst.css.core.internal.preferences,
+ org.eclipse.wst.css.core.internal.provisional.adapters,
+ org.eclipse.wst.css.core.internal.provisional.contenttype,
+ org.eclipse.wst.css.core.internal.provisional.document,
+ org.eclipse.wst.css.core.internal.provisional.preferences,
+ org.eclipse.wst.css.core.internal.provisional.text,
+ org.eclipse.wst.css.core.internal.tasks,
+ org.eclipse.wst.css.core.internal.text,
+ org.eclipse.wst.css.core.internal.util,
+ org.eclipse.wst.css.core.internal.util.declaration
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.sse.core
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.css.core/build.properties b/bundles/org.eclipse.wst.css.core/build.properties
index 78aa1c4..f54bf81 100644
--- a/bundles/org.eclipse.wst.css.core/build.properties
+++ b/bundles/org.eclipse.wst.css.core/build.properties
@@ -13,7 +13,8 @@
                css.jar,\
                cssprofile/,\
                .options,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 source.cssmodel.jar = src/
 src.includes = plugin.xml,\
                cssprofile/,\
diff --git a/bundles/org.eclipse.wst.css.core/plugin.xml b/bundles/org.eclipse.wst.css.core/plugin.xml
index ef6e09b..9527c17 100644
--- a/bundles/org.eclipse.wst.css.core/plugin.xml
+++ b/bundles/org.eclipse.wst.css.core/plugin.xml
@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.css.core"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.css.core.internal.CSSCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="cssmodel.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-   </requires>
-
-   <extension
+     <extension
          point="org.eclipse.wst.sse.core.cssprofile">
       <profile
             name="%cssprofile_css2.name"
diff --git a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..bcb6f6d
--- /dev/null
+++ b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,47 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.css.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: csseditor.jar
+Bundle-Activator: org.eclipse.wst.css.ui.internal.CSSUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.css.ui.internal,
+ org.eclipse.wst.css.ui.internal.autoedit,
+ org.eclipse.wst.css.ui.internal.contentassist,
+ org.eclipse.wst.css.ui.internal.contentoutline,
+ org.eclipse.wst.css.ui.internal.contentproperties,
+ org.eclipse.wst.css.ui.internal.contentproperties.ui,
+ org.eclipse.wst.css.ui.internal.edit.ui,
+ org.eclipse.wst.css.ui.internal.editor,
+ org.eclipse.wst.css.ui.internal.image,
+ org.eclipse.wst.css.ui.internal.preferences,
+ org.eclipse.wst.css.ui.internal.preferences.ui,
+ org.eclipse.wst.css.ui.internal.projection,
+ org.eclipse.wst.css.ui.internal.properties,
+ org.eclipse.wst.css.ui.internal.provisional,
+ org.eclipse.wst.css.ui.internal.registry,
+ org.eclipse.wst.css.ui.internal.selection,
+ org.eclipse.wst.css.ui.internal.style,
+ org.eclipse.wst.css.ui.internal.taginfo,
+ org.eclipse.wst.css.ui.internal.text,
+ org.eclipse.wst.css.ui.internal.views.contentoutline,
+ org.eclipse.wst.css.ui.internal.views.properties,
+ org.eclipse.wst.css.ui.internal.wizard
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.css.core,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.html.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.ide
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.css.ui/build.properties b/bundles/org.eclipse.wst.css.ui/build.properties
index 07de39b..7e98d66 100644
--- a/bundles/org.eclipse.wst.css.ui/build.properties
+++ b/bundles/org.eclipse.wst.css.ui/build.properties
@@ -12,7 +12,8 @@
                *.jar,\
                css.jar,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.xml b/bundles/org.eclipse.wst.css.ui/plugin.xml
index df51c10..3278f7f 100644
--- a/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.css.ui/plugin.xml
@@ -1,36 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.css.ui"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.css.ui.internal.CSSUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="csseditor.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.wst.xml.ui"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.css.core"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.html.core"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.ide"/>
-   </requires>
-
-   <extension
+     <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%CSS_Source_Page_Editor.name"
diff --git a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9e4718b
--- /dev/null
+++ b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.dtd.core; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: dtdcore.jar
+Bundle-Activator: org.eclipse.wst.dtd.core.internal.DTDCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.dtd.core.internal,
+ org.eclipse.wst.dtd.core.internal.content,
+ org.eclipse.wst.dtd.core.internal.contentmodel,
+ org.eclipse.wst.dtd.core.internal.document,
+ org.eclipse.wst.dtd.core.internal.emf,
+ org.eclipse.wst.dtd.core.internal.emf.impl,
+ org.eclipse.wst.dtd.core.internal.emf.util,
+ org.eclipse.wst.dtd.core.internal.encoding,
+ org.eclipse.wst.dtd.core.internal.event,
+ org.eclipse.wst.dtd.core.internal.modelhandler,
+ org.eclipse.wst.dtd.core.internal.parser,
+ org.eclipse.wst.dtd.core.internal.provisional.contenttype,
+ org.eclipse.wst.dtd.core.internal.provisional.document,
+ org.eclipse.wst.dtd.core.internal.provisional.text,
+ org.eclipse.wst.dtd.core.internal.saxparser,
+ org.eclipse.wst.dtd.core.internal.tasks,
+ org.eclipse.wst.dtd.core.internal.text,
+ org.eclipse.wst.dtd.core.internal.tokenizer,
+ org.eclipse.wst.dtd.core.internal.util,
+ rose
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.wst.common.uriresolver,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.uriresolver
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.dtd.core/build.properties b/bundles/org.eclipse.wst.dtd.core/build.properties
index 5c4cfcc..cf5f61f 100644
--- a/bundles/org.eclipse.wst.dtd.core/build.properties
+++ b/bundles/org.eclipse.wst.dtd.core/build.properties
@@ -13,7 +13,8 @@
 bin.includes = plugin.xml,\
                *.jar,\
                plugin.properties,\
-               icons/
+               icons/,\
+               META-INF/
 src.includes = plugin.xml,\
                plugin.properties,\
                build.xml,\
diff --git a/bundles/org.eclipse.wst.dtd.core/plugin.xml b/bundles/org.eclipse.wst.dtd.core/plugin.xml
index b69db61..9a680fd 100644
--- a/bundles/org.eclipse.wst.dtd.core/plugin.xml
+++ b/bundles/org.eclipse.wst.dtd.core/plugin.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-	id="org.eclipse.wst.dtd.core"
-	name="%pluginName"
-	version="1.0.0"
-	provider-name="%providerName"
-	class="org.eclipse.wst.dtd.core.internal.DTDCorePlugin">
+<plugin>
 
-	<runtime>
-		<library name="dtdcore.jar">
-			<export name="*" />
-		</library>
-	</runtime>
-	<requires>
-		<import plugin="org.eclipse.core.resources"/>
-		<import plugin="org.eclipse.core.runtime" />
-		<import plugin="org.eclipse.emf.ecore"/>
-		<import plugin="org.eclipse.jface.text" />
-		<import plugin="org.eclipse.ui" />
-		<import plugin="org.eclipse.wst.common.uriresolver"/>
-		<import plugin="org.eclipse.wst.sse.core" />
-		<import plugin="org.eclipse.wst.validation"/>
-		<import plugin="org.eclipse.wst.xml.core" />
-		<import plugin="org.eclipse.wst.xml.uriresolver"/>
-	</requires>
-
-
-	<extension point="org.eclipse.wst.sse.core.modelHandler">
+			<extension point="org.eclipse.wst.sse.core.modelHandler">
 		<modelHandler
 			class="org.eclipse.wst.dtd.core.internal.modelhandler.ModelHandlerForDTD"
 			associatedContentTypeId="org.eclipse.wst.dtd.core.dtdsource"
diff --git a/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c13e7b8
--- /dev/null
+++ b/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.dtd.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: dtdui.jar
+Bundle-Activator: org.eclipse.wst.dtd.ui.internal.DTDUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.dtd.ui.internal,
+ org.eclipse.wst.dtd.ui.internal.dnd,
+ org.eclipse.wst.dtd.ui.internal.editor,
+ org.eclipse.wst.dtd.ui.internal.preferences,
+ org.eclipse.wst.dtd.ui.internal.projection,
+ org.eclipse.wst.dtd.ui.internal.provisional,
+ org.eclipse.wst.dtd.ui.internal.registry,
+ org.eclipse.wst.dtd.ui.internal.style,
+ org.eclipse.wst.dtd.ui.internal.taginfo,
+ org.eclipse.wst.dtd.ui.internal.text,
+ org.eclipse.wst.dtd.ui.internal.views.contentoutline,
+ org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions,
+ org.eclipse.wst.dtd.ui.internal.views.properties,
+ org.eclipse.wst.dtd.ui.internal.wizard
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.wst.common.ui,
+ org.eclipse.wst.common.uriresolver,
+ org.eclipse.wst.dtd.core,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.xml.core
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.dtd.ui/build.properties b/bundles/org.eclipse.wst.dtd.ui/build.properties
index fd5b05a..fd5cd47 100644
--- a/bundles/org.eclipse.wst.dtd.ui/build.properties
+++ b/bundles/org.eclipse.wst.dtd.ui/build.properties
@@ -13,7 +13,8 @@
 bin.includes = plugin.xml,\
                *.jar,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 source.dtdui.jar = src/
 src.includes = plugin.xml,\
                icons/,\
diff --git a/bundles/org.eclipse.wst.dtd.ui/plugin.xml b/bundles/org.eclipse.wst.dtd.ui/plugin.xml
index 4da0def..7d40d7c 100644
--- a/bundles/org.eclipse.wst.dtd.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.dtd.ui/plugin.xml
@@ -1,37 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.dtd.ui"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.dtd.ui.internal.DTDUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="dtdui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-		<import plugin="org.eclipse.core.resources"/>
-		<import plugin="org.eclipse.core.runtime" />
-		<import plugin="org.eclipse.jface.text"/>
-		<import plugin="org.eclipse.ui" />
-		<import plugin="org.eclipse.ui.editors"/>
-		<import plugin="org.eclipse.ui.ide" />
-		<import plugin="org.eclipse.ui.views"/>
-		<import plugin="org.eclipse.ui.workbench"/>
-		<import plugin="org.eclipse.ui.workbench.texteditor"/>
-		<import plugin="org.eclipse.wst.common.ui"/>
-		<import plugin="org.eclipse.wst.common.uriresolver"/>
-		<import plugin="org.eclipse.wst.dtd.core"/>
-		<import plugin="org.eclipse.wst.sse.core"/>
-		<import plugin="org.eclipse.wst.sse.ui"/>
-		<import plugin="org.eclipse.wst.validation"/>
-		<import plugin="org.eclipse.wst.xml.core"/>
-   </requires>
-
-   <extension
+     <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%DTD_Source_Page_Editor.name"
diff --git a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..361e04f
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: htmlmodel.jar
+Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.html.core.internal,
+ org.eclipse.wst.html.core.internal.cleanup,
+ org.eclipse.wst.html.core.internal.commentelement.handlers,
+ org.eclipse.wst.html.core.internal.contentmodel,
+ org.eclipse.wst.html.core.internal.contentmodel.chtml,
+ org.eclipse.wst.html.core.internal.contentmodel.ssi,
+ org.eclipse.wst.html.core.internal.contenttype,
+ org.eclipse.wst.html.core.internal.document,
+ org.eclipse.wst.html.core.internal.encoding,
+ org.eclipse.wst.html.core.internal.format,
+ org.eclipse.wst.html.core.internal.htmlcss,
+ org.eclipse.wst.html.core.internal.modelhandler,
+ org.eclipse.wst.html.core.internal.modelquery,
+ org.eclipse.wst.html.core.internal.preferences,
+ org.eclipse.wst.html.core.internal.provisional,
+ org.eclipse.wst.html.core.internal.provisional.contenttype,
+ org.eclipse.wst.html.core.internal.provisional.text,
+ org.eclipse.wst.html.core.internal.text,
+ org.eclipse.wst.html.core.internal.validate
+Require-Bundle: org.eclipse.wst.css.core,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.uriresolver,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.html.core/build.properties b/bundles/org.eclipse.wst.html.core/build.properties
index 6c96366..50fccd6 100644
--- a/bundles/org.eclipse.wst.html.core/build.properties
+++ b/bundles/org.eclipse.wst.html.core/build.properties
@@ -13,7 +13,8 @@
                html.jar,\
                .options,\
                data/,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 src.includes = plugin.xml,\
                build.xml,\
                .options,\
diff --git a/bundles/org.eclipse.wst.html.core/plugin.xml b/bundles/org.eclipse.wst.html.core/plugin.xml
index 7aada52..160504d 100644
--- a/bundles/org.eclipse.wst.html.core/plugin.xml
+++ b/bundles/org.eclipse.wst.html.core/plugin.xml
@@ -1,29 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.html.core"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.html.core.internal.HTMLCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="htmlmodel.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.wst.css.core"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.xml.uriresolver"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.wst.sse.core.modelHandler">
       <modelHandler
             default="no"
diff --git a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9407a36
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,49 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: htmleditor.jar
+Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.html.internal.validation,
+ org.eclipse.wst.html.ui.internal,
+ org.eclipse.wst.html.ui.internal.contentassist,
+ org.eclipse.wst.html.ui.internal.contentoutline,
+ org.eclipse.wst.html.ui.internal.contentproperties.ui,
+ org.eclipse.wst.html.ui.internal.edit.ui,
+ org.eclipse.wst.html.ui.internal.editor,
+ org.eclipse.wst.html.ui.internal.hyperlink,
+ org.eclipse.wst.html.ui.internal.preferences,
+ org.eclipse.wst.html.ui.internal.preferences.ui,
+ org.eclipse.wst.html.ui.internal.projection,
+ org.eclipse.wst.html.ui.internal.provisional,
+ org.eclipse.wst.html.ui.internal.registry,
+ org.eclipse.wst.html.ui.internal.search,
+ org.eclipse.wst.html.ui.internal.style,
+ org.eclipse.wst.html.ui.internal.taginfo,
+ org.eclipse.wst.html.ui.internal.templates,
+ org.eclipse.wst.html.ui.internal.text,
+ org.eclipse.wst.html.ui.internal.views.contentoutline,
+ org.eclipse.wst.html.ui.internal.wizard
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.wst.css.ui,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.css.core,
+ org.eclipse.wst.html.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.ui,
+ org.eclipse.wst.common.uriresolver,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.javascript.ui
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.html.ui/build.properties b/bundles/org.eclipse.wst.html.ui/build.properties
index 9a8d1fa..b52e950 100644
--- a/bundles/org.eclipse.wst.html.ui/build.properties
+++ b/bundles/org.eclipse.wst.html.ui/build.properties
@@ -13,7 +13,8 @@
                html.jar,\
                icons/,\
                plugin.properties,\
-               templates/
+               templates/,\
+               META-INF/
 source.htmleditor.jar = src/,\
                         src-html-validation/
 src.includes = plugin.xml,\
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 42051c7..78a2347 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -1,40 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.html.ui"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.html.ui.internal.HTMLUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="htmleditor.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.xml.ui"/>
-      <import plugin="org.eclipse.wst.css.ui"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.css.core"/>
-      <import plugin="org.eclipse.wst.html.core"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.wst.common.uriresolver"/>
-      <import plugin="org.eclipse.wst.validation"/>
-      <import plugin="org.eclipse.wst.javascript.ui"/>
-   </requires>
-
-   <extension-point id="deviceProfileEntryProvider" name="%Device_Profile_Entry_Provider_Extension.name"/>
+     <extension-point id="deviceProfileEntryProvider" name="%Device_Profile_Entry_Provider_Extension.name"/>
 
    <extension
          point="org.eclipse.ui.editors">
diff --git a/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ac20dd0
--- /dev/null
+++ b/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
@@ -0,0 +1,42 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.sse.core; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: model.jar
+Bundle-Activator: org.eclipse.wst.sse.core.internal.SSECorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.emf.common.command,
+ org.eclipse.wst.sse.core.internal,
+ org.eclipse.wst.sse.core.internal.cleanup,
+ org.eclipse.wst.sse.core.internal.document,
+ org.eclipse.wst.sse.core.internal.encoding,
+ org.eclipse.wst.sse.core.internal.encoding.util,
+ org.eclipse.wst.sse.core.internal.exceptions,
+ org.eclipse.wst.sse.core.internal.filebuffers,
+ org.eclipse.wst.sse.core.internal.format,
+ org.eclipse.wst.sse.core.internal.ltk.modelhandler,
+ org.eclipse.wst.sse.core.internal.ltk.parser,
+ org.eclipse.wst.sse.core.internal.model,
+ org.eclipse.wst.sse.core.internal.modelhandler,
+ org.eclipse.wst.sse.core.internal.parser,
+ org.eclipse.wst.sse.core.internal.preferences,
+ org.eclipse.wst.sse.core.internal.provisional,
+ org.eclipse.wst.sse.core.internal.provisional.document,
+ org.eclipse.wst.sse.core.internal.provisional.events,
+ org.eclipse.wst.sse.core.internal.provisional.exceptions,
+ org.eclipse.wst.sse.core.internal.provisional.model,
+ org.eclipse.wst.sse.core.internal.provisional.text,
+ org.eclipse.wst.sse.core.internal.tasks,
+ org.eclipse.wst.sse.core.internal.text,
+ org.eclipse.wst.sse.core.internal.text.rules,
+ org.eclipse.wst.sse.core.internal.undo,
+ org.eclipse.wst.sse.core.internal.util,
+ org.eclipse.wst.sse.core.internal.validate
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.text;visibility:=reexport,
+ org.eclipse.core.runtime,
+ org.eclipse.core.filebuffers,
+ org.eclipse.wst.xml.uriresolver
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.sse.core/build.properties b/bundles/org.eclipse.wst.sse.core/build.properties
index a7140a4..9eca320 100644
--- a/bundles/org.eclipse.wst.sse.core/build.properties
+++ b/bundles/org.eclipse.wst.sse.core/build.properties
@@ -16,7 +16,8 @@
                plugin.properties,\
                model.jar,\
                .options,\
-               config/
+               config/,\
+               META-INF/
 src.includes = DevTimeSupport/,\
                plugin.properties,\
                plugin.xml,\
diff --git a/bundles/org.eclipse.wst.sse.core/plugin.xml b/bundles/org.eclipse.wst.sse.core/plugin.xml
index 7f236c0..aab15a6 100644
--- a/bundles/org.eclipse.wst.sse.core/plugin.xml
+++ b/bundles/org.eclipse.wst.sse.core/plugin.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.sse.core"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.sse.core.internal.SSECorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="model.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      
-		<!-- need to re-export org.eclipse.text since our API depends on it, 
-			such as IStructuredDocument extends IDocument 
-		-->
-      <import plugin="org.eclipse.text" export="true"/>
-
-     
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.wst.xml.uriresolver"/>
-   </requires>
-
-
+    
 <!-- deprecated -->
    <extension-point id="adaptOnCreateFactory" name="%Adapt_On_Create_Factory_Extension.name"/>
    <extension-point id="documentTypes" name="%Document_Types_Extension.name"/>
diff --git a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3a8a2da
--- /dev/null
+++ b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,65 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: editor.jar
+Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.sse.ui.internal,
+ org.eclipse.wst.sse.ui.internal.actions,
+ org.eclipse.wst.sse.ui.internal.autoedit,
+ org.eclipse.wst.sse.ui.internal.contentassist,
+ org.eclipse.wst.sse.ui.internal.contentoutline,
+ org.eclipse.wst.sse.ui.internal.contentproperties.ui,
+ org.eclipse.wst.sse.ui.internal.correction,
+ org.eclipse.wst.sse.ui.internal.debug,
+ org.eclipse.wst.sse.ui.internal.edit.util,
+ org.eclipse.wst.sse.ui.internal.editor,
+ org.eclipse.wst.sse.ui.internal.encoding.ui,
+ org.eclipse.wst.sse.ui.internal.extension,
+ org.eclipse.wst.sse.ui.internal.format,
+ org.eclipse.wst.sse.ui.internal.hyperlink,
+ org.eclipse.wst.sse.ui.internal.openon,
+ org.eclipse.wst.sse.ui.internal.preferences,
+ org.eclipse.wst.sse.ui.internal.preferences.ui,
+ org.eclipse.wst.sse.ui.internal.projection,
+ org.eclipse.wst.sse.ui.internal.properties,
+ org.eclipse.wst.sse.ui.internal.provisional,
+ org.eclipse.wst.sse.ui.internal.provisional.contentproperties,
+ org.eclipse.wst.sse.ui.internal.provisional.extensions,
+ org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint,
+ org.eclipse.wst.sse.ui.internal.provisional.preferences,
+ org.eclipse.wst.sse.ui.internal.provisional.registry,
+ org.eclipse.wst.sse.ui.internal.provisional.registry.embedded,
+ org.eclipse.wst.sse.ui.internal.provisional.style,
+ org.eclipse.wst.sse.ui.internal.provisional.views.contentoutline,
+ org.eclipse.wst.sse.ui.internal.provisional.views.properties,
+ org.eclipse.wst.sse.ui.internal.reconcile,
+ org.eclipse.wst.sse.ui.internal.reconcile.validator,
+ org.eclipse.wst.sse.ui.internal.search,
+ org.eclipse.wst.sse.ui.internal.selection,
+ org.eclipse.wst.sse.ui.internal.taginfo,
+ org.eclipse.wst.sse.ui.internal.text,
+ org.eclipse.wst.sse.ui.internal.ui,
+ org.eclipse.wst.sse.ui.internal.util,
+ org.eclipse.wst.sse.ui.internal.view.events
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.search,
+ org.eclipse.swt,
+ org.eclipse.jface,
+ org.eclipse.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.workbench,
+ org.eclipse.ui.views,
+ org.eclipse.wst.sse.core,
+ org.eclipse.core.filebuffers,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.wst.validation
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.sse.ui/build.properties b/bundles/org.eclipse.wst.sse.ui/build.properties
index 13ecae0..2bd6af7 100644
--- a/bundles/org.eclipse.wst.sse.ui/build.properties
+++ b/bundles/org.eclipse.wst.sse.ui/build.properties
@@ -16,7 +16,8 @@
                data/,\
                icons/,\
                jspdebug.properties,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 src.includes = toc.xml,\
                testToc.xml,\
                smoke/,\
diff --git a/bundles/org.eclipse.wst.sse.ui/plugin.xml b/bundles/org.eclipse.wst.sse.ui/plugin.xml
index e6aa7a2..4e8302c 100644
--- a/bundles/org.eclipse.wst.sse.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.sse.ui/plugin.xml
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.sse.ui"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.sse.ui.internal.SSEUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="editor.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.jface.text"/>
-<!-- added for break point support -->
-<!-- -->
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-<!-- added for marker and annotation support -->
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.validation"/>
-   </requires>
-
-
-   <extension-point id="adapterFactoryDescription" name="%Adapter_Factory_Description_Extension.name"/>
+     <extension-point id="adapterFactoryDescription" name="%Adapter_Factory_Description_Extension.name"/>
    <extension-point id="embeddedAdapterFactoryProvider" name="%Embedded_Content_Type_Adapter_Factory_Provider_Extension.name"/>
    <extension-point id="extendedEditorActions" name="%Extended_Editor_Actions_Extension.name"/>
    <extension-point id="dropTargetTransfers" name="%Drop_Target_Transfers_Extension.name"/>
diff --git a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..af11fc1
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
@@ -0,0 +1,59 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.xml.core; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: xmlmodel.jar
+Bundle-Activator: org.eclipse.wst.xml.core.internal.XMLCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: .,
+ org.eclipse.wst.xml.core.internal,
+ org.eclipse.wst.xml.core.internal.cleanup,
+ org.eclipse.wst.xml.core.internal.commentelement,
+ org.eclipse.wst.xml.core.internal.commentelement.impl,
+ org.eclipse.wst.xml.core.internal.commentelement.util,
+ org.eclipse.wst.xml.core.internal.contentmodel,
+ org.eclipse.wst.xml.core.internal.contentmodel.annotation,
+ org.eclipse.wst.xml.core.internal.contentmodel.basic,
+ org.eclipse.wst.xml.core.internal.contentmodel.factory,
+ org.eclipse.wst.xml.core.internal.contentmodel.internal.annotation,
+ org.eclipse.wst.xml.core.internal.contentmodel.internal.modelqueryimpl,
+ org.eclipse.wst.xml.core.internal.contentmodel.internal.test,
+ org.eclipse.wst.xml.core.internal.contentmodel.internal.util,
+ org.eclipse.wst.xml.core.internal.contentmodel.modelquery,
+ org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension,
+ org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl,
+ org.eclipse.wst.xml.core.internal.contentmodel.util,
+ org.eclipse.wst.xml.core.internal.contenttype,
+ org.eclipse.wst.xml.core.internal.document,
+ org.eclipse.wst.xml.core.internal.encoding,
+ org.eclipse.wst.xml.core.internal.modelhandler,
+ org.eclipse.wst.xml.core.internal.modelquery,
+ org.eclipse.wst.xml.core.internal.parser,
+ org.eclipse.wst.xml.core.internal.parser.regions,
+ org.eclipse.wst.xml.core.internal.preferences,
+ org.eclipse.wst.xml.core.internal.propagate,
+ org.eclipse.wst.xml.core.internal.provisional,
+ org.eclipse.wst.xml.core.internal.provisional.contentmodel,
+ org.eclipse.wst.xml.core.internal.provisional.contenttype,
+ org.eclipse.wst.xml.core.internal.provisional.document,
+ org.eclipse.wst.xml.core.internal.provisional.format,
+ org.eclipse.wst.xml.core.internal.provisional.text,
+ org.eclipse.wst.xml.core.internal.regions,
+ org.eclipse.wst.xml.core.internal.ssemodelquery,
+ org.eclipse.wst.xml.core.internal.tasks,
+ org.eclipse.wst.xml.core.internal.text,
+ org.eclipse.wst.xml.core.internal.text.rules,
+ org.eclipse.wst.xml.core.internal.validate,
+ org.w3c.dom,
+ org.w3c.dom.ranges,
+ org.w3c.dom.traversal
+Require-Bundle: org.apache.xerces;visibility:=reexport,
+ org.eclipse.wst.sse.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.core.filebuffers,
+ org.eclipse.text,
+ org.eclipse.wst.xml.uriresolver
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.xml.core/build.properties b/bundles/org.eclipse.wst.xml.core/build.properties
index 272d0dd..e63fdef 100644
--- a/bundles/org.eclipse.wst.xml.core/build.properties
+++ b/bundles/org.eclipse.wst.xml.core/build.properties
@@ -15,7 +15,8 @@
                xml.jar,\
                .options,\
                extensions.xml,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 src.includes = plugin.xml,\
                plugin.properties,\
                extensions.xml,\
diff --git a/bundles/org.eclipse.wst.xml.core/plugin.xml b/bundles/org.eclipse.wst.xml.core/plugin.xml
index 1f11fce..7b3004b 100644
--- a/bundles/org.eclipse.wst.xml.core/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.core/plugin.xml
@@ -1,40 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.xml.core"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.xml.core.internal.XMLCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="xmlmodel.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <!-- we put xerces first on the pre-req path as a 
-      general convention that anyone using Eclipse class loader
-      will get the various XML/DOM classes in the same order, 
-      1. Platform, 2. Prereqs, 3. Self. 
-      we export the xerces classes, since
-      1. it *is* part of our plugin's interface 
-      to the rest of the world, and as such
-      2. There will be a "fast fail" error if someone is 
-      independently loading a conflicting version. 
-      -->
-      <import plugin="org.apache.xerces" export="true"/>
-      
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.wst.xml.uriresolver"/>
-   </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.wst.sse.core.modelHandler">
       <modelHandler
             default="true"
diff --git a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..29da20b
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,54 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: xmleditor.jar
+Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.xml.ui.internal,
+ org.eclipse.wst.xml.ui.internal.actions,
+ org.eclipse.wst.xml.ui.internal.autoedit,
+ org.eclipse.wst.xml.ui.internal.contentassist,
+ org.eclipse.wst.xml.ui.internal.contentoutline,
+ org.eclipse.wst.xml.ui.internal.correction,
+ org.eclipse.wst.xml.ui.internal.dialogs,
+ org.eclipse.wst.xml.ui.internal.dnd,
+ org.eclipse.wst.xml.ui.internal.doubleclick,
+ org.eclipse.wst.xml.ui.internal.editor,
+ org.eclipse.wst.xml.ui.internal.hyperlink,
+ org.eclipse.wst.xml.ui.internal.nsedit,
+ org.eclipse.wst.xml.ui.internal.preferences,
+ org.eclipse.wst.xml.ui.internal.projection,
+ org.eclipse.wst.xml.ui.internal.properties,
+ org.eclipse.wst.xml.ui.internal.provisional,
+ org.eclipse.wst.xml.ui.internal.registry,
+ org.eclipse.wst.xml.ui.internal.search,
+ org.eclipse.wst.xml.ui.internal.style,
+ org.eclipse.wst.xml.ui.internal.tabletree,
+ org.eclipse.wst.xml.ui.internal.taginfo,
+ org.eclipse.wst.xml.ui.internal.templates,
+ org.eclipse.wst.xml.ui.internal.text,
+ org.eclipse.wst.xml.ui.internal.util,
+ org.eclipse.wst.xml.ui.internal.validation,
+ org.eclipse.wst.xml.ui.internal.views.contentoutline,
+ org.eclipse.wst.xml.ui.internal.views.properties,
+ org.eclipse.wst.xml.ui.internal.wizards,
+ org.eclipse.wst.xml.ui.internal.wizards.icons
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.sse.core,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.wst.common.uriresolver,
+ org.eclipse.wst.xml.uriresolver,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.common.ui,
+ org.eclipse.wst.validation
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.xml.ui/build.properties b/bundles/org.eclipse.wst.xml.ui/build.properties
index 65bae85..81c1a4f 100644
--- a/bundles/org.eclipse.wst.xml.ui/build.properties
+++ b/bundles/org.eclipse.wst.xml.ui/build.properties
@@ -16,7 +16,8 @@
                plugin.properties,\
                templates/,\
                xmleditor.jar,\
-               examples/
+               examples/,\
+               META-INF/
 source.xmleditor.jar = src/,\
                        src-multipage/,\
                        src-wizards/
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 552047e..578b7d1 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -1,37 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.xml.ui"
-   name="%pluginName"
-   version="1.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.wst.xml.ui.internal.XMLUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="xmleditor.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.common.uriresolver"/>
-      <import plugin="org.eclipse.wst.xml.uriresolver"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.common.ui"/>
-      <import plugin="org.eclipse.wst.validation"/>
-
-   </requires>
-
-   <extension
+     <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%XML_Source_Page_Editor.name"
diff --git a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cf2e8c6
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,64 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %_UI_PLUGIN_NAME
+Bundle-SymbolicName: org.eclipse.wst.xsd.ui; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: xsdeditor.jar
+Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.xsd.ui.internal,
+ org.eclipse.wst.xsd.ui.internal.actions,
+ org.eclipse.wst.xsd.ui.internal.commands,
+ org.eclipse.wst.xsd.ui.internal.dialogs.types.common,
+ org.eclipse.wst.xsd.ui.internal.dialogs.types.xml,
+ org.eclipse.wst.xsd.ui.internal.dialogs.types.xsd,
+ org.eclipse.wst.xsd.ui.internal.dnd,
+ org.eclipse.wst.xsd.ui.internal.gef.util.editparts,
+ org.eclipse.wst.xsd.ui.internal.gef.util.figures,
+ org.eclipse.wst.xsd.ui.internal.graph,
+ org.eclipse.wst.xsd.ui.internal.graph.editparts,
+ org.eclipse.wst.xsd.ui.internal.graph.editpolicies,
+ org.eclipse.wst.xsd.ui.internal.graph.figures,
+ org.eclipse.wst.xsd.ui.internal.graph.model,
+ org.eclipse.wst.xsd.ui.internal.icons,
+ org.eclipse.wst.xsd.ui.internal.preferences,
+ org.eclipse.wst.xsd.ui.internal.properties,
+ org.eclipse.wst.xsd.ui.internal.properties.section,
+ org.eclipse.wst.xsd.ui.internal.provider,
+ org.eclipse.wst.xsd.ui.internal.refactor,
+ org.eclipse.wst.xsd.ui.internal.refactor.actions,
+ org.eclipse.wst.xsd.ui.internal.refactor.delete,
+ org.eclipse.wst.xsd.ui.internal.refactor.rename,
+ org.eclipse.wst.xsd.ui.internal.refactor.structure,
+ org.eclipse.wst.xsd.ui.internal.text,
+ org.eclipse.wst.xsd.ui.internal.util,
+ org.eclipse.wst.xsd.ui.internal.validation,
+ org.eclipse.wst.xsd.ui.internal.widgets,
+ org.eclipse.wst.xsd.ui.internal.wizards
+Require-Bundle: org.eclipse.core.runtime.compatibility,
+ org.eclipse.wst.xml.uriresolver,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.wst.common.ui,
+ org.eclipse.jface.text,
+ org.eclipse.xsd,
+ org.eclipse.gef,
+ org.eclipse.jface,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui,
+ org.eclipse.ui.views,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.wst.common.ui.properties,
+ org.eclipse.xsd.edit,
+ org.eclipse.emf.edit,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.wst.validation,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring
+Eclipse-AutoStart: true
+Plugin-Class: org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin
diff --git a/bundles/org.eclipse.wst.xsd.ui/build.properties b/bundles/org.eclipse.wst.xsd.ui/build.properties
index bb73afb..30b20e4 100644
--- a/bundles/org.eclipse.wst.xsd.ui/build.properties
+++ b/bundles/org.eclipse.wst.xsd.ui/build.properties
@@ -16,7 +16,8 @@
                doc/,\
                plugin.properties,\
                samples/,\
-               w3c/
+               w3c/,\
+               META-INF/
 src.includes = w3c/,\
                samples/,\
                plugin.xml,\
diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.xml b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
index d8f384d..565054d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
@@ -1,49 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.xsd.ui"
-   name="%_UI_PLUGIN_NAME"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin">
+<plugin>
 
-   <runtime>
-      <library name="xsdeditor.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      
-      <import plugin="org.eclipse.wst.xml.uriresolver"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.xml.ui"/>
-      <import plugin="org.eclipse.wst.common.ui"/>
-      
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.xsd"/>
-      <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.wst.common.ui.properties"/>
-      <import plugin="org.eclipse.xsd.edit"/>
-      <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="org.eclipse.emf.edit.ui"/> 
-      <import plugin="org.eclipse.wst.validation"/>
-      
-      <import plugin="org.eclipse.ltk.core.refactoring" />
-	  <import plugin="org.eclipse.ltk.ui.refactoring" />
-    </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%_UI_EDITOR_NAME"