--- a/symbian4/adaptation/beagleboard/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/adaptation/beagleboard/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,18 +50,18 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+   <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
 </component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>

--- a/symbian4/adaptation/qemu/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/adaptation/qemu/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,12 +50,12 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+   <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>

--- a/symbian4/adaptation/stubs/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,102 +50,102 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
+   <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
+<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
+<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
+<component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
 </component>
 </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">
+<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
 </component>
 </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">
+<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </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">
+<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
 <unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
+<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
 </component>
 </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">
+<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
 <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
+<component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
-<component name="tvoutconfig" long-name="TV Out Config">
+<component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
+<component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
+<component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
-<component name="examplecommonisc" long-name="Example Common ISC">
+<component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
-<component name="exampledsy" long-name="Example DSY">
+<component name="exampledsy" long-name="Example DSY" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
+<component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
+<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" 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">
+<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
+<component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
+<component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
+<component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
 </component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
+<component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
+<component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
+<component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" 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">
+<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
 <unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
 </component>
 </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">
+<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
 <unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>

--- a/symbian4/app/browserui/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,13 +50,13 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
+   <block name="browserui" level="services" levels="utils support ui" long-name="Browser UI">
 <collection name="browserui_info" long-name="Browser UI Info" level="ui">
-<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
-<unit bldFile="/sf/app/browserui" proFile="browserui.pro"/>
+<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/app/browserui/." proFile="browserui.pro"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/calendarwidget/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/calendarwidget/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,31 +50,31 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="calendarwidget" level="apps" long-name="Calendar Widget" levels="build app">
+   <block name="calendarwidget" level="apps" levels="build app" long-name="Calendar Widget">
 <collection name="calendarwidget_info" long-name="Calendar Widget Info" level="build">
-<component name="calendarwidget_rom" long-name="Calendar Widget ROM" filter="dfs_build" introduced="^4">
+<component name="calendarwidget_rom" long-name="Calendar Widget ROM" introduced="^4" filter="dfs_build" purpose="optional">
 <!-- remove subdirs and put exports into a real bld.inf  -->
-<unit bldFile="/sf/app/calendarwidget" proFile="calendarwidget.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/app/calendarwidget/." proFile="calendarwidget.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
 <!-- collection is really a component, need to move down a directory -->
-<component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" filter="dfs_build" introduced="^4" class="placeholder">
+<component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" purpose="optional" class="placeholder">
 <!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
 </component>
 </collection>
 <collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
 <!-- collection is really a component, need to move down a directory -->
-<component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" filter="dfs_build" introduced="^4" plugin="Y" class="placeholder">
+<component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" purpose="optional" plugin="Y" class="placeholder">
 <!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
 </component>
-<component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" filter="dfs_build" introduced="^4">
-<unit bldFile="/sf/app/calendarwidget/calendarwidgetplugin/tsrc" qmakeArgs="-r" proFile="tsrc.pro"/>
+<component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" purpose="optional">
+<unit bldFile="/sf/app/calendarwidget/calendarwidgetplugin/tsrc" proFile="tsrc.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/camera/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/camera/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,12 +50,12 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="camera" level="apps" long-name="Camera Apps">
 <collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
+<component name="cameraxui" long-name="CameraX UIs" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
 </component>
 </collection>

--- a/symbian4/app/commonemail/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,97 +50,97 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+   <block name="commonemail" level="apps" span="2" levels="service support ui app" long-name="Email Apps">
 <!-- need to resolve the qt parts into proper components, then uncomment the units -->
 <collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
+<component name="nmail_client_api" long-name="NMail Client API" introduced="^4" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="email_plat/nmail_client_api" qt:proFile="nmail_client_api.pro"/> -->
 </component>
-<component name="email_services_api" long-name="Email Services API" filter="s60" introduced="^4" class="api placeholder">
+<component name="email_services_api" long-name="Email Services API" introduced="^4" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="email_plat/email_services_api" qt:proFile="email_services_api.pro"/> -->
 </component>
-<component name="nmail_settings_api" long-name="NMail Settings API" filter="s60" introduced="^4" class="api placeholder">
+<component name="nmail_settings_api" long-name="NMail Settings API" introduced="^4" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="email_plat/nmail_settings_api" qt:proFile="nmail_settings_api.pro"/> -->
 </component>
-<component name="email_client_api" long-name="EMail Client API" filter="s60" introduced="^4" class="api placeholder">
+<component name="email_client_api" long-name="EMail Client API" introduced="^4" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="email_plat/email_client_api" qt:proFile="email_client_api.pro"/> -->
 </component>
 </collection>
 <collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
+<component name="nmailbase" long-name="NMail Base" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
 </component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
+<component name="emailcommon" long-name="Email Common" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
 </component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
+<component name="emailframework" long-name="Email Framework" introduced="^2" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
 </component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
+<component name="emailstore" long-name="Email Store" introduced="^2" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
 </component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
+<component name="nmclientapi" long-name="Nmail Client API" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
 </component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
+<component name="nmailagent" long-name="Nmail Agent" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
 </component>
-<component name="nmutilities" filter="s60" long-name="Nmail Utilities" introduced="^4" class="placeholder">
+<component name="nmutilities" long-name="Nmail Utilities" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
 </component>
 </collection>
 <collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
+<component name="ipssosplugin" long-name="IPS SOS Plugin" introduced="^2" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
 <!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
 </component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmimapclientplugin" long-name="NM IMAP Client Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
 </component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmipsmtms" long-name="NM IPS Client Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
 </component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
+<component name="nmipssettings" long-name="NM IPS Settings" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
 </component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
+<component name="ipsservices_build" long-name="IPS Services Build" introduced="^2" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
 <!-- can the exports be broken up into the other components or made a config component?-->
 </component>
 </collection>
 <collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
+<component name="nmailuiengine" long-name="Nmail UI Engine" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
 </component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
+<component name="nmailuiwidgets" long-name="Nmail UI Widgets" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
 </component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmailuiwidgetsplugin" long-name="Nmail UI Widgets Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
 </component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmsettingui" long-name="Nmail Setting UI" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
 </component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmailcpplugin" long-name="Nmail CP Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
 </component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
+<component name="nmailui" long-name="Nmail UI" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
 </component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmindicatorplugin" long-name="Nmail Indicator Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
 </component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
+<component name="nmframeworkadapter" long-name="Nmail Framework Adapter" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
 </component>
 </collection>
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
+<component name="commonemail_build" long-name="Email Apps Build" introduced="^4" purpose="optional">
 <!-- split into actual components -->
-<unit bldFile="/sf/app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/app/commonemail/." proFile="nmail.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/conntools/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/conntools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,18 +50,18 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+   <block name="conntools" level="services" levels="config app" long-name="Connectivity Tools">
 <collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
+<component name="conntest" long-name="Connection Test" filter="s60" purpose="development">
 <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
 </component>
 </collection>
 <collection name="emulatorlan" long-name="Emulator LAN" level="config">
 <!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
+<component name="emulatorlan_build" long-name="Emulator LAN Build" filter="s60" purpose="development" class="config">
 <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
 </component>
 </collection>

--- a/symbian4/app/contacts/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,55 +50,55 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services plugin ui">
+   <block name="contacts" level="apps" span="2" levels="engine support services plugin ui" long-name="Contacts Apps">
 <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
+<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" introduced="^4" filter="s60" purpose="optional" class="api"/>
 </collection>
 <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="cnthistorymodel" filter="s60" long-name="Contacts History Model" introduced="^4" class="placeholder">
+<component name="cnthistorymodel" long-name="Contacts History Model" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
 </component>
-<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
+<component name="pbkcommonui" long-name="Phonebook Common UI" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
 </component>
-<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
+<component name="phonebookapp" long-name="Phonebook Application" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
 </component>
-<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
+<component name="phonebookservices" long-name="Phonebook Services" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
 </component>
-<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
+<component name="phonebookui_build" long-name="Phonebook UI Build" introduced="^4" filter="s60" purpose="optional">
 <!-- break up into components -->
 <unit bldFile="/sf/app/contacts/phonebookui" proFile="phonebookui.pro"/>
 </component>
 </collection>
 <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
+<component name="cntfindplugin" long-name="Contacts Find Plugin" introduced="^2" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
-<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
+<component name="cntsortplugin" long-name="Contacts Sort Plugin" introduced="^2" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
 </component>
-<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y" class="placeholder">
+<component name="qtcontactsmobility" long-name="Qt Contacts Mobility" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- need to move to this actual dir rather than including something from another collection -->
 <!-- <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/> -->
 </component>
-<component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
+<component name="cntlistmodel" long-name="Contact List Model" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
 </component>
-<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
+<component name="cntactions" long-name="Contacts Actions" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
 </component>
-<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
+<component name="cntmaptileservice" long-name="Contacts Map Tile Service" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
 </component>
-<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<component name="cntsimutility" long-name="Contacts SIM Utility" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
 </component>
-<component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
+<component name="cntimageutility" long-name="Contacts Image Utility" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
 </component>
 </collection>
@@ -106,21 +106,21 @@
 <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/contacts/pimprotocols/phonebooksync/group" mrp="/sf/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
 </component>
-<component name="pbap" filter="s60" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
 </component>
 </collection>
 <collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecachesymbian" filter="s60" long-name="Presence Cache Symbian" introduced="^4">
+<component name="presencecachesymbian" long-name="Presence Cache Symbian" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/presencecache/presencecachesymbian" proFile="presencecachesymbian.pro"/>
 </component>
-<component name="presencecacheqt" filter="s60" long-name="Presence Cache Qt" introduced="^4">
+<component name="presencecacheqt" long-name="Presence Cache Qt" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
 </component>
 </collection>
 <collection name="contactwidgethsplugin" long-name="Contact Widget Homescreen Plugin" level="plugin">
 <!-- collection is really a component, move down a directory -->
-<component name="contactwidgethsplugin_build" long-name="Contact Widget Homescreen Plugin Build" introduced="^4">
+<component name="contactwidgethsplugin_build" long-name="Contact Widget Homescreen Plugin Build" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/contacts/contactwidgethsplugin" proFile="contactwidgethsplugin.pro"/>
 </component>
 </collection>

--- a/symbian4/app/contentcontrol/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,38 +50,38 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
+   <block name="contentcontrol" level="services" levels="plugin framework app" long-name="Content Control Daemons">
 <collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
+<component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
 </component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
+<component name="ds_data_modification_api" long-name="DS Data Modification API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
 </component>
 </collection>
 <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
+<component name="secon" long-name="Service Controllers" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contentcontrol/connectivitymodules/secon/group"/>
 </component>
 </collection>
 <collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
 <!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
+<component name="dsdcmoadapter_build" long-name="Data Sync Control DCMO Adapter" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contentcontrol/dsdcmoadapter/group"/>
 </component>
 </collection>
 <collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
