# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1271773220 -3600
# Node ID e7654a759056e36f100cec499fd2776498ade67b
# Parent  0f61ddd27c1cbb7077d8f9d130c007f5b37e1d4b
Fixes for missing components

diff -r 0f61ddd27c1c -r e7654a759056 symbian4/adaptation/stubs/package_definition.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -76,39 +76,104 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
   <systemModel>
     <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-      <block name="stubs" level="high" long-name="Stubs" levels="stub">
-        <collection name="s60_stubs" level="stub">
-          <component name="audiostubs" long-name="Audio Stubs">
-            <unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
+      <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
+        <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+          <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
+            <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
           </component>
-          <component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
+          <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
+            <unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+          </component>
+        </collection>
+        <collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
+          <component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
             <unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
           </component>
-          <component name="drm_stubs" long-name="DRM Stubs">
+        </collection>
+        <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
+          <component name="drm_stubs_build" long-name="DRM Stubs Build">
             <unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
           </component>
-          <component name="ocrsrv_stub" long-name="OCR Services Stub">
+        </collection>
+        <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
+          <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
             <unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
           </component>
-          <component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
+        </collection>
+        <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+          <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
             <unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
           </component>
-          <component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
+        </collection>
+        <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
+          <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
             <unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
           </component>
-          <component name="srsfenginestub" long-name="SRSF Engine Stub">
+        </collection>
+        <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
+          <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
             <unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
           </component>
-          <component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
+        </collection>
+        <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
+          <component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
             <unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
           </component>
-          <component name="systemswstubs" long-name="System Software Stubs">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/>
+        </collection>
+        <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+          <component name="ddcaccessstub" long-name="DDC Access Stub">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+          </component>
+          <component name="tvoutconfig" long-name="TV Out Config">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+          </component>
+          <component name="accessorypolicyreference" long-name="Accessory Policy Reference">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+          </component>
+          <component name="asyreference" long-name="ASY Reference" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+          </component>
+          <component name="examplecommonisc" long-name="Example Common ISC">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+          </component>
+          <component name="exampledsy" long-name="Example DSY">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+          </component>
+          <component name="featuremanagerstub" long-name="Feature Manager Stub">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
           </component>
-          <component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
+          <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+          </component>
+          <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+          </component>
+          <component name="sensorchannelsreference" long-name="Sensor Channels Reference">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+          </component>
+          <component name="ssyreference" long-name="SSY Reference" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+          </component>
+          <component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+          </component>
+          <component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+          </component>
+          <component name="tvoutbehaviour" long-name="TV Out Behaviour">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+          </component>
+          <component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
+            <unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+          </component>
+        </collection>
+        <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
+          <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
             <unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
           </component>
-          <component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
+        </collection>
+        <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
+          <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
             <unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
           </component>
         </collection>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/adaptation/stubs/package_definition_3.0.xml
--- a/symbian4/adaptation/stubs/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -1,38 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="stubs" name="Stubs" levels="stub">
-    <collection id="s60_stubs" level="stub">
-     <component id="audiostubs" name="Audio Stubs">
-      <unit bldFile="audiostubs/group"/>
+  <package id="stubs" name="Stubs" levels="adaptation plugin mid engine">
+    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
+     <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
+      <unit bldFile="audiostubs/devsoundextensions_stubs/group"/>
      </component>
-     <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
+     <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
+      <unit bldFile="audiostubs/fmradiotunercontrolstub/group"/>
+     </component>
+    </collection>
+   <collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
+     <component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
       <unit bldFile="btaudioadaptation_stub/group"/>
      </component>
-     <component id="drm_stubs" name="DRM Stubs">
+    </collection>
+   <collection id="drm_stubs" name="DRM Stubs" level="plugin">
+     <component id="drm_stubs_build" name="DRM Stubs Build">
       <unit bldFile="drm_stubs/group"/>
      </component>
-     <component id="ocrsrv_stub" name="OCR Services Stub">
+    </collection>
+    <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
+     <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
       <unit bldFile="ocrsrv_stub/group"/>
      </component>
-     <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
+    </collection>
+    <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
       <unit bldFile="omasuplasnconverterstubimpl/group"/>
      </component>
-     <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
+    </collection>
+    <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
+     <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
       <unit bldFile="posmsgpluginreferenceimpl/group"/>
      </component>
-     <component id="srsfenginestub" name="SRSF Engine Stub">
-      <unit bldFile="srsfenginestub/group"/>
+    </collection>
+    <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
+     <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
+	    <unit bldFile="srsfenginestub/group"/>
      </component>
