--- a/org.symbian.tools.wrttools/plugin.xml	Wed Jul 21 11:26:43 2010 -0700
+++ b/org.symbian.tools.wrttools/plugin.xml	Wed Jul 28 09:27:51 2010 -0700
@@ -315,12 +315,6 @@
     </command>
     <command
           categoryId="org.symbian.tools.wrttools.commands.maincategory"
-          description="Packages an application for distribution or deployment"
-          id="org.symbian.tools.wrttools.commands.package"
-          name="Package Application">
-    </command>
-    <command
-          categoryId="org.symbian.tools.wrttools.commands.maincategory"
           defaultHandler="org.symbian.tools.wrttools.handlers.AddJSLibrary"
           description="Adds JavaScript libraries to Mobile Web projects"
           id="org.symbian.tools.wrttools.addlibrary"
@@ -338,11 +332,6 @@
                 icon="icons/deploy_widget.gif"
                 id="org.symbian.tools.wrttools.toolbars.deploy">
           </command>
-          <command
-                commandId="org.symbian.tools.wrttools.commands.package"
-                icon="icons/package_widget.gif"
-                id="org.symbian.tools.wrttools.toolbars.package">
-          </command>
        </toolbar>
     </menuContribution>
     <menuContribution
@@ -365,11 +354,6 @@
              icon="icons/deploy_widget.gif"
              id="org.symbian.tools.wrttools.toolbars.deploy">
        </command>
-       <command
-             commandId="org.symbian.tools.wrttools.commands.package"
-             icon="icons/package_widget.gif"
-             id="org.symbian.tools.wrttools.toolbars.package">
-       </command>
        <separator
              name="org.symbian.tools.wrttools.endwrt"
              visible="true">
@@ -400,25 +384,6 @@
              </and>
           </visibleWhen>
        </command>
-       <command
-             commandId="org.symbian.tools.wrttools.commands.package"
-             icon="icons/package_widget.gif"
-             id="org.symbian.tools.wrttools.toolbars.package">
-          <visibleWhen>
-             <and>
-                <iterate
-                      ifEmpty="false"
-                      operator="and">
-                   <adapt
-                         type="org.eclipse.core.resources.IProject">
-                   </adapt>
-                </iterate>
-                <count
-                      value="1">
-                </count>
-             </and>
-          </visibleWhen>
-       </command>
        <separator
              name="org.symbian.tools.wrttools.endwrt"
              visible="true">
@@ -455,27 +420,6 @@
     </menuContribution>
  </extension>
  <extension
-       point="org.eclipse.ui.handlers">
-    <handler
-          class="org.symbian.tools.wrttools.handlers.DeployHandler"
-          commandId="org.symbian.tools.wrttools.commands.deploy">
-       <enabledWhen>
-          <reference
-                definitionId="org.symbian.tools.wrttools.symbianproject">
-          </reference>
-       </enabledWhen>
-    </handler>
-    <handler
-          class="org.symbian.tools.wrttools.handlers.PackageApplicationHandler"
-          commandId="org.symbian.tools.wrttools.commands.package">
-       <enabledWhen>
-          <reference
-                definitionId="org.symbian.tools.wrttools.symbianproject">
-          </reference>
-       </enabledWhen>
-    </handler>
- </extension>
- <extension
        point="org.eclipse.core.expressions.definitions">
     <definition
           id="org.symbian.tools.wrttools.symbianproject">
@@ -852,5 +796,35 @@
           </content>
        </item>
     </category>
- </extension>
+ </extension>
+ <extension
+       point="org.symbian.tools.mtw.core.projectProvider">
+    <projectProvider
+          class="org.symbian.tools.wrttools.core.project.WRTIDEProjectProvider">
+       <enablement>
+          <adapt
+                type="org.eclipse.core.resources.IProject">
+             <test
+                   property="org.eclipse.core.resources.projectNature"
+                   value="org.symbian.tools.wrttools.WidgetProjectNature">
+             </test>
+          </adapt>
+       </enablement>
+    </projectProvider>
+ </extension>
+   <extension
+        point="org.symbian.tools.mtw.core.runtimes">
+     <runtime
+           id="org.symbian.wrt11"
+           name="Symbian WRT 1.1">
+     </runtime>
+  </extension>
+   <extension
+         point="org.symbian.tools.mtw.core.packagers">
+      <packager
+            class="org.symbian.tools.wrttools.core.packager.WrtPackager"
+            targetRuntime="org.symbian.wrt11">
+      </packager>
+   </extension>
+ 
 </plugin>