diff --git a/bundles/org.eclipse.wst.wsdl.ui/plugin.xml b/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
index e007d12..89fee42 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin                     
-   id="org.eclipse.wst.wsdl.editor"
+   id="org.eclipse.wst.wsdl.ui"
    name="%_UI_PLUGIN_NAME"
    version="1.0.0"
    provider-name = "Eclipse.org"
-   class="org.eclipse.wst.wsdl.editor.internal.WSDLEditorPlugin">
+   class="org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin">
 
    <runtime>
       <library name="wsdleditor.jar">
@@ -50,9 +50,9 @@
             default="true"
             icon="icons/wsdl_file_obj.gif"
             extensions="wsdl"           
-            class="org.eclipse.wst.wsdl.editor.internal.WSDLEditor"
-            contributorClass="org.eclipse.wst.wsdl.editor.internal.actions.WSDLActionBarContributor"
-            id="org.eclipse.wst.wsdl.editor.internal.WSDLEditor">
+            class="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"
+            contributorClass="org.eclipse.wst.wsdl.ui.internal.actions.WSDLActionBarContributor"
+            id="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
       </editor>
    </extension>    
 
@@ -69,78 +69,78 @@
         
   <extension-point id="detailsViewerProviders" name="Details Viewer Providers"/>    
            
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityItemTreeProviders">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
       <extensibilityItemTreeProvider
-        id="org.eclipse.wst.wsdl.editor.internal.extensibilityItemTreeProviders.http"
+        id="org.eclipse.wst.wsdl.ui.internal.extensibilityItemTreeProviders.http"
         namespace="http://schemas.xmlsoap.org/wsdl/http/"
-        labelProviderClass="org.eclipse.wst.wsdl.editor.internal.outline.HTTPLabelProvider">         
+        labelProviderClass="org.eclipse.wst.wsdl.ui.internal.outline.HTTPLabelProvider">         
       </extensibilityItemTreeProvider>
    </extension>
          
 
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityItemTreeProviders">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
       <extensibilityItemTreeProvider
-        id="org.eclipse.wst.wsdl.editor.extensibilityItemTreeProviders.soap"
+        id="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders.soap"
         namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-        labelProviderClass="org.eclipse.wst.wsdl.editor.internal.outline.SOAPLabelProvider">         
+        labelProviderClass="org.eclipse.wst.wsdl.ui.internal.outline.SOAPLabelProvider">         
       </extensibilityItemTreeProvider>
    </extension>
                
 
-   <extension point = "org.eclipse.wst.wsdl.editor.contentGenerators">
+   <extension point = "org.eclipse.wst.wsdl.ui.contentGenerators">
       <contentGenerator
         name="SOAP"
         namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-        contentGeneratorClass="org.eclipse.wst.wsdl.editor.internal.contentgenerator.SoapContentGenerator"
-        portOptionsPageClass="org.eclipse.wst.wsdl.editor.internal.contentgenerator.ui.SoapPortOptionsPage"
-        bindingOptionsPageClass="org.eclipse.wst.wsdl.editor.internal.contentgenerator.ui.SoapBindingOptionsPage">
+        contentGeneratorClass="org.eclipse.wst.wsdl.ui.internal.contentgenerator.SoapContentGenerator"
+        portOptionsPageClass="org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapPortOptionsPage"
+        bindingOptionsPageClass="org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage">
       </contentGenerator>
    </extension>
                
 
-   <extension point = "org.eclipse.wst.wsdl.editor.contentGenerators">
+   <extension point = "org.eclipse.wst.wsdl.ui.contentGenerators">
       <contentGenerator
         name="HTTP"
         namespace="http://schemas.xmlsoap.org/wsdl/http/"
-        contentGeneratorClass="org.eclipse.wst.wsdl.editor.internal.contentgenerator.HttpContentGenerator"
-        portOptionsPageClass="org.eclipse.wst.wsdl.editor.internal.contentgenerator.ui.HttpPortOptionsPage"
-        bindingOptionsPageClass="org.eclipse.wst.wsdl.editor.internal.contentgenerator.ui.HttpBindingOptionsPage">
+        contentGeneratorClass="org.eclipse.wst.wsdl.ui.internal.contentgenerator.HttpContentGenerator"
+        portOptionsPageClass="org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.HttpPortOptionsPage"
+        bindingOptionsPageClass="org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.HttpBindingOptionsPage">
       </contentGenerator>
    </extension>
 
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityElementFilter">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
       <extensibilityElementFilter
         namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-        class="org.eclipse.wst.wsdl.editor.internal.filter.SoapExtensiblityElementFilter">