-     <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
+    </collection>
+    <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
+     <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
       <unit bldFile="power_save_display_mode_stub/group"/>
      </component>
-     <component id="systemswstubs" name="System Software Stubs">
-      <unit bldFile="systemswstubs/group"/>
+    </collection>
+    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+     <component id="ddcaccessstub" name="DDC Access Stub">
+      <unit bldFile="systemswstubs/ddcaccessstub/group"/>
+     </component>
+     <component id="tvoutconfig" name="TV Out Config">
+      <unit bldFile="systemswstubs/TVOutConfig/group" filter="oem_build"/>
+     </component>
+     <component id="accessorypolicyreference" name="Accessory Policy Reference">
+ 	  <meta rel="config">
+         <defined condition="__ACCESSORY_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+     </component>
+     <component id="asyreference" name="ASY Reference" class="plugin">
+ 	  <meta rel="config">
+         <defined condition="__ACCESSORY_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/asyreference/group" filter="oem_build"/>
+     </component>
+     <component id="examplecommonisc" name="Example Common ISC">
+      <unit bldFile="systemswstubs/examplecommonisc/group" filter="oem_build"/>
+     </component>
+     <component id="exampledsy" name="Example DSY">
+ 	  <meta rel="config">
+         <defined condition="RD_STARTUP_CHANGE"/>
+       </meta>
+      <unit bldFile="systemswstubs/exampledsy/group" filter="oem_build"/>
+     </component>
+     <component id="featuremanagerstub" name="Feature Manager Stub">
+      <unit bldFile="systemswstubs/featuremanagerstub/group" filter="oem_build"/>
      </component>
-     <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
+     <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
+      <unit bldFile="systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+     </component>
+     <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
+      <unit bldFile="systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+     </component>
+     <component id="sensorchannelsreference" name="Sensor Channels Reference">
+      <unit bldFile="systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+     </component>
+     <component id="ssyreference" name="SSY Reference" class="plugin">
+ 	  <meta rel="config">
+         <defined condition="RD_SENSOR_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/ssyreference/group" filter="oem_build"/>
+     </component>
+     <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
+      <unit bldFile="systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+     </component>
+     <component id="tiltcompensationstub" name="Tilt Compensation Stub">
+      <unit bldFile="systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+     </component>
+     <component id="tvoutbehaviour" name="TV Out Behaviour">
+      <unit bldFile="systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+     </component>
+     <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
+      <unit bldFile="systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+     </component>
+    </collection>
+    <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
+ 	  <meta rel="config">
+         <defined condition="RD_TACTILE_FEEDBACK"/>
+       </meta>
+     <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
       <unit bldFile="tactileclickplugin_stub/group"/>
      </component>
-     <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
+    </collection>
+    <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
+     <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
       <unit bldFile="wlanhwinit_stub/group"/>
      </component>
     </collection>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/helps/package_definition.xml
--- a/symbian4/app/helps/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -77,10 +77,10 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-        <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="if">
-          <!-- this is really a component. Should move it down a directory -->
-          <component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
-            <unit bldFile="/sf/app/helps/csxhelp/group"/>
+        <collection name="userguide" long-name="User Guide" level="if">
+          <!-- collection is really a component. Move down a directory -->
+          <component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
+            <unit bldFile="/sf/app/helps/userguide"/>
           </component>
         </collection>
         <collection name="symhelp" long-name="Symbian Help" level="eng">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/helps/package_definition_3.0.xml
--- a/symbian4/app/helps/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/helps/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
   <package id="helps" name="Help Apps" levels="eng tools if ui">
-    <collection id="csxhelp" name="Context Sensitive Extended Help" level="if">
-    	<!-- this is really a component. Should move it down a directory -->
-      <component id="csxhelp_build" filter="s60" name="Context Sensitive Extended Help Build">
-        <unit bldFile="csxhelp/group"/>
-      </component>
+   <collection id="userguide" name="User Guide" level="if">
+	<!-- collection is really a component. Move down a directory -->
+    <component id="userguide_build" name="User Guide Build"  filter="s60" introduced="^4">
+      <unit bldFile="userguide" qt:proFile="Userguide.pro"/>
+     </component>
     </collection>
     <collection id="symhelp" name="Symbian Help" level="eng">
       <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/messaging/package_definition.xml
--- a/symbian4/app/messaging/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -172,28 +172,28 @@
         <collection name="messagingapp" long-name="Messaging Application" level="app">
           <component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
             <!-- this should be broken up into the individual other components -->