+<component name="omads_build" long-name="OMA DS Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/contentcontrol/omads/group"/>
 <!-- need to remove #include and rename and OMA DS ROM -->
 </component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
+<component name="omadsextensions" long-name="OMA DS Extensions" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
 </component>
-<component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
+<component name="omadsextensions_qt" long-name="OMA DS Qt Extensions" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
 </component>
 </collection>

--- a/symbian4/app/devicecontrol/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,112 +50,112 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="support mid app">
+   <block name="devicecontrol" level="services" levels="support mid app" long-name="Device Control Daemons">
 <collection name="devicemgmtdialogsplugin" long-name="Device Management Dialogs Plugin" level="support">
 <!-- need to put component at the proper directory level -->
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/devicemgmtdialogsplugin" proFile="devicemgmtdialogsplugin.pro"/>
 </component>
 </collection>
 <collection name="devicemgmtindicatorsplugin" long-name="Device Management Indicators Plugin" level="support">
 <!-- collection is really a component. Need to move down a dir -->
-<component name="devicemgmtindicatorsplugin_build" long-name="Device Management Indicators Plugin Build" filter="s60" introduced="^4" plugin="Y">
+<component name="devicemgmtindicatorsplugin_build" long-name="Device Management Indicators Plugin Build" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/devicemgmtindicatorsplugin" proFile="devicemgmtindicatorsplugin.pro"/>
 </component>
 </collection>
 <collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
+<component name="deviceupdates" long-name="Device Updates" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
 </component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="deviceupdatesplugin" long-name="Device Updates Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
 </component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
 </component>
 </collection>
 <collection name="clientprovisioning" long-name="Client Provisioning" level="mid">
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/clientprovisioning/cpqtsp" proFile="cpqtsp.pro"/>
 </component>
 </collection>
 <collection name="applicationmanagement" long-name="Applicaton Management" level="mid">
-<component name="applicationmgmtserver" long-name="Applicaton Management Server" filter="s60" introduced="^4">
+<component name="applicationmgmtserver" long-name="Applicaton Management Server" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/applicationmanagement/server" proFile="server.pro"/>
 </component>
-<component name="applicationmgmt_build" long-name="Applicaton Management Build" filter="s60" introduced="^4">
+<component name="applicationmgmt_build" long-name="Applicaton Management Build" introduced="^4" filter="s60" purpose="optional">
 <!-- need to break up into components or move down a directory -->
 <unit bldFile="/sf/app/devicecontrol/applicationmanagement/group"/>
 </component>
 </collection>
 <collection name="omadmadapters" long-name="OMA DM Adapters" level="support">
-<component name="omadmadapters_build" long-name="OMA DM Adapters Build" filter="s60">
+<component name="omadmadapters_build" long-name="OMA DM Adapters Build" filter="s60" purpose="optional">
 <!-- need to split IBY into the components or make this a ROM component -->
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/bld"/>
 </component>
-<component name="devinfo" long-name="Device Info" filter="s60">
+<component name="devinfo" long-name="Device Info" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/devinfo/bld"/>
 </component>
-<component name="devdetail" long-name="Device Detail" filter="s60">
+<component name="devdetail" long-name="Device Detail" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/devdetail/bld"/>
 </component>
-<component name="syncmldm" long-name="SyncML DM" filter="s60">
+<component name="syncmldm" long-name="SyncML DM" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/syncmldm/bld"/>
 </component>
-<component name="syncmldm12" long-name="SyncML DM 1.2" filter="s60">
+<component name="syncmldm12" long-name="SyncML DM 1.2" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/syncmldm12/bld"/>
 </component>
-<component name="omadm_browseradapter" long-name="Browser Adapter" filter="s60" plugin="Y" class="placeholder">
+<component name="omadm_browseradapter" long-name="Browser Adapter" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--  <unit bldFile="omadmadapters/browseradapter/bld"/> -->
 </component>
-<component name="omadm_streamingadapter" long-name="Streaming Adapter" filter="s60" plugin="Y">
+<component name="omadm_streamingadapter" long-name="Streaming Adapter" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/streamingadapter/bld"/>
 </component>
-<component name="globalwlansettings" long-name="Global WLAN Settings" filter="s60">
+<component name="globalwlansettings" long-name="Global WLAN Settings" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/globalwlansettings/group"/>
 </component>
-<component name="nsmldminternet" filter="s60">
+<component name="nsmldminternet" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/nsmldminternet/group"/>
 </component>
-<component name="nsmldmalwaysonadapter" long-name="Always Online Device Management Adapter" filter="s60" introduced="9.1" plugin="Y">
+<component name="nsmldmalwaysonadapter" long-name="Always Online Device Management Adapter" introduced="9.1" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/nsmldmalwaysonadapter/group"/>
 </component>
-<component name="nsmldmbmadapter" long-name="NSML DM BM Adapter" filter="s60" plugin="Y">
+<component name="nsmldmbmadapter" long-name="NSML DM BM Adapter" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/nsmldmbmadapter/group"/>
 </component>
-<component name="connmoadapter" long-name="Connection Management Object Adapter" filter="s60" plugin="Y">
+<component name="connmoadapter" long-name="Connection Management Object Adapter" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/connmoadapter/group"/>
 </component>
-<component name="syncmlds" long-name="SyncML Data Sync" filter="s60">
+<component name="syncmlds" long-name="SyncML Data Sync" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/syncmlds/bld"/>
 </component>
-<component name="omadm_email" long-name="OMA DM Email" filter="s60">
+<component name="omadm_email" long-name="OMA DM Email" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/email/bld"/>
 </component>
-<component name="omadm_mms" long-name="OMA DM MMS" filter="s60">
+<component name="omadm_mms" long-name="OMA DM MMS" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/mms/bld"/>
 </component>
-<component name="omadm_fota" long-name="OMA DM FOTA" filter="s60">
+<component name="omadm_fota" long-name="OMA DM FOTA" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/fota/bld"/>
 </component>
-<component name="omadm_imps" long-name="OMA DM IMPS" filter="s60">
+<component name="omadm_imps" long-name="OMA DM IMPS" filter="s60" purpose="optional" class="placeholder">
 <!--  <unit bldFile="omadmadapters/imps/bld"/> -->
 </component>
-<component name="dcmodmadapter" long-name="DC Management Object  DM Adapter" filter="s60" plugin="Y">
+<component name="dcmodmadapter" long-name="DC Management Object  DM Adapter" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/omadmadapters/dcmodmadapter/group"/>
 </component>
 </collection>
 <collection name="omadcmoadapters" long-name="OMA DC Management Object Adapters" level="support">
-<component name="omadcmoadapters_build" long-name="OMA DCMA Adapters Build" filter="s60" introduced="^4">
+<component name="omadcmoadapters_build" long-name="OMA DCMA Adapters Build" introduced="^4" filter="s60" purpose="optional">
 <!-- need to break up into components  -->
 <unit bldFile="/sf/app/devicecontrol/omadcmoadapters/group"/>
 </component>
 </collection>
 <collection name="omacpadapters" long-name="OMA Client Provisioning Adapters" level="support">
-<component name="omacpadapters_build" long-name="OMA CP Adapters Build" filter="s60" introduced="^4">
+<component name="omacpadapters_build" long-name="OMA CP Adapters Build" introduced="^4" filter="s60" purpose="optional">
 <!-- need to break up into components  -->
 <unit bldFile="/sf/app/devicecontrol/omacpadapters/bld"/>
 </component>

--- a/symbian4/app/files/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/files/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,21 +50,21 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+   <block name="files" level="apps" levels="support apps" long-name="File Manager Apps">
 <collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60,bldfirst" long-name="File Manager Backup Engine" introduced="^4">
+<component name="filemanager_plat" long-name="File Manager Platform Interfaces" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="fmbkupengine" long-name="File Manager Backup Engine" introduced="^4" filter="s60,bldfirst" purpose="optional">
 <unit bldFile="/sf/app/files/filemanager/src/fmbkupengine/group"/>
 </component>
-<component name="fmfiledialog" filter="s60,bldfirst" long-name="File Manager File Dialog" introduced="^4">
+<component name="fmfiledialog" long-name="File Manager File Dialog" introduced="^4" filter="s60,bldfirst" purpose="optional">
 <unit bldFile="/sf/app/files/filemanager/src/fmfiledialog" proFile="fmfiledialog.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
+<component name="filemanager_build" long-name="File Manager Build" filter="s60" purpose="optional">
 <!-- break this up into components or move down a directory -->
-<unit bldFile="/sf/app/files/filemanager" qmakeArgs="-r" proFile="filemanager.pro"/>
+<unit bldFile="/sf/app/files/filemanager" proFile="filemanager.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/firsttimeuse/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,10 +50,10 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
+   <block name="firsttimeuse" level="apps" levels="support services ui app" long-name="First Time Use">
 <!-- these empty collections are really components. Move down a directory and supply units -->
 <collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
 <collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
@@ -61,8 +61,8 @@
 <collection name="stateproviders" long-name="State Providers" level="support"/>
 <collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
 <collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="/sf/app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
+<component name="firsttimeuse_build" long-name="First Time Use Build" purpose="optional">
+<unit bldFile="/sf/app/firsttimeuse/." proFile="ftu.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/helps/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,13 +50,13 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <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">
+   <block name="helps" level="apps" span="2" levels="eng tools if ui" long-name="Help Apps">
 <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">
+<component name="userguide_build" long-name="User Guide Build" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/helps/userguide" proFile="Userguide.pro"/>
 </component>
 </collection>

--- a/symbian4/app/homescreen/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,49 +50,49 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
+   <block name="homescreen" level="apps" levels="support task ss hs" long-name="Home Screen Apps">
 <collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
 <collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4">
+<component name="hsutils" long-name="Home Screen Utils" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/homescreen/homescreenapp/hsutils" proFile="hsutils.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4">
+<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/homescreen/homescreenapp/hsdomainmodel" proFile="hsdomainmodel.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y">
+<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/homescreen/homescreenapp/runtimeplugins" proFile="runtimeplugins.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y">
+<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/homescreen/homescreenapp/serviceproviders" proFile="serviceproviders.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y">
+<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/homescreen/homescreenapp/stateplugins" proFile="stateplugins.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y">
+<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/homescreen/homescreenapp/widgetplugins" proFile="widgetplugins.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4">
+<component name="hsapplication" long-name="Home Screen Application" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/homescreen/homescreenapp/hsapplication" proFile="hsapplication.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hsmenuclientplugin" long-name="Home Screen Menu Client Plugin" introduced="^4" plugin="Y">
+<component name="hsmenuclientplugin" long-name="Home Screen Menu Client Plugin" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/homescreen/homescreenapp/hsmenuclientplugin" proFile="hsmenuclientplugin.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hshomescreenclientplugin" long-name="HS Menu Client Plugin" introduced="^4" plugin="Y">
+<component name="hshomescreenclientplugin" long-name="HS Menu Client Plugin" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/homescreen/homescreenapp/hshomescreenclientplugin" proFile="hshomescreenclientplugin.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="hswidgetuninstaller" long-name="HS Widget Uninstaller" introduced="^4">
+<component name="hswidgetuninstaller" long-name="HS Widget Uninstaller" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/homescreen/homescreenapp/hswidgetuninstaller" proFile="hswidgetuninstaller.pro" qmakeArgs="-r -config rom"/>
 </component>