+        class="org.eclipse.wst.wsdl.ui.internal.filter.SoapExtensiblityElementFilter">
       </extensibilityElementFilter>
    </extension>
    
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityElementFilter">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
       <extensibilityElementFilter
         namespace="http://schemas.xmlsoap.org/wsdl/http/"
-        class="org.eclipse.wst.wsdl.editor.internal.filter.HttpExtensiblityElementFilter">
+        class="org.eclipse.wst.wsdl.ui.internal.filter.HttpExtensiblityElementFilter">
       </extensibilityElementFilter>
    </extension>   
    
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityElementFilter">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
       <extensibilityElementFilter
         namespace="http://schemas.xmlsoap.org/wsdl/mime/"
-        class="org.eclipse.wst.wsdl.editor.internal.filter.MimeExtensiblityElementFilter">
+        class="org.eclipse.wst.wsdl.ui.internal.filter.MimeExtensiblityElementFilter">
       </extensibilityElementFilter>
    </extension>    
    
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityElementFilter">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
       <extensibilityElementFilter
         namespace="http://www.w3.org/2001/XMLSchema"
-        class="org.eclipse.wst.wsdl.editor.internal.filter.XSDExtensiblityElementFilter">
+        class="org.eclipse.wst.wsdl.ui.internal.filter.XSDExtensiblityElementFilter">
       </extensibilityElementFilter>
    </extension>      
    
    <extension point="org.eclipse.ui.newWizards">
      <wizard
-       id="org.eclipse.wst.wsdl.editor"
+       id="org.eclipse.wst.wsdl.ui"
        name="WSDL"
-       class="org.eclipse.wst.wsdl.editor.internal.wizards.NewWSDLWizard"
+       class="org.eclipse.wst.wsdl.ui.internal.wizards.NewWSDLWizard"
        category="org.eclipse.wst.webservice.ui.new"
        icon="icons/wsdl_file_obj.gif">
        <description>%_UI_LABEL_CREATE_NEW_WSDL_FILE</description>
@@ -150,9 +150,9 @@
 
    <extension point="org.eclipse.ui.newWizards">
      <wizard
-       id="org.eclipse.wst.wsdl.editor"
+       id="org.eclipse.wst.wsdl.ui"
        name="WSDL"
-       class="org.eclipse.wst.wsdl.editor.internal.wizards.NewWSDLWizard"
+       class="org.eclipse.wst.wsdl.ui.internal.wizards.NewWSDLWizard"
        category="org.eclipse.wst.XMLCategory"
        icon="icons/wsdl_file_obj.gif">
        <description>%_UI_LABEL_CREATE_NEW_WSDL_FILE</description>
@@ -164,7 +164,7 @@
 <extension point="org.eclipse.ui.editorActions"> 
    <editorContribution 
       id="org.eclipse.ui.articles.action.contribution.editor2" 
-   targetID="org.eclipse.wst.wsdl.editor.internal.WSDLEditor">
+   targetID="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
 
       <menu
          id="WSDLEditor"
@@ -174,23 +174,23 @@
       </menu>
      
       <action
-         id="org.eclipse.wst.wsdl.editor.actions.ReloadDependenciesActionDelegate" 
+         id="org.eclipse.wst.wsdl.ui.actions.ReloadDependenciesActionDelegate" 
          label="%_UI_RELOAD_DEPENDENCIES"
          icon="icons/reloadgrammar.gif" 
          tooltip="Reload Dependencies"
          menubarPath="WSDLEditor/group1"
-         class="org.eclipse.wst.wsdl.editor.internal.actions.ReloadDependenciesActionDelegate"> 
+         class="org.eclipse.wst.wsdl.ui.internal.actions.ReloadDependenciesActionDelegate"> 
       </action>  
          
       <!--
       <action
-         id="org.eclipse.wst.wsdl.editor.internal.actions.ValidateActionDelegate" 
+         id="org.eclipse.wst.wsdl.ui.internal.actions.ValidateActionDelegate" 
          label="%_UI_ACTION_VALIDATE_WSDL_DOCUMENT" 
          icon="icons/validate.gif" 
          tooltip="%_UI_ACTION_VALIDATE_WSDL_DOCUMENT"
          menubarPath="WSDLEditor/group1"
          toolbarPath="%Normal/WSDLEditor"