-            <unit bldFile="/sf/app/messaging/mmsengine"/>
+            <unit bldFile="/sf/app/messaging/messagingapp"/>
           </component>
           <component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-            <unit bldFile="/sf/app/messaging/msgutils"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgutils"/>
           </component>
           <component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-            <unit bldFile="/sf/app/messaging/msgappfw"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgappfw"/>
           </component>
           <component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-            <unit bldFile="/sf/app/messaging/msgsettings"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgsettings"/>
           </component>
           <component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-            <unit bldFile="/sf/app/messaging/msgnotifications"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgnotifications"/>
           </component>
           <component name="smartmessaging" filter="s60" long-name="Smart Messaging">
             <unit bldFile="/sf/app/messaging/messagingapp/smartmessaging"/>
           </component>
           <component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-            <unit bldFile="/sf/app/messaging/shareui"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/shareui"/>
           </component>
           <component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-            <unit bldFile="/sf/app/messaging/msgui"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgui"/>
           </component>
         </collection>
         <collection name="email" long-name="Email" level="plugin">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/messaging/package_definition_3.0.xml
--- a/symbian4/app/messaging/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/messaging/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -67,7 +67,7 @@
   <collection id="messagingappbase" name="Messaging App Base" level="base">
    <component id="messagingappbase_build" filter="s60" name="Messaging App Base Build"  introduced="^4">
 	<!-- break this up into the below components -->
-    <unit bldFile="messagingappbase" qt:proFile="messagingappbase/messagingappbase.pro" qt:qmakeArgs="-r"/>
+    <unit bldFile="messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="msgmedia" filter="s60" name="Message Media">
       <unit base="messagingappbase/msgmedia"/>
@@ -127,34 +127,34 @@
    </component>
    <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
     <!-- this should be broken up into the individual other components -->
-    <unit bldFile="mmsengine" qt:proFile="mmsengine/mmsengine.pro" qt:qmakeArgs="-r"/>
+    <unit bldFile="mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
    </component>
   </collection>
   <collection id="messagingapp" name="Messaging Application" level="app">
    <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
     <!-- this should be broken up into the individual other components -->
-    <unit bldFile="mmsengine" qt:proFile="mmsengine/mmsengine.pro" qt:qmakeArgs="-r"/>
+    <unit bldFile="messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
    </component>
      <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
-      <unit bldFile="msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
      </component>
      <component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
-      <unit bldFile="msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
      </component>
      <component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
-      <unit bldFile="msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
      </component>
      <component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
-      <unit bldFile="msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
      </component>
      <component id="smartmessaging" filter="s60" name="Smart Messaging">
       <unit bldFile="messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
      </component>
      <component id="shareui" filter="s60" name="Shared UI" introduced="^4">
-      <unit bldFile="shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
      </component>
      <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
-      <unit bldFile="msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
      </component>
   </collection>
   <collection id="email" name="Email" level="plugin">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -214,6 +214,9 @@
           <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
             <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
           </component>
+          <component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+          </component>
         </collection>
         <collection name="alarmui" long-name="Alarm UI" level="app">
           <!-- collection is really a component, should move down a directory -->
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/organizer/package_definition_3.0.xml
--- a/symbian4/app/organizer/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/organizer/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -151,6 +151,9 @@
    <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
     <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
    </component>
+   <component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="pimappsupport/chinesecalendaralg/group" mrp="pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+   </component>
   </collection>
   <collection id="alarmui" name="Alarm UI" level="app">
    <!-- collection is really a component, should move down a directory -->
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -76,6 +76,7 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
+      <!-- pending removal -->
       <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
         <collection name="phoneapp" long-name="Phone Application" level="app">
           <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/photos/package_definition.xml
--- a/symbian4/app/photos/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -122,7 +122,7 @@
         <collection name="photos_info" long-name="Photos Info" level="support">
           <component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
             <!--  split this up into the above components  -->
-            <unit bldFile="/sf/app/photos/photosgallery"/>
+            <unit bldFile="/sf/app/photos/."/>
           </component>
         </collection>
       </block>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/photos/package_definition_3.0.xml
--- a/symbian4/app/photos/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/photos/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -46,7 +46,7 @@
   <collection id="photos_info" name="Photos Info" level="support">
    <component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
     <!--  split this up into the above components  -->