-<component name="homescreenapp_rom" long-name="Home Screen App ROM" introduced="^4">
+<component name="homescreenapp_rom" long-name="Home Screen App ROM" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/homescreen/homescreenapp" proFile="homescreenapp_exports_to_rom.pri" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection name="screensaver" long-name="Screen Saver" level="ss">
 <!-- break collection into components, or move down a dir and make it a component -->
-<component name="screensaver_build" long-name="Screen Saver Build">
+<component name="screensaver_build" long-name="Screen Saver Build" purpose="optional">
 <unit bldFile="/sf/app/homescreen/screensaver" proFile="screensaver.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>

--- a/symbian4/app/imgeditor/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="imgeditor" level="apps" long-name="Image Editor"/>

--- a/symbian4/app/internetradio/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,24 +50,24 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
+   <block name="internetradio" level="apps" levels="engine server ui" long-name="Internet Radio Apps">
 <collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
 <!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
+<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build" purpose="optional">
 <unit bldFile="/sf/app/internetradio/internetradio2.0/group"/>
 </component>
 </collection>
 <collection name="presetserver" long-name="Preset Server" level="server">
 <!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
+<component name="presetserver_build" long-name="Preset Server Build" purpose="optional">
 <unit bldFile="/sf/app/internetradio/presetserver/group"/>
 </component>
 </collection>
 <collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
+<component name="qtinternetradio_build" long-name="Qt Internet Radio Build" purpose="optional">
 <!--  Move down a dir or break into components-->
 <unit bldFile="/sf/app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
 </component>

--- a/symbian4/app/jrt/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,64 +50,64 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+   <block name="jrt" level="services" levels="util generic rt ui" long-name="Java Runtime">
 <collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
+<component name="java_registry_api" long-name="Java Registry API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_registry_api/build"/>
 </component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
+<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_env_info_api/build"/>
 </component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
+<component name="java_debug_api" long-name="Java Debug API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_debug_api/build"/>
 </component>
 </collection>
 <collection name="java_stubs" long-name="Java Stubs" level="rt">
-<component name="java_stubs_build" long-name="Build Native Java" filter="sf_build" introduced="^4">
+<component name="java_stubs_build" long-name="Build Native Java" introduced="^4" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/app/jrt/java_stubs/group"/>
 </component>
 </collection>
 <collection name="build_nativejava" long-name="Build Native Java">
-<component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+<component name="nativejava" long-name="Build Native Java" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>
 </collection>
 <collection name="javacommons" long-name="Java Commons" level="generic">
-<component name="javacommons_build" filter="s60" long-name="JRT Build">
+<component name="javacommons_build" long-name="JRT Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>
 </collection>
 <collection name="javaruntimes" long-name="Java Runtimes" level="rt">
-<component name="javaruntimes_build" filter="s60" long-name="JRT Build">
+<component name="javaruntimes_build" long-name="JRT Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>
 </collection>
 <collection name="javauis" long-name="Java UIs" level="ui">
-<component name="javauis_build" filter="s60" long-name="JRT Build">
+<component name="javauis_build" long-name="JRT Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>
 </collection>
 <collection name="javamanager" level="generic">
-<component name="javamanager_build" filter="s60" long-name="JRT Build">
+<component name="javamanager_build" long-name="JRT Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>
 </collection>
 <collection name="javatools" long-name="Java Tools" level="util">
-<component name="javatools_build" filter="s60" long-name="JRT Build">
+<component name="javatools_build" long-name="JRT Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>
 </collection>
 <collection name="javaextensions" long-name="Java Extensions" level="generic">
-<component name="javaextensions_build" filter="s60" long-name="JRT Build">
+<component name="javaextensions_build" long-name="JRT Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
 <unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
 </component>

--- a/symbian4/app/location/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/location/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,24 +50,24 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
+   <block name="location" level="apps" levels="ui events loc api" long-name="Location Apps">
 <collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
+<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/location/location_plat" proFile="location_plat.pro"/>
 </component>
 </collection>
 <collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
 <!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
+<component name="locationpickerservice_build" long-name="Location Picker Service Build" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
 </component>
 </collection>
 <collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
 <!--collection is really a component. Should move down a directory -->
-<component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
+<component name="locationdataharvester_build" long-name="Location Data Harvester Build" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
 </component>
 </collection>

--- a/symbian4/app/messaging/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,31 +50,31 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
+   <block name="messaging" level="apps" span="2" levels="plugin eng base app api" long-name="Messaging Apps">
 <collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
+<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" purpose="optional" class="api"/>
+<component name="mms_application_api" long-name="MMS Application API" filter="s60" purpose="optional" class="api"/>
+<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" purpose="optional" class="api"/>
+<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" purpose="optional" class="api"/>
+<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" purpose="optional" class="api"/>
+<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" purpose="optional" class="api"/>
+<component name="conversation_services_client_api" long-name="Conversation Services Client API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="shareui_api" long-name="Share UI API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="messaging_history_api" long-name="Messaging History API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" introduced="^4" filter="s60" purpose="optional" class="api">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
 <unit bldFile="/sf/app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
+<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" purpose="optional" class="api"/>
+<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" introduced="^4" filter="s60" purpose="optional" class="api">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
 <unit bldFile="/sf/app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
 </component>
@@ -85,11 +85,11 @@
 </component>
 </collection>
 <collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
+<component name="messagingappbase_build" long-name="Messaging App Base Build" introduced="^4" filter="s60" purpose="optional">
 <!-- break this up into the below components -->
 <unit bldFile="/sf/app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
+<component name="msgmedia" long-name="Message Media" filter="s60" purpose="optional"/>
 <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
 </component>
@@ -98,40 +98,40 @@
 </component>
 </collection>
 <collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
+<component name="mmsconninit" long-name="MMS Connection Initiator" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
 </component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
+<component name="genutils" long-name="General Utils" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
 </component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
+<component name="mmsserversettings" long-name="MMS Server Settings" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
 </component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
+<component name="mmsmessage" long-name="MMS Message" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
 </component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
+<component name="mmshttptransport" long-name="MMS HTTP Transport" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
 </component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
+<component name="mmscodec" long-name="MMS Codec" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
 </component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
+<component name="mmsserver" long-name="MMS Server" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
 </component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
+<component name="clientmtm" long-name="MMS Client MTM" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
 </component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
+<component name="mmswatcher" long-name="MMS Watcher" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
 </component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
+<component name="mmspushhandler" long-name="MMS Push Handler" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
 </component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
+<component name="applicationadapter" long-name="MMS Application Adapter" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
 </component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
+<component name="mmscodecclient" long-name="MMS Codec Client" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
 </component>
 <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
@@ -140,46 +140,46 @@
 <component name="mmsconf" long-name="MMS Configuration" purpose="optional">
 <unit bldFile="/sf/app/messaging/mmsengine/mmsconf" mrp="/sf/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
 </component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
+<component name="mmsengine_build" long-name="MMS Engine Build" filter="s60" purpose="optional">
 <!-- this should be broken up into the individual other components -->
 <unit bldFile="/sf/app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="messaging_conf" filter="s60" long-name="Messaging Application Configuration" introduced="^4" class="config">
+<component name="messaging_conf" long-name="Messaging Application Configuration" introduced="^4" filter="s60" purpose="optional" class="config">
 <unit bldFile="/sf/app/messaging/messagingapp/conf" proFile="messaging_conf.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
+<component name="msgutils" long-name="Messaging Utils" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
+<component name="msgappfw" long-name="Messaging Application Framework" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
+<component name="msgsettings" long-name="Messaging Settings" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
+<component name="msgnotifications" long-name="Messaging Notifications" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
 </component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
+<component name="smartmessaging" long-name="Smart Messaging" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
 </component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
+<component name="shareui" long-name="Shared UI" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
+<component name="msgui" long-name="Messaging UI" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
 </component>
-<component name="msgservices" filter="s60" long-name="Messaging Services" introduced="^4">
+<component name="msgservices" long-name="Messaging Services" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/messaging/messagingapp/msgservices" proFile="msgservices.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="email" long-name="Email" level="plugin">
 <!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
+<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" deprecated="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
 </component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
+<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" deprecated="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/messaging/email/imap4mtm/group" mrp="/sf/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
 </component>
 </collection>

--- a/symbian4/app/musicplayer/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,96 +50,96 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support engine app">
+   <block name="musicplayer" level="apps" levels="plugins support engine app" long-name="Music Player Apps">
 <!-- move the rom .pri files into their components and uncomment the units -->
-<collection name="mpdata " long-name="Music Player Data" level="support">
+<collection name="mpdata" long-name="Music Player Data" level="support">
 <!-- collection is really a component, move down a directory -->
-<component name="mpdata_build" filter="s60" long-name="Music Player Data Build" introduced="^4" class="placeholder">
+<component name="mpdata_build" long-name="Music Player Data Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="mpengine " long-name="Music Player Engine" level="engine">
+<collection name="mpengine" long-name="Music Player Engine" level="engine">
 <!-- collection is really a component, move down a directory -->
-<component name="mpengine_build" filter="s60" long-name="Music Player Engine Build" introduced="^4" class="placeholder">
+<component name="mpengine_build" long-name="Music Player Engine Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
+<collection name="musicplayer_utilities" long-name="Music Player Utilities" level="support">
+<component name="mpnowplayingbanner" long-name="MP Now Playing Banner" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
+<component name="mpsettingsmanager" long-name="MP Settings Manager" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="musicservices " long-name="Music Services" level="support">
+<collection name="musicservices" long-name="Music Services" level="support">
 <!-- collection is really a component, move down a directory -->
-<component name="musicservices_build" filter="s60" long-name="Music Services Build" introduced="^4" class="placeholder">
+<component name="musicservices_build" long-name="Music Services Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
+<collection name="musicplayer_app" long-name="Music Player Application" level="app">
 <!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
+<component name="musicplayer_app_build" long-name="Music Player Application Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection name="mpviewplugins" long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpcollectionviewplugin" long-name="MP Collection View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpplaybackviewplugin" long-name="MP Playback View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
-<component name="mpsettingsviewplugin" filter="s60" long-name="MP Settings View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpsettingsviewplugin" long-name="MP Settings View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
-<component name="mpdetailsviewplugin" filter="s60" long-name="MP Details View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpdetailsviewplugin" long-name="MP Details View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
-<component name="mpmediawallviewplugin" filter="s60" long-name="MP Media Wall View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpmediawallviewplugin" long-name="MP Media Wall View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection name="musicwidgetplugin" long-name="Music Widget Plugin" level="plugins">
-<component name="musicwidgetplugin_build" filter="s60" long-name="Music Widget Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="musicwidgetplugin_build" long-name="Music Widget Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="musicwidgetplugin" qt:proFile="musicwidgetplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
+<component name="audioeffects" long-name="Audio Effects" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
 </component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