-         class="org.eclipse.wst.wsdl.editor.internal.actions.ValidateActionDelegate"> 
+         class="org.eclipse.wst.wsdl.ui.internal.actions.ValidateActionDelegate"> 
       </action>      
       -->
                  
@@ -202,19 +202,19 @@
       <page
             name="%_UI_WSDL_LABEL"
             category="org.eclipse.wst.webservice.ui.preferences.name"
-            class="org.eclipse.wst.wsdl.editor.internal.util.WSDLPreferencePage"
-            id="org.eclipse.wst.wsdl.editor.internal.util.WSDLPreferencePage">
+            class="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage"
+            id="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage">
       </page>
    </extension>
    <extension
          point="org.eclipse.wst.sse.ui.extendedconfiguration">
       <preferencepages
-            preferenceids="org.eclipse.wst.sse.ui.preferences/org.eclipse.wst.wsdl.editor.internal.util.WSDLPreferencePage"
-            target="org.eclipse.wst.wsdl.editor.internal.WSDLEditor.source" />
+            preferenceids="org.eclipse.wst.sse.ui.preferences/org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage"
+            target="org.eclipse.wst.wsdl.ui.internal.WSDLEditor.source" />
 <!--
       <propertysheetconfiguration
-            class="org.eclipse.wst.wsdl.editor.internal.properties.WSDLPropertySheetConfiguration"
-            target="org.eclipse.wst.wsdl.editor.internal.WSDLTextEditor">
+            class="org.eclipse.wst.wsdl.ui.internal.properties.WSDLPropertySheetConfiguration"
+            target="org.eclipse.wst.wsdl.ui.internal.WSDLTextEditor">
       </propertysheetconfiguration>
 -->
    </extension>
@@ -222,10 +222,10 @@
    <extension
          point="org.eclipse.wst.common.ui.properties.propertyContributor">
       <propertyContributor
-            typeMapper="org.eclipse.wst.wsdl.editor.internal.properties.section.WSDLTypeMapper"
-            contributorId="org.eclipse.wst.wsdl.editor.internal.WSDLTextEditor"
-            sectionDescriptorProvider="org.eclipse.wst.wsdl.editor.internal.properties.section.WSDLSectionDescriptorProvider"
-            labelProvider="org.eclipse.wst.wsdl.editor.internal.properties.section.WSDLLabelProvider">
+            typeMapper="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTypeMapper"
+            contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLTextEditor"
+            sectionDescriptorProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLSectionDescriptorProvider"
+            labelProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLLabelProvider">
          <propertyCategory
                category="general">
          </propertyCategory>
@@ -252,7 +252,7 @@
    <extension
          point="org.eclipse.wst.common.ui.properties.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.wst.wsdl.editor.internal.WSDLTextEditor">
+            contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLTextEditor">
          <propertyTab
                label="%_UI_LABEL_GENERAL"
                category="general"
@@ -292,15 +292,15 @@
       </propertyTabs>
    </extension>
 
-  <extension point="org.eclipse.wst.wsdl.editor.internalEditorExtensions">
-     <internalEditorExtension class="org.eclipse.wst.wsdl.editor.internal.xsd.XSDExtension"/>
+  <extension point="org.eclipse.wst.wsdl.ui.internalEditorExtensions">
+     <internalEditorExtension class="org.eclipse.wst.wsdl.ui.internal.xsd.XSDExtension"/>
   </extension>  
 
-   <extension point = "org.eclipse.wst.wsdl.editor.extensibilityItemTreeProviders">
+   <extension point = "org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
       <extensibilityItemTreeProvider
-        id="org.eclipse.wst.wsdl.editor.extensibilityItemTreeProviders.xsd"
+        id="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders.xsd"
         namespace="http://www.w3.org/2001/XMLSchema"            
-        labelProviderClass="org.eclipse.wst.wsdl.editor.internal.xsd.XSDLabelProvider">
+        labelProviderClass="org.eclipse.wst.wsdl.ui.internal.xsd.XSDLabelProvider">
       </extensibilityItemTreeProvider>
    </extension>