-    <unit bldFile="photosgallery" qt:proFile="photos.pro"/>
+    <unit bldFile="." qt:proFile="photos.pro"/>
    </component>
   </collection>
  </package>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/radio/package_definition.xml
--- a/symbian4/app/radio/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -105,7 +105,7 @@
             <unit bldFile="/sf/app/radio/radioapp/radioapplication"/>
           </component>
           <component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-            <unit bldFile="/sf/app/radio/rom/group"/>
+            <unit bldFile="/sf/app/radio/rom"/>
           </component>
         </collection>
       </block>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/radio/package_definition_3.0.xml
--- a/symbian4/app/radio/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/radio/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -29,7 +29,7 @@
         <unit bldFile="radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
       </component>
       <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
-        <unit bldFile="rom/group"/>
+        <unit bldFile="rom"/>
       </component>
     </collection>
   </package>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -141,9 +141,6 @@
           </component>
         </collection>
         <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-          <component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-            <unit bldFile="/sf/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-          </component>
           <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
             <!-- can only have a single unit. Should #include from a common bld.inf file -->
             <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/app/rndtools/package_definition_3.0.xml
--- a/symbian4/app/rndtools/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/app/rndtools/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -71,9 +71,6 @@
       </component>
     </collection>
     <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-      <component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
-        <unit bldFile="htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-      </component>
       <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
 		<!-- can only have a single unit. Should #include from a common bld.inf file -->
         <unit bldFile="htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/camerasrv/package_definition.xml
--- a/symbian4/mw/camerasrv/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -81,13 +81,6 @@
           <component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
             <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
           </component>
-          <component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-          </component>
-          <component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
-          </component>
           <component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
             <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
           </component>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/camerasrv/package_definition_3.0.xml
--- a/symbian4/mw/camerasrv/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -6,15 +6,6 @@
     <meta rel="Api" href="camerasrv_plat/media_recorder_sink_api/media_recorder_sink_api.metaxml"/>
     <unit bldFile="camerasrv_plat/media_recorder_sink_api/group"/>
    </component>
-   <component id="cae_extentension_api" name="CAE Extension API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/cae_extentension_api/cae_extentension_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/cae_extentension_api/group"/>
-   </component>
-   <component id="camera_application_engine_api" name="Camera Application Engine API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/camera_application_engine_api/camera_application_engine_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
-    <unit bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
-   </component>
    <component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
     <meta rel="Api" href="camerasrv_plat/custom_onboard_camera_api/custom_onboard_camera_api.metaxml"/>
     <unit bldFile="camerasrv_plat/custom_onboard_camera_api/group"/>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/gsprofilesrv/package_definition.xml
--- a/symbian4/mw/gsprofilesrv/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -133,9 +133,6 @@
           <component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
             <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/profileengine/group"/>
           </component>
-          <component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
-          </component>
         </collection>
       </block>
     </layer>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/gsprofilesrv/package_definition_3.0.xml
--- a/symbian4/mw/gsprofilesrv/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -69,9 +69,6 @@
    <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
     <unit bldFile="profilesservices/profileengine/group"/>
    </component>
-   <component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
-    <unit bldFile="profilesservices/ringingtone3dplugin/group"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -78,22 +78,6 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
         <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-          <component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-          </component>
-          <component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-          </component>
-          <component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-          </component>
-          <component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-          </component>
           <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
@@ -102,118 +86,16 @@
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-          </component>
           <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-          </component>
-          <component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group" filter="test,api_test"/>
-          </component>
           <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
           </component>
-          <component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-          </component>
           <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
           </component>