+<component name="localaudio" long-name="Local Audio" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
 </component>
 <!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
+<component name="mpxsqlitedbcommon" long-name="MPX SQLite Database Common" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
 </component>
-<component name="mpxsqlitedbhgplugin" filter="s60" long-name="MPX SQLite Database Hg Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpxsqlitedbhgplugin" long-name="MPX SQLite Database Hg Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
 </component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpxsqlitedbplugin" long-name="MPX SQLite Database Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
 </component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpxsqlitepodcastdbplugin" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
-<component name="mpxinmemoryplugin" filter="s60" long-name="MPX In-Memory Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="mpxinmemoryplugin" long-name="MPX In-Memory Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
 </component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
+<component name="m3uplaylistplugin" long-name="M3U Playlist Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
 </collection>
 <collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
+<component name="musicplayer_build" long-name="Music Player Build" filter="s60" purpose="optional">
 <!-- break up into individual components. ROM includes should be in their components -->
-<unit bldFile="/sf/app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
+<unit bldFile="/sf/app/musicplayer/." proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/organizer/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,122 +50,122 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+   <block name="organizer" level="apps" span="2" levels="support services engine ui app" long-name="Organizer Application Suite">
 <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
+<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" purpose="optional" class="api">
 <!-- move into own .pro file -->
 <unit bldFile="/sf/app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
 </component>
 </collection>
 <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
+<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" purpose="optional" class="api">
 <!-- break up into individual .pro files, move the above metaxmls to those components -->
 <unit bldFile="/sf/app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
 </component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
+<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" purpose="optional" class="api placeholder">
 <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
 </component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
+<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
 </component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
+<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
 </component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
+<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" purpose="optional" class="api placeholder">
 <!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
 </component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="clock_settingsview_plugin_api" long-name="Clock Settings View Plugin API" filter="s60" introduced="^4" class="api"/>
+<component name="agenda_interface_api" long-name="Agenda Interface API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="calendar_editor_api" long-name="Calendar Editor API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="notes_editor_api" long-name="Notes Editor API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="clock_settingsview_plugin_api" long-name="Clock Settings View Plugin API" introduced="^4" filter="s60" purpose="optional" class="api"/>
 </collection>
 <collection name="agendainterface" long-name="Agenda Interface" level="services">
 <!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
+<component name="agendainterface_build" long-name="Agenda Interface Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/agendainterface" proFile="agendainterface.pro"/>
 </component>
 </collection>
 <collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
+<component name="commonutils" long-name="Calendar Common Utils" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
 </component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
+<component name="calenlauncher" long-name="Calendar Launcher" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
 </component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
+<component name="caleneditor" long-name="Calendar Editor" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
 </component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
+<component name="agendaeventviewer" long-name="Agenda Event Viewer" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
 </component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
+<component name="globaldata" long-name="Calendar Global Data" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
 </component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
+<component name="settings" long-name="Calendar Settings" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/settings" proFile="settings.pro"/>
 </component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
+<component name="calenplugins" long-name="Calendar Plugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
 </component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
+<component name="customisationmanager" long-name="Calendar Customisation Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
 </component>
-<component name="calendarui_views" filter="s60" long-name="Calendar Views">
+<component name="calendarui_views" long-name="Calendar Views" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/views" proFile="views.pro"/>
 </component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
+<component name="calendarui_controller" long-name="Calendar Controller" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/controller" proFile="controller.pro"/>
 </component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
+<component name="calendarui_application" long-name="Calendar Application" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarui/application" proFile="application.pro"/>
 </component>
-<component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
+<component name="regionalplugins" long-name="Regional Plugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
 </component>
-<component name="calenviewerservice" long-name="Calendar Viewer Service" filter="s60" introduced="^4" plugin="Y">
+<component name="calenviewerservice" long-name="Calendar Viewer Service" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/calenviewerservice" proFile="calenviewerservice.pro"/>
 </component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y" class="placeholder">
+<component name="caldav" long-name="CalDAV" introduced="^3" filter="sf_build" purpose="optional" plugin="Y" class="placeholder">
 <!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
 </component>
 </collection>
 <collection name="notes" long-name="Notes" level="ui">
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
+<component name="notes_build" long-name="Notes Build" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/notes" proFile="notes.pro"/>
 </component>
 </collection>
 <collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
+<component name="versit2" long-name="Versit 2 iCal Parser" introduced="9.2" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarengines/versit2/group"/>
 </component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
+<component name="agnversit2" long-name="Versit 2 Agenda Interface" introduced="9.2" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarengines/agnversit2/group"/>
 </component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
+<component name="caleninterimutils" long-name="Calendar Interim Utils" introduced="9.1" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarengines/caleninterimutils/group"/>
 </component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
+<component name="calenimp" long-name="Calendar Import Wrapper" introduced="7.0s" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/calendarengines/calenimp/group"/>
 </component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3" class="placeholder">
+<component name="caldavsrv" long-name="CalDAV Server" introduced="^3" filter="sf_build" purpose="optional" class="placeholder">
 <!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
 </component>
 </collection>
 <collection name="clock" long-name="Clock" level="app">
 <!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
+<component name="clockengines" long-name="Clock Engines" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
 </component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
+<component name="clockmw" long-name="Clock Middleware" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
 </component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
+<component name="clockui" long-name="Clock UI" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
 </component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
+<component name="clock_build" long-name="Clock Build" filter="s60" purpose="optional">
 <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
 <unit bldFile="/sf/app/organizer/clock" proFile="clock.pro"/>
 </component>
@@ -194,7 +194,7 @@
 </collection>
 <collection name="alarmui" long-name="Alarm UI" level="app">
 <!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
+<component name="alarmui_build" long-name="Alarm UI Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/organizer/alarmui" proFile="alarmui.pro"/>
 </component>
 </collection>

--- a/symbian4/app/phone/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,142 +50,142 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+   <block name="phone" level="apps" span="2" levels="engine plugin ui app" long-name="Phone Apps">
 <collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
+<component name="blacklist" long-name="Phone Blacklist Clearing" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
 </component>
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
+<component name="phoneuicontrol" long-name="Phone UI Control" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
 </component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
+<component name="phoneuistates" long-name="Phone UI States" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phoneuistates/group"/>
 </component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
+<component name="phoneuiutils" long-name="Phone UI Utils" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phoneuiutils/group"/>
 </component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
+<component name="silenceactionplugin" long-name="Silence Action Plugin" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneapp/silenceactionplugin/group"/>
 </component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
+<component name="phonemediatorcenter" long-name="Phone Mediator Center" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
 </component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
+<component name="phoneuiview2" long-name="Phone UI View" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
 </component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
+<component name="phoneuiqtviewadapter" long-name="Phone UI Qt View Adapter" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
 </component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
+<component name="phonestringloader" long-name="Phone String Loader" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
 </component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
+<component name="phoneui2" long-name="Phone UI" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
 </component>
 </collection>
 <collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
+<component name="phonecntfinder2" long-name="Phone Contact Finder" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
 </component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
+<component name="audiohandling" long-name="Phone Audio Handling" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/audiohandling/group"/>
 </component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
+<component name="callhandling" long-name="Call Handling" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/callhandling/group"/>
 </component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
+<component name="contacthandling2" long-name="Phone Contact Handling" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/contacthandling2/group"/>
 </component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
+<component name="loghandling" long-name="Phone Log Handling" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/loghandling/group"/>
 </component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
+<component name="engineinfo" long-name="Phone Engine Info" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/engineinfo/group"/>
 </component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
+<component name="phonemodel" long-name="Phone Model" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
 </component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
+<component name="servicehandling" long-name="Phone Service Handling" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/servicehandling/group"/>
 </component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
+<component name="phoneservices" long-name="Phone Server" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
 </component>
 </collection>
 <collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
+<component name="bubblemanager2" long-name="Phone Bubble Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
 </component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
+<component name="telephonydevicemode" long-name="Telephony Device Mode" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
 </component>
 </collection>
 <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
 </component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
+<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_comms_information_api/group"/>
 </component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
+<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_information_api/group"/>
 </component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
+<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_device_mode_api/group"/>
 </component>
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
+<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
 </component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
+<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
 </component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
+<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
 </component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
+<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_logging_extension_api/group"/>
 </component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
+<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_matching_extension_api/group"/>
 </component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
+<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/phone_application_commands_api/group"/>
 </component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
+<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
 </component>
-<component name="phone_telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
+<component name="phone_telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_menu_extension_api/group"/>
 </component>
-<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_mediator_api/group"/>
 </component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
+<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/video_telephony_mediator_api/group"/>
 </component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
+<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
 </component>
 </collection>
 <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
+<component name="csplugin" long-name="Circuit Switched Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/csplugin/group"/>
 </component>
-<component name="dialerwidgetplugin" filter="s60" long-name="Dialer Widget Plugin" introduced="^4" plugin="Y">
+<component name="dialerwidgetplugin" long-name="Dialer Widget Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/dialerwidgetplugin" proFile="dialerwidgetplugin.pro"/>
 </component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
+<component name="infowidgetplugin" long-name="Info Widget Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
 </component>
-<component name="phoneindicatorplugin" filter="s60" long-name="Phone Indicator Plugin" introduced="^4" plugin="Y">
+<component name="phoneindicatorplugin" long-name="Phone Indicator Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/phoneindicatorplugin" proFile="phoneindicatorplugin.pro"/>
 </component>
 </collection>
 <collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
+<component name="cpphonesettingsplugins" long-name="CP Phone Settings Plugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
 </component>
 </collection>

--- a/symbian4/app/photos/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,71 +50,71 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="photos" level="apps" long-name="Photos" levels="util support ui app">
+   <block name="photos" level="apps" levels="util support ui app" long-name="Photos">
 <collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
+<component name="photos_group_build" long-name="Photos Group Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="group" qt:proFile="group.pro"/> -->
 </component>
 </collection>
 <collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
+<component name="photos_loggerqt" long-name="Photos Logger Qt" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
 </component>
 </collection>
 <collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
+<component name="photos_externalutility" long-name="Photos External Utility" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
 </component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
+<component name="imagedecoderwrapper" long-name="Image Decoder Wrapper" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
 </component>
 </collection>
 <collection name="photos_ui" long-name="Photos UI" level="ui">
 <!-- need to move exports from ui.pro into separate .pro or bld.inf -->
-<component name="detailscustomwidget " filter="s60" long-name="Details Custom Widget" introduced="^4" class="placeholder">
+<component name="detailscustomwidget" long-name="Details Custom Widget" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/detailscustomwidget " qt:proFile="detailscustomwidget .pro"/> -->
 </component>
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
+<component name="photos_uiengine" long-name="Photos UI Engine" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
 </component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
+<component name="photos_commandhandlers" long-name="Photos Command Handlers" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
 </component>
-<component name="photos_viewutilities" filter="s60" long-name="Photos View Utilities" introduced="^4" class="placeholder">
+<component name="photos_viewutilities" long-name="Photos View Utilities" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/viewutilities" qt:proFile="commandhandlers.pro"/> -->
 </component>
-<component name="photos_widgets" filter="s60" long-name="Photos Widgets" introduced="^4" class="placeholder">
+<component name="photos_widgets" long-name="Photos Widgets" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/widgets" qt:proFile="widgets.pro"/> -->
 </component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
+<component name="photos_views" long-name="Photos Views" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
 </component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
+<component name="photos_viewmanagement" long-name="Photos View Management" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
 </component>
 </collection>
 <collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
+<component name="photos_main_build" long-name="Photos Main Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
 </component>
 </collection>
 <collection name="gallery" long-name="Gallery" level="ui">
-<component name="gallery_build" filter="s60" long-name="Gallery Build" introduced="^4" class="placeholder">
+<component name="gallery_build" long-name="Gallery Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
 </component>
 </collection>
 <collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
+<component name="imageviewerapp_build" long-name="Image Viewer App Build" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
 </component>
 </collection>
 <collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
+<component name="photos_build" long-name="Photos Build" introduced="^4" filter="s60" purpose="optional">
 <!--  split this up into the above components  -->
-<unit bldFile="/sf/app/photos" proFile="photos.pro"/>
+<unit bldFile="/sf/app/photos/." proFile="photos.pro"/>
 </component>
 </collection>
 </block>

--- a/symbian4/app/podcatcher/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,19 +50,19 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+   <block name="podcatcher" level="apps" levels="app" long-name="Podcatcher">
 <collection name="podcatcher_info" long-name="Podcatcher" level="app">
-<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
+<component name="podcatcher_build" long-name="Podcatcher Build" introduced="^3" filter="sf_build" purpose="optional">
 <!-- has exports from top level bld.inf -->
 <unit bldFile="/sf/app/podcatcher/group"/>
 </component>
-<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3">
+<component name="podcatcher_app" long-name="Podcatcher Application" introduced="^3" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/app/podcatcher/application/group"/>
 </component>
-<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
+<component name="podcatcher_engine" long-name="Podcatcher Engine" introduced="^3" filter="sf_build" purpose="optional">
 <unit bldFile="/sf/app/podcatcher/engine/group"/>
 </component>
 </collection>

--- a/symbian4/app/printing/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/printing/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="printing" level="services" long-name="Printing"/>

--- a/symbian4/app/radio/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,44 +50,44 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="radio" level="apps" long-name="Radio Apps" levels="engine plugin ui">
+   <block name="radio" level="apps" levels="engine plugin ui" long-name="Radio Apps">
 <collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
+<component name="radioengineutils" long-name="Radio Engine Utils" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioengine/utils/group"/>
 </component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
+<component name="radioenginesettings" long-name="Radio Engine Settings" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioengine/settings/group"/>
 </component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
+<component name="radioengine_engine" long-name="Radio Engine" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioengine/engine/group"/>
 </component>
 </collection>
 <collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
+<component name="radioenginewrapper" long-name="Radio Engine Wrapper" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
 </component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
+<component name="radiopresetstorage" long-name="Radio Preset Storage" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
 </component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
+<component name="radiouiengine" long-name="Radio UI Engine" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
 </component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
+<component name="radiowidgets" long-name="Radio Widgets" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
 </component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
+<component name="radioapplication" long-name="Radio Application" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
 </component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
+<component name="radio_rom" long-name="Radio ROM" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/rom"/>
 </component>
 </collection>
 <collection name="radiohswidget" long-name="Radio Homescreen Widget" level="plugin">
 <!-- collection is really a component. Move down a directory -->
-<component name="radiohswidget_build" filter="s60" long-name="Radio HS Widget Build" introduced="^4">
+<component name="radiohswidget_build" long-name="Radio HS Widget Build" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/radio/radiohswidget" proFile="radiohswidget.pro"/>
 </component>
 </collection>

--- a/symbian4/app/recents/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/recents/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,31 +50,31 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
+   <block name="recents" level="apps" levels="engine support ui api" long-name="Recent Events">
 <collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
+<component name="logs_services_api" long-name="Logs Services API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="logs_engine_api" long-name="Logs Engine API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" purpose="optional" class="api"/>
+<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" purpose="optional" class="api"/>
 </collection>
 <collection name="logsui" long-name="Logs UI" level="ui">
 <!-- split into actual components -->
-<component name="logsservices" filter="s60" long-name="Logs Services" introduced="^4" class="placeholder">
+<component name="logsservices" long-name="Logs Services" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
 </component>
-<component name="logscntfinder" filter="s60" long-name="Logs Contact finder" class="placeholder">
+<component name="logscntfinder" long-name="Logs Contact finder" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
 </component>
-<component name="logsengine" filter="s60" long-name="Logs Engine" introduced="^4" class="placeholder">
+<component name="logsengine" long-name="Logs Engine" introduced="^4" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
 </component>
-<component name="logsapp" filter="s60" long-name="Logs Application" class="placeholder">
+<component name="logsapp" long-name="Logs Application" filter="s60" purpose="optional" class="placeholder">
 <!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
 </component>
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
+<component name="logsui_build" long-name="Logs UI Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/recents/logsui" proFile="logsui.pro"/>
 </component>
 </collection>

--- a/symbian4/app/rndtools/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,69 +50,69 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
+   <block name="rndtools" level="services" levels="support generic test util" long-name="R&amp;D tools">
 <collection name="creator" long-name="Creator" level="support">
 <!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
+<component name="creator_build" long-name="Creator Tool" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/creator" proFile="creator.pro"/>
 </component>
 </collection>
 <collection name="filebrowser" long-name="File Browser" level="util">
 <!-- collection is really a component. Should move down a directory -->
-<component name="filebrowser_build" filter="s60" long-name="File Browser Build" purpose="development" class="tool">
+<component name="filebrowser_build" long-name="File Browser Build" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/filebrowser" proFile="filebrowser.pro"/>
 </component>
 </collection>
 <collection name="launcher" long-name="Launcher" level="util">
 <!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
+<component name="launcher_build" long-name="Launcher Utility" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/launcher" proFile="launcher.pro"/>
 </component>
 </collection>
 <collection name="loadgen" long-name="Load Generator" level="test">
 <!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
+<component name="loadgen_build" long-name="Load Generator Application" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/loadgen" proFile="loadgen.pro"/>
 </component>
 </collection>
 <collection name="perfmon" long-name="Performance Monitor" level="test">
 <!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
+<component name="perfmon_build" long-name="Performance Monitor Tool" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/perfmon" proFile="perfmon.pro"/>
 </component>
 </collection>
 <collection name="piprofilerui" long-name="Performance Investigator Profiler UI" level="generic">
 <!-- collection is really a component. Should move down a directory -->
-<component name="piprofilerui_build" filter="s60" long-name="Performance Investigator Profiler UI Build" purpose="development" introduced="^4">
+<component name="piprofilerui_build" long-name="Performance Investigator Profiler UI Build" introduced="^4" filter="s60" purpose="development">
 <unit bldFile="/sf/app/rndtools/piprofilerui" proFile="piprofilerui.pro"/>
 </component>
 </collection>
 <collection name="screengrabber" long-name="Screen Grabber" level="util">
 <!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
+<component name="screengrabber_build" long-name="ScreenGrabber" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/screengrabber" proFile="screengrabber.pro"/>
 </component>
 </collection>
 <collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_avkon" filter="s60" long-name="STIF UI for Avkon" purpose="development">
+<component name="stifui_avkon" long-name="STIF UI for Avkon" filter="s60" purpose="development">
 <unit bldFile="/sf/app/rndtools/stifui/avkon/group"/>
 </component>
 </collection>
 <collection name="memspyui" long-name="Memspy UI" level="generic">
 <!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
+<component name="memspyui_build" long-name="Memspy UI Application" filter="s60" purpose="development" class="tool">
 <unit bldFile="/sf/app/rndtools/memspyui" proFile="memspyui.pro"/>
 </component>
 </collection>
 <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
+<component name="htiui_build" long-name="HTI UI Build" filter="s60" purpose="development">
 <!-- should split up into individual components -->
 <unit bldFile="/sf/app/rndtools/htiui/group"/>
 </component>
-<component name="htiadminqt" filter="s60" long-name="HTI Admin Qt" purpose="development">
+<component name="htiadminqt" long-name="HTI Admin Qt" filter="s60" purpose="development">
 <unit bldFile="/sf/app/rndtools/htiui/htiadminqt" proFile="HtiAdmin.pro"/>
 </component>
 </collection>

--- a/symbian4/app/search/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,32 +50,32 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
+   <block name="search" level="apps" levels="eng base app api" long-name="Search Apps">
 <collection name="search_info" long-name="Search Info" level="base">
-<component name="search_build" long-name="Search Build" introduced="^4">
+<component name="search_build" long-name="Search Build" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/search/group"/>
 </component>
 </collection>
 <collection name="search_plat" long-name="Search Platform Interfaces" level="api">
-<component name="search_plat_build" long-name="Search Platform Interfaces Build" introduced="^4" class="api">
+<component name="search_plat_build" long-name="Search Platform Interfaces Build" introduced="^4" purpose="optional" class="api">
 <unit bldFile="/sf/app/search/search_plat" proFile="search_plat.pro"/>
 </component>
 </collection>
 <collection name="onlinesearchproviders" long-name="Online Search Providers" level="eng">
-<component name="onlinesearchproviders_build" long-name="Online Search Providers Build" introduced="^4">
+<component name="onlinesearchproviders_build" long-name="Online Search Providers Build" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/search/onlinesearchproviders" proFile="onlinesearchproviders.pro"/>
 </component>
 </collection>
 <collection name="search_harvesterplugins" long-name="Search Harvester Plugins" level="base">
-<component name="search_qtemailfetcher" long-name="Search Qt Email Fetcher" introduced="^4" plugin="Y">
+<component name="search_qtemailfetcher" long-name="Search Qt Email Fetcher" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/search/harvesterplugins/messaging/email/qtemailfetcher" proFile="qtemailfetcher.pro"/>
 </component>
 </collection>
 <collection name="searchui" long-name="Search UI" level="app">
-<component name="searchui_build" long-name="Search UI Build" introduced="^4">
+<component name="searchui_build" long-name="Search UI Build" introduced="^4" purpose="optional">
 <unit bldFile="/sf/app/search/searchui" proFile="searchui.pro"/>
 </component>
 </collection>