-          <component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-          </component>
-          <component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-          </component>
-          <component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-          </component>
-          <component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
-          </component>
-          <component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
-          </component>
-          <component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
-          </component>
-        </collection>
-        <collection name="xcfw" long-name="XML Content Framework" level="framework">
-          <!-- collection is really a component, needs to be moved down a directory -->
-          <component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
-            <unit bldFile="/sf/mw/homescreensrv/xcfw/group"/>
-          </component>
-        </collection>
-        <collection name="homescreenpluginsrv" long-name="Home Screen Plugin Service" level="plugin">
-          <component name="hspsdefinitionengine" filter="s60" long-name="HS Plugin Service Definition Engine" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-          </component>
-          <component name="hspsdom" filter="s60" long-name="HS Plugin Service DOM" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-          </component>
-          <component name="hspstools" filter="s60" long-name="HS Server Tools">
-            <!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-          </component>
-          <component name="hspspluginregistry" filter="s60" long-name="HS Plugin Registry" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-          </component>
-          <component name="hspsmanager" filter="s60" long-name="HSPS Manager" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-          </component>
-          <component name="hspsodt" filter="s60" long-name="HSPS Object Description Tree" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-          </component>
-          <component name="hspsresource" filter="s60" long-name="HS Plugin Server Resource" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-          </component>
-          <component name="hspsresult" filter="s60" long-name="HS Plugin Server Result" class="placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-          </component>
-          <component name="homescreen_settings_api" filter="s60" long-name="HS Settings API" class="api placeholder">
-            <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-          </component>
-          <component name="homescreenpluginsrv_build" filter="s60" long-name="HSPS Build">
-            <!-- need to break this up into the self-contained components above and uncomment them -->
-            <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/group"/>
-          </component>
-        </collection>
-        <collection name="idlefw" long-name="Idle Framework" level="framework">
-          <!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-          <component name="idlefw_plugins" filter="s60" long-name="Idle Framework Plugins" plugin="Y" class="placeholder">
-            <!--<unit bldFile="idlefw/plugins/group"/>-->
-          </component>
-          <component name="hslaunch" filter="s60" long-name="Home Screen Launch" class="placeholder">
-            <!--<unit bldFile="idlefw/plugins/group"/>-->
-          </component>
-          <component name="idlefw_build" filter="s60" long-name="Idle Framework Build">
-            <!--split this into components, or separate from the above components and move this down a directory -->
-            <unit bldFile="/sf/mw/homescreensrv/idlefw/group"/>
-          </component>
-        </collection>
-        <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-          <component name="menusatinterface" filter="s60" long-name="Menu SAT Interface">
-            <unit bldFile="/sf/mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-          </component>
-          <component name="menucontentsrv_build" filter="s60" long-name="Menu Content Service Build">
-            <!--split this into components, or separate from the above component and move this down a directory -->
-            <unit bldFile="/sf/mw/homescreensrv/menucontentsrv/group"/>
-          </component>
-        </collection>
-        <collection name="backsteppingsrv" long-name="Back Stepping Service" level="server">
-          <!-- collection is really a component, needs to be moved down a directory -->
-          <component name="bsengine" long-name="Back Stepping Engine" filter="s60">
-            <unit bldFile="/sf/mw/homescreensrv/backsteppingsrv/group"/>
-          </component>
         </collection>
         <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
           <component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
@@ -235,28 +117,6 @@
             <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
           </component>
         </collection>
-        <collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
-          <component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
-            <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
-          </component>
-          <component name="ccsrvapi" long-name="Content Control Service API" filter="s60" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
-          </component>
-          <component name="ccclientsession" long-name="Content Control Client Session" filter="s60" introduced="^3">
-            <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
-          </component>
-          <component name="hsccclient" long-name="HS Content Control Client" filter="s60" introduced="^3">
-            <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
-          </component>
-          <component name="hscontentinfo" long-name="Home Screen Content Info" filter="s60" introduced="^3">
-            <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
-          </component>
-          <component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-            <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
-      		If keeping, it need to move down a directory.-->
-            <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/homescreensrv/package_definition_3.0.xml
--- a/symbian4/mw/homescreensrv/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -2,27 +2,6 @@
 <SystemDefinition schema="3.0.0">
  <package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
   <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
-   <component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/ai_content_model_api/ai_content_model_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/ai_content_model_api/group"/>
-   </component>
-   <component id="ai_utilities_api" name="AI Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/ai_utilities_api/ai_utilities_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
-    <unit bldFile="homescreensrv_plat/ai_utilities_api/internal/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="ai_plugin_management_api" name="AI Plug-in Management API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/ai_plugin_management_api/ai_plugin_management_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/ai_plugin_management_api/group"/>
-   </component>
-   <component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/ai_plugin_information_api/ai_plugin_information_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/ai_plugin_information_api/group"/>
-   </component>
-   <component id="ai_variation_api" name="AI Variation API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/ai_variation_api/ai_variation_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/ai_variation_api/group"/>
-   </component>
    <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
     <unit bldFile="homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
@@ -33,134 +12,19 @@
     <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
     <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="menu_model_api" name="Menu Model API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/menu_model_api/menu_model_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/menu_model_api/group"/>
-   </component>
    <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
     <unit bldFile="homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
     <unit bldFile="homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="external_home_screen_api" name="External Home Screen API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/external_home_screen_api/external_home_screen_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/external_home_screen_api/group"/>