--- a/symbian4/app/settingsuis/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/settingsuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,18 +50,18 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
+   <block name="settingsuis" level="services" levels="plugin ui" long-name="Settings UIs">
 <collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
+<component name="themeplugin" long-name="Theme Plugin" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection name="controlpanelui" long-name="Control Panel UI" level="ui">
 <!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
+<component name="controlpanelui_build" long-name="Control Panel UI Build" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>

--- a/symbian4/app/techview/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/techview/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,12 +50,12 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+   <block name="techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3" long-name="Techview">
 <collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+<component name="autosmoketest" long-name="Auto Smoke Test" introduced="9.1" filter="gt" purpose="development">
 <unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
 </component>
 <component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">

--- a/symbian4/app/videoeditor/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/videoeditor/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoeditor" level="apps" long-name="Video Editor"/>

--- a/symbian4/app/videoplayer/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,56 +50,56 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+   <block name="videoplayer" level="apps" levels="support plugin util apps" long-name="Video Player Apps">
 <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
 </component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+<component name="videocollection_api" long-name="Video Collection API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
 </component>
 </collection>
 <collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
+<component name="mpxmyvideoscollection" long-name="MPX My Videos Collection" introduced="^3" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group" filter="!test"/>
 </component>
-<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
+<component name="videocollectionwrapper" long-name="Video Collection Wrapper" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
 </component>
-<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
+<component name="videocollectionview" long-name="Video Collection View" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
 </component>
-<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
+<component name="videofiledetailsview" long-name="Video File Details View" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="mediasettings" long-name="Media Settings" level="support">
-<component name="mediasettingsengine" filter="s60" long-name="Media Settings Engine">
+<component name="mediasettingsengine" long-name="Media Settings Engine" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/mediasettings/mediasettingsengine/group"/>
 </component>
-<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y">
+<component name="videosettingsplugin" long-name="Video Settings Plugin" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/mediasettings/videosettingsplugin" proFile="videosettingsplugin.pro"/>
 </component>
 </collection>
 <collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
+<component name="videoplayerengine" long-name="Video Player Engine" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
 </component>
-<component name="hbvideoplayer" filter="s60" long-name="Video Player" introduced="^4">
+<component name="hbvideoplayer" long-name="Video Player" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayer" proFile="videoplayer.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
+<component name="hbvideoplaybackview" long-name="HB Video Playback View" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
 </component>
-<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
+<component name="hbvideoplaybackviewplugin" long-name="HB Video Playback View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
 </component>
-<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
+<component name="videohelix" long-name="Video Helix" introduced="^3" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
 </component>
 </collection>

--- a/symbian4/mw/accesssec/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,37 +50,37 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+   <block name="accesssec" level="generic" levels="plugin framework server generic specific" long-name="Access Security">
 <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
 </component>
-<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+<component name="eap_type_api" long-name="EAP Type API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_type_api/group"/>
 </component>
-<component name="eap_qt_configuration_api" long-name="EAP Qt Configuration API" filter="s60" introduced="^4" class="api">
+<component name="eap_qt_configuration_api" long-name="EAP Qt Configuration API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/accesssec/accesssec_plat" proFile="accesssec_plat.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
-<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<component name="accesssec_qtconfigutils" long-name="Access Security Config Utils" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
 </component>
-<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4" plugin="Y">
+<component name="cpwlansecurityuiplugins" long-name="Control Panel WLAN Security UI Plugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
 </component>
-<component name="cpeapuiplugins" filter="s60" long-name="Control Panel EAP UI Pugins" introduced="^4" plugin="Y">
+<component name="cpeapuiplugins" long-name="Control Panel EAP UI Pugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/accesssec/securitysettings/cpeapuiplugins" proFile="cpeapuiplugins.pro" qmakeArgs="-r"/>
 </component>
-<component name="eapqtdialogs" filter="s60" long-name="EAP Qt Dialogs" introduced="^4">
+<component name="eapqtdialogs" long-name="EAP Qt Dialogs" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/accesssec/securitysettings/eapqtdialogs" proFile="eapqtdialogs.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
+<component name="eapol_framework" long-name="EAPOL Framework" introduced="9.2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/accesssec/eapol/group"/>
 </component>
 </collection>

--- a/symbian4/mw/appinstall/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,69 +50,69 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+   <block name="appinstall" level="generic" levels="tool framework generic api" long-name="Application Installation">
 <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-<component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+<component name="iaupdate_api" long-name="IA Update API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
 </component>
-<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+<component name="task_plugin_api" long-name="Task Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
 </component>
-<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+<component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
 </component>
-<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+<component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
 </component>
-<component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+<component name="task_management_api" long-name="Task Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/task_management_api/group"/>
 </component>
-<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+<component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
 </component>
-<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+<component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
 </component>
-<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+<component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
 </component>
-<component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
+<component name="sifui_api" long-name="STIF UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/sifui_api/group"/>
 </component>
 </collection>
 <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+<component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
 </component>
 </collection>
 <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<component name="ncdengine_build" filter="s60" long-name="NCD Engine" introduced="^1">
+<component name="ncdengine_build" long-name="NCD Engine" introduced="^1" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/ncdengine/engine" proFile="engine.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
-<component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+<component name="appinstui" long-name="Application Installer UI" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
 </component>
-<component name="appinstui_qt" filter="s60" long-name="Application Installer Qt UI" introduced="^2">
+<component name="appinstui_qt" long-name="Application Installer Qt UI" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui" proFile="appinstui.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
 <!-- the collection is really a component. Move down a directory.-->
-<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+<component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
 </component>
 </collection>
 <collection name="iaupdate" long-name="Independent Apps Update" level="api">
 <!-- Should reorganise into actual components -->
-<component name="iad" long-name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<component name="iad" long-name="Independent App delivery" introduced="^4" filter="s60" purpose="development">
 <unit bldFile="/sf/mw/appinstall/iaupdate" proFile="iaupdate.pro" qmakeArgs="-r"/>
 </component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+<component name="iaupdate_build" long-name="IA Update Build" introduced="^2" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
 </component>
 </collection>
@@ -143,7 +143,7 @@
 </component>
 </collection>
 <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+<component name="makekeys" long-name="MakeKeys" introduced="6.0" filter="gt" purpose="optional" class="PC">
 <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
 </component>
 <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">

--- a/symbian4/mw/appsupport/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,209 +50,209 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+   <block name="appsupport" level="generic" levels="system plugin framework server generic specific" long-name="Generic Application Support">
 <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+<component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
 </component>
-<component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+<component name="network_status_api" long-name="Network Status API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_pub/network_status_api/group"/>
 </component>
 </collection>
 <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+<component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
 </component>
-<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+<component name="application_orientation_api" long-name="Application Orientation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
 </component>
-<component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+<component name="context_access_api" long-name="Context Access API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_access_api/group"/>
 </component>
-<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+<component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
 </component>
-<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+<component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
 </component>
-<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+<component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
 </component>
-<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+<component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
 </component>
-<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+<component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
 </component>
-<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+<component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
 </component>
-<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+<component name="context_subscription_api" long-name="Context Subscription API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
 </component>
-<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+<component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
 </component>
-<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+<component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
 </component>
-<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+<component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
 </component>
-<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+<component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
 </component>
-<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+<component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
 </component>
-<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+<component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
 </component>
-<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+<component name="operation_provider_api" long-name="Operation Provider API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
 </component>
-<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+<component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
 </component>
-<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+<component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
 </component>
-<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+<component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
 </component>
-<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+<component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
 </component>
-<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+<component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
 </component>
-<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+<component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
 </component>
-<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+<component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
 </component>
-<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+<component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
 </component>
-<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+<component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
 </component>
-<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+<component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
 </component>
-<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+<component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
 </component>
-<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+<component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
 </component>
-<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+<component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
 </component>
-<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
+<component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" introduced="^2" filter="s60,!sf_build" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
 </component>
-<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
+<component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" introduced="^2" filter="s60,!sf_build" purpose="optional" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
 </component>
 </collection>
 <collection name="contextframework" long-name="Context Framework" level="framework">
-<component name="cfw" filter="s60" long-name="Context Framework">
+<component name="cfw" long-name="Context Framework" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
 </component>
-<component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
+<component name="cfwplugins" long-name="Context Framework Plugins" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
 </component>
 </collection>
 <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-<component name="dbrecovery" filter="s60" long-name="Database Recovery">
+<component name="dbrecovery" long-name="Database Recovery" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
 </component>
-<component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
+<component name="nspswsplugin" long-name="NSPS WS Plugin" filter="s60" purpose="optional" plugin="Y">
 <!-- No Service Power Save? Window Server? Please elaborate-->
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
 </component>
-<component name="rfs" filter="s60" long-name="Restore Factory Settings">
+<component name="rfs" long-name="Restore Factory Settings" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
 </component>
-<component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
+<component name="rfsplugins" long-name="Restore Factory Settings Plugins" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
 </component>
-<component name="sysap" filter="s60" long-name="System Application">
+<component name="sysap" long-name="System Application" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
 </component>
-<component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
+<component name="variatedsettings" long-name="Variated Settings" filter="s60" purpose="optional" class="config">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
 </component>
-<component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
+<component name="accfwuinotifier" long-name="Accessory Framework UI Notifier" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
 </component>
-<component name="kefmapper" filter="s60" long-name="Key Event Framework">
+<component name="kefmapper" long-name="Key Event Framework" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/kefmapper/group"/>
 </component>
-<component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
+<component name="advancedtspcontroller" long-name="Advanced TSP Controller" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
 </component>
-<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
+<component name="powersaveutilities" long-name="Power Save Utilities" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
 </component>
-<component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
+<component name="gsserverenginestub" long-name="GS Server Engine Stub" deprecated="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
 </component>
-<component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
+<component name="gsserverengine" long-name="GS Server Engine" deprecated="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
 </component>
-<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
+<component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
 </component>
-<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
+<component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
 </component>
-<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" plugin="Y">
+<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/coreapplicationuis/devicepowermenuplugin" proFile="devicepowermenuplugin.pro"/>
 </component>
 </collection>
 <collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
 <!--  collection is really a component. Move down a directory -->
-<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
+<component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" introduced="^2" filter="s60" purpose="optional"/>
 </collection>
 <collection name="mediakeys" long-name="Media Keys" level="plugin">
 <!--  collection is really a component. Move down a directory -->
-<component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
+<component name="mediakeys_build" long-name="Media Keys Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/mediakeys/group"/>
 </component>
 </collection>
 <collection name="startupservices" long-name="Startup Services" level="system">
-<component name="splashscreen" filter="s60" long-name="Splash Screen">
+<component name="splashscreen" long-name="Splash Screen" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/startupservices/splashscreen/group"/>
 </component>
-<component name="startupanimation" filter="s60" long-name="Startup Animation">
+<component name="startupanimation" long-name="Startup Animation" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/startupservices/startupanimation/group"/>
 </component>
-<component name="startup" long-name="Startup Application" filter="s60">
+<component name="startup" long-name="Startup Application" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/startupservices/startup/group"/>
 </component>
 </collection>
 <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-<component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
+<component name="oodmonitor" long-name="OOD Monitor" introduced="7.0s" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
 </component>
-<component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
+<component name="oommonitor" long-name="OOM Monitor" introduced="7.0s" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/group"/>
 </component>
 </collection>
 <collection name="systemsettings" long-name="System Settings" level="system">
-<component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
+<component name="gssensorplugin" long-name="GS Sensor Plugin" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/systemsettings/gssensorplugin/group"/>
 </component>
-<component name="accindicatorplugin" filter="s60" long-name="ACC Indicator Plugin" plugin="Y">
+<component name="accindicatorplugin" long-name="ACC Indicator Plugin" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/systemsettings/accindicatorplugin" proFile="accindicatorplugin.pro"/>
 </component>
-<component name="accindicatorsettings" filter="s60" long-name="ACC Indicator Settings">
+<component name="accindicatorsettings" long-name="ACC Indicator Settings" filter="s60" purpose="optional">
 <!-- can't have a component inside another component -->
 <unit bldFile="/sf/mw/appsupport/systemsettings/accindicatorplugin/accindicatorsettings" proFile="accindicatorsettings.pro"/>
 </component>
@@ -269,7 +269,7 @@
 </component>
 </collection>
 <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
+<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" deprecated="^4" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
 </component>
 </collection>
@@ -277,7 +277,7 @@
 <component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/commonappservices/alarmserver/Group" mrp="/sf/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
 </component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+<component name="alarmservertest" long-name="Alarm Server Test" introduced="8.1" deprecated="^3" purpose="development">
 <unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
 </component>
 <component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
@@ -315,7 +315,7 @@
 </component>
 </collection>
 <collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+<component name="printinguisupport" long-name="Printing UI Support" introduced="^2" deprecated="^3" purpose="optional">
 <unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
 </component>
 </collection>

--- a/symbian4/mw/browser/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,12 +50,12 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
+   <block name="browser" level="specific" levels="plugin utils support main" long-name="Browser">
 <collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
-<component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
+<component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4" purpose="optional">
 <unit bldFile="/sf/mw/browser/bookmarksengine" proFile="bookmarksengine.pro"/>
 </component>
 </collection>

--- a/symbian4/mw/btservices/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,122 +50,122 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+   <block name="btservices" level="generic" levels="framework server generic specific plugin" long-name="Bluetooth Services">
 <collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
-<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+<component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
 </component>
-<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+<component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
 </component>
 </collection>
 <collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
-<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+<component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
 </component>
-<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+<component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
 </component>
-<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+<component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
 </component>
-<component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
+<component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
+<component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
+<component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
+<component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
 </component>
-<component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
+<component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
 </component>
-<component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
+<component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
 </component>
-<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+<component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
 </component>
-<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+<component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
 </component>
-<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+<component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
 </component>
-<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+<component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
 </component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/obex_secondary_display_notification_api/group"/>
 </component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/obex_service_plugin_api/group"/>
 </component>
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/obex_service_utils_api/group"/>
 </component>
-<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" class="api">
+<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat/usb_obexservicemanager_client_api/group"/>
 </component>
-<component name="bt_remote_device_setting_api" long-name="BT Remote Device Setting API" filter="s60" introduced="^4" class="api">
+<component name="bt_remote_device_setting_api" long-name="BT Remote Device Setting API" introduced="^4" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_plat" proFile="btservices_plat.pro"/>
 </component>
 </collection>
 <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-<component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
+<component name="btnotifclient" long-name="Bluetooth Notification Client" introduced="^4" filter="s60" purpose="optional">
 <!-- cannot put a component under another component. Move up a directory -->
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
 </component>
-<component name="bteng" filter="s60" long-name="Bluetooth Engine">
+<component name="bteng" long-name="Bluetooth Engine" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/bteng/group"/>
 </component>
-<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils" introduced="^4">
+<component name="btserviceutil" long-name="Bluetooth Service Utils" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btserviceutil/group" filter="!test"/>
 </component>
-<component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
+<component name="btnotif" long-name="Bluetooth Notifier" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/group"/>
 </component>
-<component name="btdevicedialogplugin" filter="s60" long-name="Bluetooth Device Dialog Plugin" introduced="^4" plugin="Y">
+<component name="btdevicedialogplugin" long-name="Bluetooth Device Dialog Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" proFile="btdevicedialogplugin.pro"/>
 </component>
-<component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
+<component name="btaudioman" long-name="Bluetooth Audio Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudioman/group" filter="!test"/>
 </component>
-<component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
+<component name="btmac" long-name="Bluetooth Mono Audio Controller" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btmac/group"/>
 </component>
-<component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
+<component name="btsac" long-name="Bluetooth Stereo Audio Controller" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btsac/group"/>
 </component>
-<component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
+<component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudiostreamer/group" filter="!test"/>
 </component>
-<component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
+<component name="btsap" long-name="Bluetooth SIM Access Profile" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btsap/group"/>
 </component>
-<component name="btui" filter="s60" long-name="Bluetooth UI">
+<component name="btui" long-name="Bluetooth UI" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btui" proFile="btui.pro"/>
 </component>
-<component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
+<component name="btpbap" long-name="Bluetooth Phonebook Access Profile" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btpbap/group"/>
 </component>
-<component name="bthid" filter="s60" long-name="Bluetooth HID">
+<component name="bthid" long-name="Bluetooth HID" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/bthid/group"/>
 </component>
-<component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
+<component name="btctrldcmoadapter" long-name="Bluetooth Control DCMO Adapter" introduced="^3" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
-<component name="btindicator" filter="s60" long-name="Bluetooth Indicator" introduced="^4">
+<component name="btindicator" long-name="Bluetooth Indicator" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btindicator" proFile="btindicator.pro"/>
 </component>
-<component name="bluetoothengine_conf" filter="s60" long-name="Bluetooth Engine Config" introduced="^4" class="config">
+<component name="bluetoothengine_conf" long-name="Bluetooth Engine Config" introduced="^4" filter="s60" purpose="optional" class="config">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/conf"/>
 </component>
 </collection>
@@ -175,34 +175,34 @@
 </component>
 </collection>
 <collection name="atcommands" long-name="AT Commands" level="generic">
-<component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="modematplugin" long-name="Modem AT Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/atcommands/modematplugin/group"/>
 </component>
-<component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="lccustomplugin" long-name="LC Custom Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/atcommands/lccustomplugin/group"/>
 </component>
 </collection>
 <collection name="cbsatplugin" long-name="CBS AT Plugin" level="plugin">
-<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
+<component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
 </component>
 </collection>
 <collection name="btobexprofiles" long-name="BT OBEX Profiles" level="generic">
-<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60">
+<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexreceiveservices/group"/>
 </component>
-<component name="btmsgviewer" long-name="BT Message Viewer" filter="s60" introduced="^4">
+<component name="btmsgviewer" long-name="BT Message Viewer" introduced="^4" filter="s60" purpose="optional">
 <!-- should be moved out from under obexreceiveservices into own component dir -->
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexreceiveservices/btmsgviewer" proFile="btmsgviewer.pro"/>
 </component>
-<component name="obexsendservices" long-name="OBEX Send Services" filter="s60">
+<component name="obexsendservices" long-name="OBEX Send Services" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexsendservices/group"/>
 </component>
-<component name="obexhighway" long-name="OBEX Highway" filter="s60" introduced="^4">
+<component name="obexhighway" long-name="OBEX Highway" introduced="^4" filter="s60" purpose="optional">
 <!-- should be moved out from under obexsendservices into own component dir -->
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
 </component>
-<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60">
+<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/btservices/btobexprofiles/obexserviceman/group"/>
 </component>
 </collection>

--- a/symbian4/mw/camerasrv/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,40 +50,40 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+   <block name="camerasrv" level="specific" levels="plugin fw api" long-name="Camera Services">
 <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
 </component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
 </component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
 </component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
 </component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
 </component>
 </collection>
 <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
 <!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+<component name="camcordermmfplugin_build" long-name="Camcorder MMF Plugin Build" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/build"/>
 </component>
 </collection>
 <collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+<component name="imagingconfigmanager" long-name="Imaging Config Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
 </component>
 </collection>
 <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+<component name="camerasrv_build" long-name="Camera Services Build" filter="s60" purpose="optional">
 <!-- should split into individual bld.infs -->
 <unit bldFile="/sf/mw/camerasrv/group"/>
 </component>

--- a/symbian4/mw/classicui/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,519 +50,519 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+   <block name="classicui" level="generic" levels="base support server generic specific" long-name="Classic UI">
 <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
 </component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
 </component>
-<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
 </component>
-<component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+<component name="item_finder_api" long-name="Item Finder API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
 </component>
-<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+<component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
 </component>
-<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+<component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
 </component>
-<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
+<component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
 </component>
-<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
+<component name="volume_popup_api" long-name="Volume Popup API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
 </component>
-<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+<component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
 </component>
-<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+<component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
 </component>
-<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+<component name="extended_lists_api" long-name="Extended Lists API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
 </component>
-<component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+<component name="input_block_api" long-name="Input Block API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
 </component>
-<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+<component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
 </component>
-<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+<component name="number_grouping_api" long-name="Number Grouping API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
 </component>
-<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+<component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
 </component>
-<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+<component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
 </component>
-<component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+<component name="task_list_api" long-name="Task List API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
 </component>
-<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
+<component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
 </component>
-<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
+<component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
 </component>
-<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+<component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_dialogs_api/group"/>
 </component>
-<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
+<component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
 </component>
-<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
+<component name="extended_editors_api" long-name="Extended Editors API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
 </component>
-<component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+<component name="alarm_api" long-name="Alarm API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
 </component>
-<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+<component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
 </component>
-<component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+<component name="list_effects_api" long-name="List Effects API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
 </component>
-<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+<component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
 </component>
-<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+<component name="server_application_services_api" long-name="Server Application Services API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
 </component>
-<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+<component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/common_ui_settings_api/group"/>
 </component>
-<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
+<component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
 </component>
-<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+<component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
 </component>
-<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+<component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
 </component>
-<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+<component name="battery_pane_api" long-name="Battery Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
 </component>
-<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+<component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
 </component>
-<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
+<component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
 </component>
-<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+<component name="avkon_status_api" long-name="AVKON Status API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_status_api/group"/>
 </component>
-<component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
+<component name="application_switching_api" long-name="Application Switching API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
 </component>
-<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+<component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
 </component>
-<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
+<component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
 </component>
-<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
+<component name="extended_animation_api" long-name="Extended Animation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
 </component>
-<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+<component name="extended_notes_api" long-name="Extended Notes API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
 </component>