-   </component>
-   <component id="menu_content_service_api" name="Menu Content Service API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/menu_content_service_api/menu_content_service_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
-    <unit bldFile="homescreensrv_plat/menu_content_service_api/tsrc/group" filter="test,api_test"/>
-   </component>
    <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
     <unit bldFile="homescreensrv_plat/sapi_contentpublishing/group"/>
    </component>
-   <component id="sapi_backstepping" name="SAPI Backstepping" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/sapi_backstepping/sapi_backstepping.metaxml"/>
-    <unit bldFile="homescreensrv_plat/sapi_backstepping/group"/>
-   </component>
    <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
     <unit bldFile="homescreensrv_plat/sapi_actionhandler/group"/>
    </component>
-   <component id="sapi_homescreenplugin" name="SAPI Homescreen Plugin" class="api" filter="s60">
-    <unit bldFile="homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
-    <unit bldFile="homescreensrv_plat/sapi_homescreenplugin/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="sapi_menucontent" name="SAPI Menu Content" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/sapi_menucontent/sapi_menucontent.metaxml"/>
-    <unit bldFile="homescreensrv_plat/sapi_menucontent/group"/>
-   </component>
-   <component id="xcfw_api" name="XCFW API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/xcfw_api/xcfw_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/xcfw_api/group"/>
-   </component>
-   <component id="idlefw_api" name="Idle Framework API" class="api" filter="s60">
-    <unit bldFile="homescreensrv_plat/idlefw_api/group"/>
-   </component>
-   <component id="hs_widget_publisher_api" name="Home Screen Publishing API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/hs_widget_publisher_api/hs_widget_publisher_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/hs_widget_publisher_api/group"/>
-   </component>
-   <component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
-    <unit bldFile="homescreensrv_plat/hs_settings_api/group"/>
-   </component>
-   <component id="hs_content_control_api" name="HS Content Control API" class="api" filter="s60">
-    <unit bldFile="homescreensrv_plat/hs_content_control_api/group"/>
-   </component>
-  </collection>
-  <collection id="xcfw" name="XML Content Framework" level="framework">
-   <!-- collection is really a component, needs to be moved down a directory -->
-   <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
-    <unit bldFile="xcfw/group"/>
-   </component>
-  </collection>
-  <collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
-   <component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-   </component>
-   <component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-   </component>
-   <component id="hspstools" filter="s60" name="HS Server Tools">
-    <meta rel="config">
-     <defined condition="____HSPS_CFG_LOG_ON____"/>
-    </meta>
-    <!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-   </component>
-   <component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
-    <!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-   </component>
-   <component id="hspsmanager" filter="s60" name="HSPS Manager">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-   </component>
-   <component id="hspsodt" filter="s60" name="HSPS Object Description Tree">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-   </component>
-   <component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-   </component>
-   <component id="hspsresult" filter="s60" name="HS Plugin Server Result">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-   </component>
-   <component id="homescreen_settings_api" filter="s60" name="HS Settings API" class="api">
-    <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-   </component>
-   <component id="homescreenpluginsrv_build" filter="s60" name="HSPS Build">
-    <!-- need to break this up into the self-contained components above and uncomment them -->
-    <unit bldFile="homescreenpluginsrv/group"/>
-   </component>
-  </collection>
-  <collection id="idlefw" name="Idle Framework" level="framework">
-   <meta rel="config">
-    <defined condition="RD_CUSTOMIZABLE_AI"/>
-   </meta>
-   <!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-   <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
-    <!--<unit bldFile="idlefw/plugins/group"/>-->
-   </component>
-   <component id="hslaunch" filter="s60" name="Home Screen Launch">
-    <!--<unit bldFile="idlefw/plugins/group"/>-->
-   </component>
-   <component id="idlefw_build" filter="s60" name="Idle Framework Build">
-    <!--split this into components, or separate from the above components and move this down a directory -->
-    <unit bldFile="idlefw/group"/>
-   </component>
-  </collection>
-  <collection id="menucontentsrv" name="Menu Content Service" level="generic">
-   <component id="menusatinterface" filter="s60" name="Menu SAT Interface">
-    <unit bldFile="menucontentsrv/menusatinterface/group"/>
-   </component>
-   <component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
-    <!--split this into components, or separate from the above component and move this down a directory -->
-    <unit bldFile="menucontentsrv/group"/>
-   </component>
-  </collection>
-  <collection id="backsteppingsrv" name="Back Stepping Service" level="server">
-   <!-- collection is really a component, needs to be moved down a directory -->
-   <component id="bsengine" name="Back Stepping Engine" filter="s60">
-    <unit bldFile="backsteppingsrv/group"/>
-   </component>
   </collection>
   <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
    <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
@@ -185,27 +49,5 @@
     <unit bldFile="contentpublishingsrv/group"/>
    </component>
   </collection>
-  <collection id="contentcontrolsrv" name="Content Control Service" level="server">
-   <component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
-    <unit bldFile="contentcontrolsrv/ccsrv/group"/>
-   </component>
-   <component id="ccsrvapi" name="Content Control Service API" filter="s60" introduced="^3" class="api">
-    <unit bldFile="contentcontrolsrv/ccsrvapi/group"/>
-   </component>
-   <component id="ccclientsession" name="Content Control Client Session" filter="s60" introduced="^3">
-    <unit bldFile="contentcontrolsrv/ccclientsession/group"/>
-   </component>
-   <component id="hsccclient" name="HS Content Control Client" filter="s60" introduced="^3">
-    <unit bldFile="contentcontrolsrv/hsccclient/group"/>
-   </component>
-   <component id="hscontentinfo" name="Home Screen Content Info" filter="s60" introduced="^3">
-    <unit bldFile="contentcontrolsrv/hscontentinfo/group"/>
-   </component>
-   <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
-    <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
-      		If keeping, it need to move down a directory.-->
-    <unit bldFile="contentcontrolsrv/group"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/ipappprotocols/package_definition.xml
--- a/symbian4/mw/ipappprotocols/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -98,9 +98,6 @@
             <!-- Real Time Data Protocol -->
             <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
           </component>
-          <component name="srtp" long-name="Secure RTP" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/srtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-          </component>
           <component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
             <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
           </component>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/ipappprotocols/package_definition_3.0.xml
--- a/symbian4/mw/ipappprotocols/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -24,9 +24,6 @@
         <!-- Real Time Data Protocol -->
         <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
       </component>
-      <component id="srtp" name="Secure RTP" introduced="^4" purpose="optional">
-        <unit bldFile="realtimenetprots/srtp/group" mrp="realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
-      </component>
       <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
         <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
       </component>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/locationsrv/package_definition.xml
--- a/symbian4/mw/locationsrv/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -161,7 +161,7 @@
           <component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
             <unit bldFile="/sf/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
           </component>
-          <component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^4" class="api">
+          <component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
             <unit bldFile="/sf/mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
           </component>
           <component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/locationsrv/package_definition_3.0.xml
--- a/symbian4/mw/locationsrv/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -111,7 +111,7 @@
    <component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
     <unit bldFile="locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
    </component>
-   <component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^4">
+  <component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
       <unit bldFile="locsrv_plat/query_and_notification_api/group"/>
    </component>
    <component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -194,9 +194,6 @@
           <component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
             <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
           </component>
-          <component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
-          </component>
         </collection>
         <collection name="policymanagement" long-name="Policy Management" level="generic">
           <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/remotemgmt/package_definition_3.0.xml
--- a/symbian4/mw/remotemgmt/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -154,9 +154,6 @@
     <meta rel="Api" href="remotemgmt_plat/ds_capability_mgmt_plugin_api/ds_capability_mgmt_plugin_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
    </component>
-   <component id="dm_native_notifier_api" name="DM Native Notifier API" class="api" filter="s60">
-    <unit bldFile="remotemgmt_plat/dm_native_notifier_api/group"/>
-   </component>
   </collection>
   <collection id="policymanagement" name="Policy Management" level="generic">
    <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/vpnclient/package_definition.xml
--- a/symbian4/mw/vpnclient/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -184,9 +184,6 @@
           <component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
             <unit bldFile="/sf/mw/vpnclient/vpnui/vpndialogmanager/group"/>
           </component>
-          <component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
-            <unit bldFile="/sf/mw/vpnclient/vpnui/vpnmanagementui/group"/>
-          </component>
           <component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
             <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolins/group"/>
           </component>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/vpnclient/package_definition_3.0.xml
--- a/symbian4/mw/vpnclient/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -109,9 +109,6 @@
    <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
     <unit bldFile="vpnui/vpndialogmanager/group"/>
    </component>
-   <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
-    <unit bldFile="vpnui/vpnmanagementui/group"/>
-   </component>
    <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
     <unit bldFile="vpnui/vpnpolins/group"/>
    </component>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -119,6 +119,9 @@
           <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
             <unit bldFile="/sf/mw/web/web_plat/download_mgr_client_api_extn/group"/>
           </component>