-<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
+<component name="text_scroller_api" long-name="Text Scroller API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
 </component>
-<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+<component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
 </component>
-<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
+<component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
 </component>
-<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
+<component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
 </component>
-<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+<component name="special_character_table_api" long-name="Special Character Table API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
 </component>
-<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+<component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_settings_api/group"/>
 </component>
-<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
+<component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_sounds_api/group"/>
 </component>
-<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
+<component name="themes_settings_api" long-name="Themes Settings API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/themes_settings_api/group"/>
 </component>
-<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
+<component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
 </component>
-<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+<component name="extended_queries_api" long-name="Extended Queries API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_queries_api/group"/>
 </component>
-<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
+<component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
 </component>
-<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
+<component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_scroller_api/group"/>
 </component>
-<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
+<component name="key_rotator_api" long-name="Key Rotator API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
 </component>
-<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+<component name="extended_grids_api" long-name="Extended Grids API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
 </component>
-<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+<component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
 </component>
-<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+<component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
 </component>
-<component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
+<component name="popup_form_api" long-name="Popup Form API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
 </component>
-<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+<component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
 </component>
-<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+<component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
 </component>
-<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+<component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
 </component>
-<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+<component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
 </component>
-<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+<component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
 </component>
-<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
+<component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
 </component>
-<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+<component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
 </component>
-<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+<component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
 </component>
-<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
+<component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
 </component>
-<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+<component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
 </component>
-<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+<component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
 </component>
-<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+<component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
 </component>
-<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+<component name="uikon_status_api" long-name="UIKON Status API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/uikon_status_api/group"/>
 </component>
-<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
+<component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
 </component>
-<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+<component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
 </component>
-<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_testability_api/group"/>
 </component>
-<component name="ganes_api" filter="s60" class="api">
+<component name="ganes_api" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/ganes_api/group"/>
 </component>
-<component name="ode_api" long-name="Ode API" filter="s60" class="api">
+<component name="ode_api" long-name="Ode API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/ode_api/group"/>
 </component>
-<component name="physics_api" long-name="Physics API" filter="s60" class="api">
+<component name="physics_api" long-name="Physics API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/physics_api/group"/>
 </component>
-<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+<component name="touch_pane_api" long-name="Touch Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
 </component>
-<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+<component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
 </component>
-<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
+<component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/alternate_fs_api/group"/>
 </component>
-<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
+<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/discreet_popup_api/group"/>
 </component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
+<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
 <!-- should this be commented out? -->
 <!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
 </component>
-<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
+<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
 </component>
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/directory_localizer_api/group"/>
 </component>
-<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
+<component name="findutil_api" long-name="Find Util API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/findutil_api/group"/>
 </component>
 </collection>
 <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
+<component name="input_frame_api" long-name="Input Frame API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
 </component>
-<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+<component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
 </component>
-<component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+<component name="application_framework_api" long-name="Application Framework API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
 </component>
-<component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+<component name="scroller_api" long-name="Scroller API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
 </component>
-<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+<component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
 </component>
-<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+<component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
 </component>
-<component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+<component name="buttons_api" long-name="Buttons API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
 </component>
-<component name="queries_api" long-name="Queries API" filter="s60" class="api">
+<component name="queries_api" long-name="Queries API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
 </component>
-<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+<component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
 </component>
-<component name="editors_api" long-name="Editors API" filter="s60" class="api">
+<component name="editors_api" long-name="Editors API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
 </component>
-<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+<component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
 </component>
-<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+<component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
 </component>
-<component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+<component name="fonts_api" long-name="Fonts API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
 </component>
-<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+<component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
 </component>
-<component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+<component name="notifiers_api" long-name="Notifiers API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
 </component>
-<component name="notes_api" long-name="Notes API" filter="s60" class="api">
+<component name="notes_api" long-name="Notes API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
 </component>
-<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+<component name="status_pane_api" long-name="Status Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
 </component>
-<component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+<component name="base_controls_api" long-name="Base Controls API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
 </component>
-<component name="grids_api" long-name="Grids API" filter="s60" class="api">
+<component name="grids_api" long-name="Grids API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
 </component>
-<component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+<component name="context_pane_api" long-name="Context Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
 </component>
-<component name="lists_api" long-name="Lists API" filter="s60" class="api">
+<component name="lists_api" long-name="Lists API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
 </component>
-<component name="popups_api" long-name="Popups API" filter="s60" class="api">
+<component name="popups_api" long-name="Popups API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
 </component>
-<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+<component name="misc_controls_api" long-name="Misc Controls API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
 </component>
-<component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+<component name="keylock_api" long-name="Keylock API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
 </component>
-<component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+<component name="options_menu_api" long-name="Options Menu API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
 </component>
-<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+<component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
 </component>
-<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+<component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
 </component>
-<component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+<component name="tabs_api" long-name="Tabs API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
 </component>
-<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+<component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
 </component>
-<component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
+<component name="choice_list_api" long-name="Choice List API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
 </component>
-<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+<component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
 </component>
-<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+<component name="setting_pages_api" long-name="Setting Pages API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
 </component>
-<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+<component name="screen_mode_api" long-name="Screen Mode API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
 </component>
-<component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+<component name="indicators_api" long-name="Indicators API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
 </component>
-<component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+<component name="error_ui_api" long-name="Error UI API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
 </component>
-<component name="animation_api" long-name="Animation API" filter="s60" class="api">
+<component name="animation_api" long-name="Animation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
 </component>
-<component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+<component name="searchfield_api" long-name="Searchfield API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
 </component>
-<component name="labels_api" long-name="Labels API" filter="s60" class="api">
+<component name="labels_api" long-name="Labels API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
 </component>
-<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+<component name="hotkeys_api" long-name="Hotkeys API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
 </component>
-<component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+<component name="initialization_api" long-name="Initialization API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
 </component>
-<component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+<component name="volume_control_api" long-name="Volume Control API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
 </component>
-<component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+<component name="title_pane_api" long-name="Title Pane API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
 </component>
-<component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+<component name="sounds_api" long-name="Sounds API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
 </component>
-<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+<component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
 </component>
-<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+<component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
 </component>
-<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+<component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
 </component>
-<component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+<component name="generic_button_api" long-name="Generic Button API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
 </component>
-<component name="form_api" long-name="Form API" filter="s60" class="api">
+<component name="form_api" long-name="Form API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
 </component>
-<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+<component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
 </component>
-<component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+<component name="calendar_api" long-name="Calendar API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/calendar_api/group"/>
 </component>
-<component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+<component name="toolbar_api" long-name="Toolbar API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
 </component>
-<component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+<component name="server_application_api" long-name="Server Application API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/server_application_api/group"/>
 </component>
-<component name="slider_api" long-name="Slider API" filter="s60" class="api">
+<component name="slider_api" long-name="Slider API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
 </component>
-<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+<component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
 </component>
-<component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+<component name="dialogs_api" long-name="Dialogs API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
 </component>
-<component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+<component name="document_handler_api" long-name="Document handler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/document_handler_api/group"/>
 </component>
-<component name="images_api" long-name="Images API" filter="s60" class="api">
+<component name="images_api" long-name="Images API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
 </component>
-<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+<component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
 </component>
-<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+<component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
 </component>
-<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+<component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/intermediate_state_api/group"/>
 </component>
-<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
+<component name="help_launcher_api" long-name="Help Launcher API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_pub/help_launcher_api/group"/>
 </component>
 </collection>
 <collection name="ode" long-name="Open Dynamics Engine" level="support">
 <!-- the collection is really a component. Move down a directory.-->
-<component name="ode_build" filter="s60" long-name="ODE">
+<component name="ode_build" long-name="ODE" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/ode/group"/>
 </component>
 </collection>
 <collection name="uifw" long-name="UI Framework" level="server">
-<component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
+<component name="uiklaf" long-name="Uikon Look-and-Feel" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uifw/uiklaf/group"/>
 </component>
-<component name="eikctl" filter="s60" long-name="Eikon Controls">
+<component name="eikctl" long-name="Eikon Controls" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uifw/eikctl/group"/>
 </component>
-<component name="avkon" filter="s60" long-name="Avkon">
+<component name="avkon" long-name="Avkon" filter="s60" purpose="optional">
 <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
 <unit bldFile="/sf/mw/classicui/uifw/avkon/aknphysics/group"/>
 <unit bldFile="/sf/mw/classicui/uifw/avkon/group"/>
 <unit bldFile="/sf/mw/classicui/uifw/avkon/aknconf/group"/>
 </component>
-<component name="eikstd" filter="s60" long-name="Eikon Standard">
+<component name="eikstd" long-name="Eikon Standard" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uifw/eikstd/group"/>
 </component>
-<component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
+<component name="aknglobalui" long-name="Avkon Global UI" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uifw/aknglobalui/group"/>
 </component>
-<component name="ganes" filter="s60" long-name="Ganes">
+<component name="ganes" long-name="Ganes" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uifw/ganes/group"/>
 </component>
 </collection>
 <collection name="commonuis" long-name="Common UIs" level="specific">
-<component name="commonui" filter="s60" long-name="Common UI">
+<component name="commonui" long-name="Common UI" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/commonuis/commonui/group"/>
 </component>
-<component name="commondialogs" filter="s60" long-name="Common Dialogs">
+<component name="commondialogs" long-name="Common Dialogs" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/commonuis/commondialogs/group"/>
 </component>
 </collection>
 <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-<component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
+<component name="aifwservicehandler" long-name="Application Interworking Service Handler" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
 </component>
 </collection>
 <collection name="commonadapter" long-name="Common Adapter" level="support">
 <!-- the collection is really a component. Move down a directory.-->
-<component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
+<component name="commonadapter_build" long-name="Common Adapter Build" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/commonadapter/group"/>
 </component>
 </collection>
 <collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
 <!-- the collection is really a component. Move down a directory.-->
-<component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
+<component name="akntouchgesturefw_build" long-name="Avkon Touch Gesture Framework Build" introduced="^3" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/akntouchgesturefw/group"/>
 </component>
 </collection>
 <collection name="uiutils" long-name="UI Utils" level="specific">
-<component name="localizer" filter="s60" long-name="Directory Localizer">
+<component name="localizer" long-name="Directory Localizer" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uiutils/localizer/group"/>
 </component>
-<component name="findutil" filter="s60" long-name="Find Utility">
+<component name="findutil" long-name="Find Utility" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uiutils/findutil/group"/>
 </component>
-<component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
+<component name="gamerecognizer" long-name="Game Recognizer" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/classicui/uiutils/gamerecognizer/group"/>
 </component>
-<component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
+<component name="aknjapanesereading" long-name="Avkon Japanese Reading" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uiutils/aknjapanesereading/group"/>
 </component>
-<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
+<component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst" purpose="optional">
 <unit bldFile="/sf/mw/classicui/uiutils/hlplch/group"/>
 </component>
 </collection>