+          <component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/download_path_plugin_api/group"/>
+          </component>
           <component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
             <unit bldFile="/sf/mw/web/web_plat/feeds_engine_api/group"/>
           </component>
@@ -146,9 +149,6 @@
           <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
             <unit bldFile="/sf/mw/web/web_plat/xml_parser_api/group"/>
           </component>
-          <component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/stmgesturefw_api/group"/>
-          </component>
         </collection>
         <collection name="web_info" long-name="Web Info" level="specific">
           <component name="web_build" filter="s60" long-name="Web Build">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/web/package_definition_3.0.xml
--- a/symbian4/mw/web/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/web/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -56,6 +56,9 @@
     <meta rel="Api" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
     <unit bldFile="web_plat/download_mgr_client_api_extn/group"/>
    </component>
+   <component id="download_path_plugin_api" name="Download Path Plugin API" class="api" filter="s60" introduced="^3">
+    <unit bldFile="web_plat/download_path_plugin_api/group"/>
+   </component>
    <component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
     <meta rel="Api" href="web_plat/feeds_engine_api/feeds_engine_api.metaxml"/>
     <unit bldFile="web_plat/feeds_engine_api/group"/>
@@ -95,10 +98,6 @@
     <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
     <unit bldFile="web_plat/xml_parser_api/group"/>
    </component>
-   <component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
-    <meta rel="Api" href="web_plat/stmgesturefw_api/stmgesturefw_api.metaxml"/>
-    <unit bldFile="web_plat/stmgesturefw_api/group"/>
-   </component>
   </collection>
   <collection id="web_info" name="Web Info" level="specific">
    <component id="web_build" filter="s60" name="Web Build">
@@ -228,7 +227,7 @@
     <unit bldFile="codhandler/roapapp/group"/>
    </component>
    <component id="codhandler_build" filter="s60" name="COD Handler Build">
-    <!-- Exports need to go into another component or make this self-contained.
+    <!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
     <unit bldFile="codhandler/group"/>
    </component>
@@ -281,7 +280,7 @@
     <!--<unit bldFile="widgets/widgetstartup/group"/>-->
    </component>
    <component id="widgets_build" filter="s60" name="Widgets Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
     <unit bldFile="widgets/group"/>
    </component>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -136,6 +136,9 @@
           <component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
             <!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
           </component>
+          <component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
+            <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+          </component>
         </collection>
       </block>
     </layer>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/mw/wirelessacc/package_definition_3.0.xml
--- a/symbian4/mw/wirelessacc/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -50,7 +50,7 @@
   <collection id="wlanutilities" name="WLAN Utilities" level="generic">
    <component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
 	<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-      <unit bldFile="wlanutilities" qt:proFile="wirelessacc.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
     </component>
    <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
     <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
@@ -64,6 +64,9 @@
    <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
     <!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
    </component>
+   <component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin"  introduced="^4">
+    <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/os/deviceplatformrelease/package_definition.xml
--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -98,7 +98,7 @@
         <collection name="sf_config" long-name="SF Config" level="mid">
           <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
           <component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-            <!-- will shoudl give the id/path something more unique than cenrep -->
+            <!-- will should give the id/path something more unique than cenrep -->
             <unit bldFile="/sf/os/deviceplatformrelease/sf_config/cenrep/group"/>
           </component>
           <component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -26,7 +26,7 @@
         <unit base="sf_config/config"/>
       </component>
       <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
-		<!-- will shoudl give the id/path something more unique than cenrep -->
+		<!-- will should give the id/path something more unique than cenrep -->
         <unit bldFile="sf_config/cenrep/group"/>
       </component>
       <component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/os/usb/package_definition.xml
--- a/symbian4/os/usb/package_definition.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/os/usb/package_definition.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -77,11 +77,6 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-          <component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-          </component>
-        </collection>
         <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
           <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
         </collection>
diff -r 0f61ddd27c1c -r e7654a759056 symbian4/os/usb/package_definition_3.0.xml
--- a/symbian4/os/usb/package_definition_3.0.xml	Tue Apr 20 13:47:08 2010 +0100
+++ b/symbian4/os/usb/package_definition_3.0.xml	Tue Apr 20 15:20:20 2010 +0100
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
-  <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
-   <component id="usb_audio_stream_plugin_api" name="USB Audio Stream Plugin API" class="api" filter="s60">
-    <unit bldFile="usb_plat/usb_audio_stream_plugin_api/group"/>
-   </component>
-  </collection>
   <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
    <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
   </collection>