# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1274891443 -3600
# Node ID f99f9ea9b39f71846039229aa8a05e7c43e8bf05
# Parent  30e67220bf867940f908d9435c9601e60fe343b2
Remove all 2.0 pkgdefs in symbian4 and rename all 3.0 pkgdefs to package_definition.xml

diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/adaptation/beagleboard/package_definition.xml
--- a/symbian4/adaptation/beagleboard/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/adaptation/beagleboard/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,94 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-      <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-        <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">
-            <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">
-            <unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-          </component>
-          <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-            <unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="beagleboard" name="Beagle Board" levels="hw-if">
+    <collection id="omap3530" name="OMAP 3530" level="hw-if">
+      <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
+      </component>
+      <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530/kernel"/>
+      </component>
+      <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530/beagleboard"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/adaptation/beagleboard/package_definition_3.0.xml
--- a/symbian4/adaptation/beagleboard/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="beagleboard" name="Beagle Board" levels="hw-if">
-    <collection id="omap3530" name="OMAP 3530" level="hw-if">
-      <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
-      </component>
-      <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530/kernel"/>
-      </component>
-      <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530/beagleboard"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/adaptation/qemu/package_definition.xml
--- a/symbian4/adaptation/qemu/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/adaptation/qemu/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,88 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-      <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-        <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-          <component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-            <unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
+    <collection id="qemu_baseport" name="Baseport" level="hw-if">
+      <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/adaptation/qemu/package_definition_3.0.xml
--- a/symbian4/adaptation/qemu/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
-    <collection id="qemu_baseport" name="Baseport" level="hw-if">
-      <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/adaptation/stubs/package_definition.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,183 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-          <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-            <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-          </component>
-          <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-            <unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-          </component>
-        </collection>
-        <collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-          <component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-            <unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
-          </component>
-        </collection>
-        <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-          <component name="drm_stubs_build" long-name="DRM Stubs Build">
-            <unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
-          </component>
-        </collection>
-        <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-          <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-            <unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
-          </component>
-        </collection>
-        <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-          <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-            <unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-          </component>
-        </collection>
-        <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-          <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-          </component>
-        </collection>
-        <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-          <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-            <unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
-          </component>
-        </collection>
-        <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-          <component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-            <unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
-          </component>
-        </collection>
-        <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-          <component name="ddcaccessstub" long-name="DDC Access Stub">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-          </component>
-          <component name="tvoutconfig" long-name="TV Out Config">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-          </component>
-          <component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-          </component>
-          <component name="asyreference" long-name="ASY Reference" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-          </component>
-          <component name="examplecommonisc" long-name="Example Common ISC">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-          </component>
-          <component name="exampledsy" long-name="Example DSY">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-          </component>
-          <component name="featuremanagerstub" long-name="Feature Manager Stub">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-          </component>
-          <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-          </component>
-          <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-          </component>
-          <component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-          </component>
-          <component name="ssyreference" long-name="SSY Reference" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-          </component>
-          <component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-          </component>
-          <component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-          </component>
-          <component name="tvoutbehaviour" long-name="TV Out Behaviour">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-          </component>
-          <component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-          </component>
-        </collection>
-        <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-          <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-            <unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
-          </component>
-        </collection>
-        <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-          <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-            <unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="stubs" name="Stubs" levels="adaptation plugin mid engine">
+    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
+     <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
+      <unit bldFile="audiostubs/devsoundextensions_stubs/group"/>
+     </component>
+     <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
+      <unit bldFile="audiostubs/fmradiotunercontrolstub/group"/>
+     </component>
+    </collection>
+   <collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
+     <component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
+      <unit bldFile="btaudioadaptation_stub/group"/>
+     </component>
+    </collection>
+   <collection id="drm_stubs" name="DRM Stubs" level="plugin">
+     <component id="drm_stubs_build" name="DRM Stubs Build">
+      <unit bldFile="drm_stubs/group"/>
+     </component>
+    </collection>
+    <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
+     <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
+      <unit bldFile="ocrsrv_stub/group"/>
+     </component>
+    </collection>
+    <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+      <unit bldFile="omasuplasnconverterstubimpl/group"/>
+     </component>
+    </collection>
+    <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
+     <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
+      <unit bldFile="posmsgpluginreferenceimpl/group"/>
+     </component>
+    </collection>
+    <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
+     <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
+	    <unit bldFile="srsfenginestub/group"/>
+     </component>
+    </collection>
+    <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
+     <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
+      <unit bldFile="power_save_display_mode_stub/group"/>
+     </component>
+    </collection>
+    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+     <component id="ddcaccessstub" name="DDC Access Stub">
+      <unit bldFile="systemswstubs/ddcaccessstub/group"/>
+     </component>
+     <component id="tvoutconfig" name="TV Out Config">
+      <unit bldFile="systemswstubs/TVOutConfig/group" filter="oem_build"/>
+     </component>
+     <component id="accessorypolicyreference" name="Accessory Policy Reference">
+ 	  <meta rel="config">
+         <defined condition="__ACCESSORY_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+     </component>
+     <component id="asyreference" name="ASY Reference" class="plugin">
+ 	  <meta rel="config">
+         <defined condition="__ACCESSORY_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/asyreference/group" filter="oem_build"/>
+     </component>
+     <component id="examplecommonisc" name="Example Common ISC">
+      <unit bldFile="systemswstubs/examplecommonisc/group" filter="oem_build"/>
+     </component>
+     <component id="exampledsy" name="Example DSY">
+ 	  <meta rel="config">
+         <defined condition="RD_STARTUP_CHANGE"/>
+       </meta>
+      <unit bldFile="systemswstubs/exampledsy/group" filter="oem_build"/>
+     </component>
+     <component id="featuremanagerstub" name="Feature Manager Stub">
+      <unit bldFile="systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+     </component>
+     <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
+      <unit bldFile="systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+     </component>
+     <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
+      <unit bldFile="systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+     </component>
+     <component id="sensorchannelsreference" name="Sensor Channels Reference">
+      <unit bldFile="systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+     </component>
+     <component id="ssyreference" name="SSY Reference" class="plugin">
+ 	  <meta rel="config">
+         <defined condition="RD_SENSOR_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/ssyreference/group" filter="oem_build"/>
+     </component>
+     <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
+      <unit bldFile="systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+     </component>
+     <component id="tiltcompensationstub" name="Tilt Compensation Stub">
+      <unit bldFile="systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+     </component>
+     <component id="tvoutbehaviour" name="TV Out Behaviour">
+      <unit bldFile="systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+     </component>
+     <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
+      <unit bldFile="systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+     </component>
+    </collection>
+    <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
+ 	  <meta rel="config">
+         <defined condition="RD_TACTILE_FEEDBACK"/>
+       </meta>
+     <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
+      <unit bldFile="tactileclickplugin_stub/group"/>
+     </component>
+    </collection>
+    <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
+     <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
+      <unit bldFile="wlanhwinit_stub/group"/>
+     </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/adaptation/stubs/package_definition_3.0.xml
--- a/symbian4/adaptation/stubs/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="stubs" name="Stubs" levels="adaptation plugin mid engine">
-    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
-     <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
-      <unit bldFile="audiostubs/devsoundextensions_stubs/group"/>
-     </component>
-     <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
-      <unit bldFile="audiostubs/fmradiotunercontrolstub/group"/>
-     </component>
-    </collection>
-   <collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
-     <component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-      <unit bldFile="btaudioadaptation_stub/group"/>
-     </component>
-    </collection>
-   <collection id="drm_stubs" name="DRM Stubs" level="plugin">
-     <component id="drm_stubs_build" name="DRM Stubs Build">
-      <unit bldFile="drm_stubs/group"/>
-     </component>
-    </collection>
-    <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
-     <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
-      <unit bldFile="ocrsrv_stub/group"/>
-     </component>
-    </collection>
-    <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-      <unit bldFile="omasuplasnconverterstubimpl/group"/>
-     </component>
-    </collection>
-    <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
-     <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
-      <unit bldFile="posmsgpluginreferenceimpl/group"/>
-     </component>
-    </collection>
-    <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
-     <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
-	    <unit bldFile="srsfenginestub/group"/>
-     </component>
-    </collection>
-    <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
-     <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
-      <unit bldFile="power_save_display_mode_stub/group"/>
-     </component>
-    </collection>
-    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
-     <component id="ddcaccessstub" name="DDC Access Stub">
-      <unit bldFile="systemswstubs/ddcaccessstub/group"/>
-     </component>
-     <component id="tvoutconfig" name="TV Out Config">
-      <unit bldFile="systemswstubs/TVOutConfig/group" filter="oem_build"/>
-     </component>
-     <component id="accessorypolicyreference" name="Accessory Policy Reference">
- 	  <meta rel="config">
-         <defined condition="__ACCESSORY_FW"/>
-       </meta>
-      <unit bldFile="systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-     </component>
-     <component id="asyreference" name="ASY Reference" class="plugin">
- 	  <meta rel="config">
-         <defined condition="__ACCESSORY_FW"/>
-       </meta>
-      <unit bldFile="systemswstubs/asyreference/group" filter="oem_build"/>
-     </component>
-     <component id="examplecommonisc" name="Example Common ISC">
-      <unit bldFile="systemswstubs/examplecommonisc/group" filter="oem_build"/>
-     </component>
-     <component id="exampledsy" name="Example DSY">
- 	  <meta rel="config">
-         <defined condition="RD_STARTUP_CHANGE"/>
-       </meta>
-      <unit bldFile="systemswstubs/exampledsy/group" filter="oem_build"/>
-     </component>
-     <component id="featuremanagerstub" name="Feature Manager Stub">
-      <unit bldFile="systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-     </component>
-     <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
-      <unit bldFile="systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-     </component>
-     <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
-      <unit bldFile="systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-     </component>
-     <component id="sensorchannelsreference" name="Sensor Channels Reference">
-      <unit bldFile="systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-     </component>
-     <component id="ssyreference" name="SSY Reference" class="plugin">
- 	  <meta rel="config">
-         <defined condition="RD_SENSOR_FW"/>
-       </meta>
-      <unit bldFile="systemswstubs/ssyreference/group" filter="oem_build"/>
-     </component>
-     <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
-      <unit bldFile="systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-     </component>
-     <component id="tiltcompensationstub" name="Tilt Compensation Stub">
-      <unit bldFile="systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-     </component>
-     <component id="tvoutbehaviour" name="TV Out Behaviour">
-      <unit bldFile="systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-     </component>
-     <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
-      <unit bldFile="systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-     </component>
-    </collection>
-    <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
- 	  <meta rel="config">
-         <defined condition="RD_TACTILE_FEEDBACK"/>
-       </meta>
-     <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
-      <unit bldFile="tactileclickplugin_stub/group"/>
-     </component>
-    </collection>
-    <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
-     <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
-      <unit bldFile="wlanhwinit_stub/group"/>
-     </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/browserui/package_definition.xml
--- a/symbian4/app/browserui/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,88 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="browserui" level="services" long-name="Browser UI" levels="utils support 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" qmakeArgs="&quot;what+=plat_101&quot;"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="browserui" name="Browser UI" levels="utils support ui">
+  <collection id="browserui_info" name="Browser UI Info" level="ui">
+    <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
+      <unit bldFile="." qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+    </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/browserui/package_definition_3.0.xml
--- a/symbian4/app/browserui/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="browserui" name="Browser UI" levels="utils support ui">
-  <collection id="browserui_info" name="Browser UI Info" level="ui">
-    <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
-      <unit bldFile="." qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
-    </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/camera/package_definition.xml
--- a/symbian4/app/camera/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/camera/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,89 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-            <unit bldFile="/sf/app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-            <unit bldFile="/sf/app/camera/camerauis/cameraxui/cxengine/tsrc/unit" filter="test,unit_test" proFile="unit.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="camera" name="Camera Apps">
+  <collection id="camerauis" name="Camera UIs">
+   <component id="cameraxui" filter="s60" name="CameraX UIs">
+     <meta rel="testbuild">
+       <group name="camera_unit_tests"/>
+     </meta>
+     <unit bldFile="camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
+     <unit bldFile="camerauis/cameraxui/cxengine/tsrc/unit"  qt:proFile="unit.pro"  filter="test,unit_test"/>
+     </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/camera/package_definition_3.0.xml
--- a/symbian4/app/camera/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="camera" name="Camera Apps">
-  <collection id="camerauis" name="Camera UIs">
-   <component id="cameraxui" filter="s60" name="CameraX UIs">
-     <meta rel="testbuild">
-       <group name="camera_unit_tests"/>
-     </meta>
-     <unit bldFile="camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
-     <unit bldFile="camerauis/cameraxui/cxengine/tsrc/unit"  qt:proFile="unit.pro"  filter="test,unit_test"/>
-     </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,165 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <!-- 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">
-            <!--<unit bldFile="email_plat" qt:proFile="email_plat.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">
-            <!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-          </component>
-          <component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-            <!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-          </component>
-          <component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-            <!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-          </component>
-          <component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" 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">
-            <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-          </component>
-          <component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-            <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.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">
-            <!-- 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">
-            <!--<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">
-            <!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-          </component>
-          <component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" 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">
-            <!--<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">
-            <!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-          </component>
-          <component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" 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">
-            <!-- <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">
-            <!-- <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">
-            <!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-          </component>
-          <component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" 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">
-            <!-- <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">
-            <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-          </component>
-          <component name="nmhswidget" filter="test,s60,widget_tools" long-name="Nmail Homescreen Widget" class="placeholder">
-            <!-- temporary built from nmail.pro as a workaround to ServiceFW bug on service regisrtations, fix expected on wk18 MCL
-      <unit bldFile="emailuis/nmhswidget/tsrc/nmhswidgettestapp" qt:proFile="nmhswidgettestapp.pro" qt:qmakeArgs="-r"/>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="commonemail" name="Email Apps" levels="service support ui app">
+   <!-- need to resolve the qt parts into proper components, then uncomment the units -->
+  <collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+   <component id="nmail_client_api" name="NMail Client API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+   </component>
+  </collection>
+    <collection id="emailservices" name="Email Services" level="service">
+      <component id="nmailbase" filter="s60" name="NMail Base" introduced="^4">
+        <!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
+      </component>
+      <component id="emailcommon" filter="s60" name="Email Common" introduced="^4">
+       <!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
+      </component>
+      <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+       <!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
+      </component>
+      <component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+       <!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
+      </component>
+      <component id="nmclientapi" filter="s60" name="Nmail Client API" introduced="^4">
+       <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
+      </component>
+      <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
+       <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+      </component>
+    </collection>
+    <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
+      <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+		<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+        <!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
+      </component>
+      <component id="nmimapclientplugin" filter="s60" name="NM IMAP Client Plugin" introduced="^4" class="plugin">
+        <!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
+      </component>
+      <component id="nmipsmtms" filter="s60" name="NM IPS Client Plugin" introduced="^4" class="plugin">
+       <!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
+      </component>
+      <component id="nmipssettings" filter="s60" name="NM IPS Settings" introduced="^4">
+       <!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
+      </component>
+      <component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+        <!--<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 id="emailuis" name="Email UIs" level="app">
+      <component id="nmailuiengine" filter="s60" name="Nmail UI Engine" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
+      </component>
+      <component id="nmailuiwidgets" filter="s60" name="Nmail UI Widgets" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
+      </component>
+      <component id="nmailuiwidgetsplugin" filter="s60" name="Nmail UI Widgets Plugin" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
+      </component>
+      <component id="nmsettingui" filter="s60" name="Nmail Setting UI" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
+      </component>
+      <component id="nmailcpplugin" filter="s60" name="Nmail CP Plugin" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
+      </component>
+      <component id="nmailui" filter="s60" name="Nmail UI" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
+      </component>
+      <component id="nmindicatorplugin" filter="s60" name="Nmail Indicator Plugin" class="plugin" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+      </component>
+      <component id="nmframeworkadapter" filter="s60" name="Nmail Framework Adapter" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
+      </component>
+     <component id="nmhswidget" filter="test,s60,widget_tools" name="Nmail Homescreen Widget">
+	 <!-- temporary built from nmail.pro as a workaround to ServiceFW bug on service regisrtations, fix expected on wk18 MCL
+      <unit bldFile="emailuis/nmhswidget/tsrc/nmhswidgettestapp" qt:proFile="nmhswidgettestapp.pro" qt:qmakeArgs="-r"/>
 	  -->
-          </component>
-        </collection>
-        <collection name="commonemail_info" long-name="Email Apps Info" level="app">
-          <component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-            <!-- split into actual components -->
-            <unit bldFile="/sf/app/commonemail/." proFile="nmail.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+     </component>
+    </collection>
+    <collection id="commonemail_info" name="Email Apps Info" level="app">
+    <component id="commonemail_build" name="Email Apps Build"  introduced="^4">
+		<!-- split into actual components -->
+      <unit bldFile="."  qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
+    </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/commonemail/package_definition_3.0.xml
--- a/symbian4/app/commonemail/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="commonemail" name="Email Apps" levels="service support ui app">
-   <!-- need to resolve the qt parts into proper components, then uncomment the units -->
-  <collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
-   <component id="nmail_client_api" name="NMail Client API" class="api" filter="s60" introduced="^4">
-    <!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-   </component>
-  </collection>
-    <collection id="emailservices" name="Email Services" level="service">
-      <component id="nmailbase" filter="s60" name="NMail Base" introduced="^4">
-        <!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-      </component>
-      <component id="emailcommon" filter="s60" name="Email Common" introduced="^4">
-       <!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-      </component>
-      <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
-       <!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-      </component>
-      <component id="emailstore" filter="s60" name="Email Store" introduced="^2">
-       <!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-      </component>
-      <component id="nmclientapi" filter="s60" name="Nmail Client API" introduced="^4">
-       <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-      </component>
-      <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
-       <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-      </component>
-    </collection>
-    <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
-      <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
-		<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-        <!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-      </component>
-      <component id="nmimapclientplugin" filter="s60" name="NM IMAP Client Plugin" introduced="^4" class="plugin">
-        <!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-      </component>
-      <component id="nmipsmtms" filter="s60" name="NM IPS Client Plugin" introduced="^4" class="plugin">
-       <!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-      </component>
-      <component id="nmipssettings" filter="s60" name="NM IPS Settings" introduced="^4">
-       <!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-      </component>
-      <component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
-        <!--<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 id="emailuis" name="Email UIs" level="app">
-      <component id="nmailuiengine" filter="s60" name="Nmail UI Engine" introduced="^4">
-        <!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-      </component>
-      <component id="nmailuiwidgets" filter="s60" name="Nmail UI Widgets" introduced="^4">
-        <!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-      </component>
-      <component id="nmailuiwidgetsplugin" filter="s60" name="Nmail UI Widgets Plugin" introduced="^4" class="plugin">
-        <!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-      </component>
-      <component id="nmsettingui" filter="s60" name="Nmail Setting UI" introduced="^4" class="plugin">
-        <!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-      </component>
-      <component id="nmailcpplugin" filter="s60" name="Nmail CP Plugin" introduced="^4" class="plugin">
-        <!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-      </component>
-      <component id="nmailui" filter="s60" name="Nmail UI" introduced="^4">
-        <!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-      </component>
-      <component id="nmindicatorplugin" filter="s60" name="Nmail Indicator Plugin" class="plugin" introduced="^4">
-        <!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-      </component>
-      <component id="nmframeworkadapter" filter="s60" name="Nmail Framework Adapter" introduced="^4" class="plugin">
-        <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-      </component>
-     <component id="nmhswidget" filter="test,s60,widget_tools" name="Nmail Homescreen Widget">
-	 <!-- temporary built from nmail.pro as a workaround to ServiceFW bug on service regisrtations, fix expected on wk18 MCL
-      <unit bldFile="emailuis/nmhswidget/tsrc/nmhswidgettestapp" qt:proFile="nmhswidgettestapp.pro" qt:qmakeArgs="-r"/>
-	  -->
-     </component>
-    </collection>
-    <collection id="commonemail_info" name="Email Apps Info" level="app">
-    <component id="commonemail_build" name="Email Apps Build"  introduced="^4">
-		<!-- split into actual components -->
-      <unit bldFile="."  qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
-    </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/conntools/package_definition.xml
--- a/symbian4/app/conntools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/conntools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,94 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-        <collection name="nettools" long-name="Net Tools" level="app">
-          <component name="conntest" filter="s60" long-name="Connection Test" 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">
-            <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="conntools" name="Connectivity Tools" levels="config app">
+    <collection id="nettools" name="Net Tools" level="app">
+      <component id="conntest" filter="s60" name="Connection Test" purpose="development">
+        <unit bldFile="nettools/conntest/group"/>
+      </component>
+    </collection>
+    <collection id="emulatorlan" name="Emulator LAN" level="config">
+    	<!-- component is actually a colleciton, should be moved down a directory -->
+      <component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
+        <unit bldFile="emulatorlan/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/conntools/package_definition_3.0.xml
--- a/symbian4/app/conntools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="conntools" name="Connectivity Tools" levels="config app">
-    <collection id="nettools" name="Net Tools" level="app">
-      <component id="conntest" filter="s60" name="Connection Test" purpose="development">
-        <unit bldFile="nettools/conntest/group"/>
-      </component>
-    </collection>
-    <collection id="emulatorlan" name="Emulator LAN" level="config">
-    	<!-- component is actually a colleciton, should be moved down a directory -->
-      <component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
-        <unit bldFile="emulatorlan/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,149 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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 ui">
-        <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"/>
-        </collection>
-        <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-          <component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-            <!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-          </component>
-          <component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
-            <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-          </component>
-          <component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-            <!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-          </component>
-          <component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
-            <!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-          </component>
-          <component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
-            <!-- break up into components -->
-            <unit bldFile="/sf/app/contacts/phonebookui" proFile="phonebookui.pro"/>
-          </component>
-        </collection>
-        <collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-          <component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-            <!-- not really a component, move down a dir? Break up into compnents? -->
-            <unit bldFile="/sf/app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.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">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
-          </component>
-          <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-            <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-          </component>
-          <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
-          </component>
-          <component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-          </component>
-          <component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-          </component>
-          <component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
-          </component>
-          <component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-          </component>
-          <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
-          </component>
-        </collection>
-        <collection name="pimprotocols" long-name="PIM Protocols" level="services">
-          <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" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-          </component>
-        </collection>
-        <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-          <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="contacts" name="Contacts Apps" levels="engine support services ui">
+  <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
+   <component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml"/>
+    <unit base="contacts_plat/qt_mobility_contacts_api"/>
+   </component>
+  </collection>
+  <collection id="phonebookui" name="Phonebook UI" level="ui">
+   <component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
+    <!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+   </component>
+   <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
+    <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
+   </component>
+   <component id="phonebookapp" filter="s60" name="Phonebook Application" introduced="^4">
+    <!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
+   </component>
+   <component id="phonebookservices" filter="s60" name="Phonebook Services" introduced="^4">
+    <!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
+   </component>
+   <component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
+    <!-- break up into components -->
+    <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
+   </component>
+  </collection>
+  <collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
+   <component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
+	<!-- not really a component, move down a dir? Break up into compnents? -->
+    <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
+   </component>
+  </collection>
+  <collection id="phonebookengines" name="Phonebook Engines" level="engine">
+   <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
+    <unit bldFile="phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
+   </component>
+   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+    <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+   </component>
+   <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+    <unit bldFile="phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
+   </component>
+   <component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
+    <unit bldFile="phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+   </component>
+   <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
+    <unit bldFile="phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
+   </component>
+   <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
+    <unit bldFile="phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
+   </component>
+   <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
+    <unit bldFile="phonebookengines/simutility" qt:proFile="simutility.pro"/>
+   </component>
+   <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
+      <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+   </component>
+  </collection>
+  <collection id="pimprotocols" name="PIM Protocols" level="services">
+   <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+    <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+   </component>
+   <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+    <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+   </component>
+  </collection>
+  <collection id="contacts_info" name="Contacts Apps Info" level="ui">
+   <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/contacts/package_definition_3.0.xml
--- a/symbian4/app/contacts/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="contacts" name="Contacts Apps" levels="engine support services ui">
-  <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
-   <component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
-    <meta rel="Api" href="contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml"/>
-    <unit base="contacts_plat/qt_mobility_contacts_api"/>
-   </component>
-  </collection>
-  <collection id="phonebookui" name="Phonebook UI" level="ui">
-   <component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
-    <!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-   </component>
-   <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
-    <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
-   </component>
-   <component id="phonebookapp" filter="s60" name="Phonebook Application" introduced="^4">
-    <!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-   </component>
-   <component id="phonebookservices" filter="s60" name="Phonebook Services" introduced="^4">
-    <!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
-   </component>
-   <component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
-    <!-- break up into components -->
-    <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
-   </component>
-  </collection>
-  <collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
-   <component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
-	<!-- not really a component, move down a dir? Break up into compnents? -->
-    <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
-   </component>
-  </collection>
-  <collection id="phonebookengines" name="Phonebook Engines" level="engine">
-   <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
-    <unit bldFile="phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
-   </component>
-   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
-    <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
-   </component>
-   <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
-    <unit bldFile="phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
-   </component>
-   <component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
-    <unit bldFile="phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
-   </component>
-   <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
-    <unit bldFile="phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
-   </component>
-   <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
-    <unit bldFile="phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
-   </component>
-   <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
-    <unit bldFile="phonebookengines/simutility" qt:proFile="simutility.pro"/>
-   </component>
-   <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
-      <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
-   </component>
-  </collection>
-  <collection id="pimprotocols" name="PIM Protocols" level="services">
-   <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
-    <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-   </component>
-   <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-    <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-   </component>
-  </collection>
-  <collection id="contacts_info" name="Contacts Apps Info" level="ui">
-   <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/contentcontrol/package_definition.xml
--- a/symbian4/app/contentcontrol/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,114 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-        <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
-          </component>
-          <component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="contentcontrol" name="Content Control Daemons" levels="plugin framework app">
+  <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+   <component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="contentctrl_plat/ds_contactsdatastoreextension_api/ds_contactsdatastoreextension_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+   </component>
+   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+    <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
+   </component>
+  </collection>
+  <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+   <component id="secon" filter="s60" name="Service Controllers">
+    <unit bldFile="connectivitymodules/secon/group"/>
+   </component>
+  </collection>
+  <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+   <!-- Component at wrong rank, should move down a directory -->
+   <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+    <unit bldFile="dsdcmoadapter/group"/>
+   </component>
+  </collection>
+  <collection id="omads" name="OMA Data Sync" level="app">
+   <component id="omads_build" filter="s60" name="OMA DS Build">
+    <unit bldFile="omads/group"/> <!-- need to remove #include and rename and OMA DS ROM -->
+   </component>
+   <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions/group"/>
+   </component>
+   <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/contentcontrol/package_definition_3.0.xml
--- a/symbian4/app/contentcontrol/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="contentcontrol" name="Content Control Daemons" levels="plugin framework app">
-  <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
-   <component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
-    <meta rel="Api" href="contentctrl_plat/ds_contactsdatastoreextension_api/ds_contactsdatastoreextension_api.metaxml"/>
-    <unit bldFile="contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-   </component>
-   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
-    <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
-    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
-   </component>
-  </collection>
-  <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
-   <component id="secon" filter="s60" name="Service Controllers">
-    <unit bldFile="connectivitymodules/secon/group"/>
-   </component>
-  </collection>
-  <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
-   <!-- Component at wrong rank, should move down a directory -->
-   <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
-    <unit bldFile="dsdcmoadapter/group"/>
-   </component>
-  </collection>
-  <collection id="omads" name="OMA Data Sync" level="app">
-   <component id="omads_build" filter="s60" name="OMA DS Build">
-    <unit bldFile="omads/group"/> <!-- need to remove #include and rename and OMA DS ROM -->
-   </component>
-   <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
-    <unit bldFile="omads/omadsextensions/group"/>
-   </component>
-   <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
-    <unit bldFile="omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/devicecontrol/package_definition.xml
--- a/symbian4/app/devicecontrol/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,103 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-        <collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-          <component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/adapters/bld"/>
-          </component>
-          <component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-          </component>
-          <component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-          </component>
-          <component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
+    <collection id="deviceupdatesui" name="Device Updates UI" level="app">
+      <component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
+        <unit bldFile="deviceupdatesui/adapters/bld"/>
+      </component>
+      <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
+        <unit bldFile="deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+      </component>
+      <component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
+        <unit bldFile="deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+      </component>
+      <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+        <unit bldFile="deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+      </component>
+      <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+        <unit bldFile="deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+      </component>
+      <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
+        <unit bldFile="deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/devicecontrol/package_definition_3.0.xml
--- a/symbian4/app/devicecontrol/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
-    <collection id="deviceupdatesui" name="Device Updates UI" level="app">
-      <component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
-        <unit bldFile="deviceupdatesui/adapters/bld"/>
-      </component>
-      <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
-        <unit bldFile="deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
-      </component>
-      <component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
-        <unit bldFile="deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
-      </component>
-      <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-        <unit bldFile="deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
-      </component>
-      <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-        <unit bldFile="deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
-      </component>
-      <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
-        <unit bldFile="deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/files/package_definition.xml
--- a/symbian4/app/files/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/files/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,93 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="files" level="apps" long-name="File Manager Apps" levels="support 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" long-name="File Manager Backup Engine" introduced="^4">
-            <unit bldFile="/sf/app/files/filemanager/src/fmbkupengine/group"/>
-          </component>
-          <component name="filemanager_build" filter="s60" long-name="File Manager Build">
-            <!-- break this up into components or move down a directory -->
-            <unit bldFile="/sf/app/files/filemanager" proFile="filemanager.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="files" name="File Manager Apps" levels="support apps">
+  <collection id="filemanager" name="File Manager" level="apps">
+   <component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
+    <unit base="filemanager/filemanager_plat"/>
+   </component>
+   <component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
+       <unit bldFile="filemanager/src/fmbkupengine/group"/>
+   </component>
+   <component id="filemanager_build" filter="s60" name="File Manager Build">
+   <!-- break this up into components or move down a directory -->
+    <unit bldFile="filemanager" qt:proFile="filemanager.pro"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/files/package_definition_3.0.xml
--- a/symbian4/app/files/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="files" name="File Manager Apps" levels="support apps">
-  <collection id="filemanager" name="File Manager" level="apps">
-   <component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
-    <unit base="filemanager/filemanager_plat"/>
-   </component>
-   <component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
-       <unit bldFile="filemanager/src/fmbkupengine/group"/>
-   </component>
-   <component id="filemanager_build" filter="s60" name="File Manager Build">
-   <!-- break this up into components or move down a directory -->
-    <unit bldFile="filemanager" qt:proFile="filemanager.pro"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/firsttimeuse/package_definition.xml
--- a/symbian4/app/firsttimeuse/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,94 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <!-- 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"/>
-        <collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-        <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>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="firsttimeuse" name="First Time Use" levels="support services ui app">
+	<!-- these empty collections are really components. Move down a directory and supply units -->
+   <collection id="ftuapplication" name="First Time Use Application" level="app"/>
+   <collection id="fturuntimeservices" name="First Time Use Runtime Services" level="services"/>
+   <collection id="wizardproviders" name="Wizard Providers" level="support"/>
+   <collection id="stateproviders" name="State Providers" level="support"/>
+   <collection id="runtimeproviders" name="Runtime Providers" level="support"/>
+
+   <collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
+    <component id="firsttimeuse_build" name="First Time Use Build">
+      <unit bldFile="." qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+    </collection>
+   </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/firsttimeuse/package_definition_3.0.xml
--- a/symbian4/app/firsttimeuse/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="firsttimeuse" name="First Time Use" levels="support services ui app">
-	<!-- these empty collections are really components. Move down a directory and supply units -->
-   <collection id="ftuapplication" name="First Time Use Application" level="app"/>
-   <collection id="fturuntimeservices" name="First Time Use Runtime Services" level="services"/>
-   <collection id="wizardproviders" name="Wizard Providers" level="support"/>
-   <collection id="stateproviders" name="State Providers" level="support"/>
-   <collection id="runtimeproviders" name="Runtime Providers" level="support"/>
-
-   <collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
-    <component id="firsttimeuse_build" name="First Time Use Build">
-      <unit bldFile="." qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
-     </component>
-    </collection>
-   </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/helps/package_definition.xml
--- a/symbian4/app/helps/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,99 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-        <collection name="userguide" long-name="User Guide" level="if">
-          <!-- collection is really a component. Move down a directory -->
-          <component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/helps/userguide" proFile="Userguide.pro"/>
-          </component>
-        </collection>
-        <collection name="symhelp" long-name="Symbian Help" level="eng">
-          <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/app/helps/symhelp/helpmodel/group" mrp="/sf/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-          </component>
-        </collection>
-        <collection name="helps_info" long-name="Help Apps Info" level="ui">
-          <component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="helps" name="Help Apps" levels="eng tools if ui">
+   <collection id="userguide" name="User Guide" level="if">
+	<!-- collection is really a component. Move down a directory -->
+    <component id="userguide_build" name="User Guide Build"  filter="s60" introduced="^4">
+      <unit bldFile="userguide" qt:proFile="Userguide.pro"/>
+     </component>
+    </collection>
+    <collection id="symhelp" name="Symbian Help" level="eng">
+      <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
+        <unit bldFile="symhelp/helpmodel/group" mrp="symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+      </component>
+    </collection>
+    <collection id="helps_info" name="Help Apps Info" level="ui">
+      <component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="helps_info/helps_metadata/helps_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/helps/package_definition_3.0.xml
--- a/symbian4/app/helps/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="helps" name="Help Apps" levels="eng tools if ui">
-   <collection id="userguide" name="User Guide" level="if">
-	<!-- collection is really a component. Move down a directory -->
-    <component id="userguide_build" name="User Guide Build"  filter="s60" introduced="^4">
-      <unit bldFile="userguide" qt:proFile="Userguide.pro"/>
-     </component>
-    </collection>
-    <collection id="symhelp" name="Symbian Help" level="eng">
-      <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
-        <unit bldFile="symhelp/helpmodel/group" mrp="symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-      </component>
-    </collection>
-    <collection id="helps_info" name="Help Apps Info" level="ui">
-      <component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="helps_info/helps_metadata/helps_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/homescreen/package_definition.xml
--- a/symbian4/app/homescreen/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,120 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <collection name="homescreen_info" long-name="Home Screen Info" level="support">
-          <component name="homescreen_build" long-name="Homescreen Build">
-            <!-- break this up properly into components -->
-            <unit bldFile="/sf/app/homescreen/." proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-          </component>
-        </collection>
-        <collection name="homescreen_test" long-name="Home Screen Test" level="support">
-          <component name="tsrc_build" long-name="Tsrc Build" filter="test,unit_test">
-            <unit bldFile="/sf/app/homescreen/tsrc" proFile="tsrc.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-        </collection>
-        <!-- fiill in details with broken up homescreen_build -->
-        <collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-          <component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-          <component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-          <component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-          <component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-          <component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-          <component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-          <component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-          <component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-          <component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-        </collection>
-        <collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-          <component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-          <component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-          <component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-          <component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-          <component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-          <component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-        </collection>
-        <collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-          <component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-          <component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-          <component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-          <component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="homescreen" name="Home Screen Apps" levels="support task ss hs">
+
+   <collection id="homescreen_info" name="Home Screen Info" level="support">
+    <component id="homescreen_build" name="Homescreen Build">
+		<!-- break this up properly into components -->
+      <unit bldFile="."  qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+    </collection>
+    <collection id="homescreen_test" name="Home Screen Test" level="support">
+    <component id="tsrc_build" name="Tsrc Build" filter="test,unit_test">
+      <unit bldFile="tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+    </collection>
+	<!-- fiill in details with broken up homescreen_build -->
+  <collection id="homescreenapp" name="Home Screen Application" level="hs">
+	<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
+	<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
+	<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
+	<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
+	<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
+	<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
+	<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
+	<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
+	<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
+    </collection>
+  <collection id="screensaverapp" name="Screen Saver Application" level="ss">
+	<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
+	<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
+	<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
+	<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
+	<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
+	<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
+    </collection>
+  <collection id="taskswitcherapp" name="Task Switcher Application" level="task">
+	<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
+	<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
+	<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
+	<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
+    </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/homescreen/package_definition_3.0.xml
--- a/symbian4/app/homescreen/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="homescreen" name="Home Screen Apps" levels="support task ss hs">
-
-   <collection id="homescreen_info" name="Home Screen Info" level="support">
-    <component id="homescreen_build" name="Homescreen Build">
-		<!-- break this up properly into components -->
-      <unit bldFile="."  qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
-     </component>
-    </collection>
-    <collection id="homescreen_test" name="Home Screen Test" level="support">
-    <component id="tsrc_build" name="Tsrc Build" filter="test,unit_test">
-      <unit bldFile="tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-     </component>
-    </collection>
-	<!-- fiill in details with broken up homescreen_build -->
-  <collection id="homescreenapp" name="Home Screen Application" level="hs">
-	<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
-	<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
-	<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
-	<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
-	<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
-	<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
-	<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
-	<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
-	<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
-    </collection>
-  <collection id="screensaverapp" name="Screen Saver Application" level="ss">
-	<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
-	<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
-	<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
-	<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
-	<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
-	<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
-    </collection>
-  <collection id="taskswitcherapp" name="Task Switcher Application" level="task">
-	<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
-	<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
-	<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
-	<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
-    </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/homescreentools/package_definition.xml
--- a/symbian4/app/homescreentools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/homescreentools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,104 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-        <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <!-- this needs to be built first, does build order need to be forced with filters? -->
-          <component name="dtdinstaller_build" filter="s60,bldmefirst" long-name="DTD Installer Build" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/dtdinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="themeinstaller" long-name="Theme Installer" level="install">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/themeinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="widgettools" long-name="Widget Tools" level="install">
-          <component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-          </component>
-          <component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
+    <collection id="dtdinstaller" name="DTD Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+    	<!-- this needs to be built first, does build order need to be forced with filters? -->
+      <component id="dtdinstaller_build" filter="s60,bldmefirst" name="DTD Installer Build" target="desktop" class="tool">
+        <unit bldFile="dtdinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themeinstaller" name="Theme Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+        <unit bldFile="themeinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="widgettools" name="Widget Tools" level="install">
+      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="widgettools/hspluginspreinstaller/group"/>
+      </component>
+      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="widgettools/wrtwidgetpreinstaller/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/homescreentools/package_definition_3.0.xml
--- a/symbian4/app/homescreentools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
-    <collection id="dtdinstaller" name="DTD Installer" level="install">
-    	<!-- collection is really a component. Needs to be moved down a directory -->
-    	<!-- this needs to be built first, does build order need to be forced with filters? -->
-      <component id="dtdinstaller_build" filter="s60,bldmefirst" name="DTD Installer Build" target="desktop" class="tool">
-        <unit bldFile="dtdinstaller/group"/>
-      </component>
-    </collection>
-    <collection id="themeinstaller" name="Theme Installer" level="install">
-    	<!-- collection is really a component. Needs to be moved down a directory -->
-      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
-        <unit bldFile="themeinstaller/group"/>
-      </component>
-    </collection>
-    <collection id="widgettools" name="Widget Tools" level="install">
-      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
-        <unit bldFile="widgettools/hspluginspreinstaller/group"/>
-      </component>
-      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
-        <unit bldFile="widgettools/wrtwidgetpreinstaller/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/imgeditor/package_definition.xml
--- a/symbian4/app/imgeditor/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,188 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
-        <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-          <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="sf_build" class="api">
-            <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-          </component>
-          <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="sf_build" class="api">
-            <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-          </component>
-          <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="sf_build" class="api">
-            <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-          </component>
-          <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="sf_build" class="api">
-            <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-          </component>
-          <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="sf_build" class="api">
-            <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-          </component>
-        </collection>
-        <collection name="imageeditor" long-name="Image Editor UI" level="ui">
-          <component name="pb" filter="sf_build" long-name="Plugin Base">
-            <unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
-          </component>
-          <component name="iepb" filter="sf_build" long-name="Image Editor Plugin Base">
-            <unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
-          </component>
-          <component name="imageeditorui" filter="sf_build" long-name="Image Editor UI">
-            <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
-          </component>
-          <component name="imageeditormanager" filter="sf_build" long-name="Image Editor Manager">
-            <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
-          </component>
-          <component name="imageeditorapp" filter="sf_build" long-name="Image Editor Application">
-            <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
-          </component>
-          <component name="imageeditor_plugins" filter="sf_build" long-name="Image Editor Plugins" plugin="Y">
-            <!-- can only have one unit. Need to include all from a single bld.inf -->
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-            <!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<SystemDefinition schema="3.0.0">
+  <package id="imgeditor" name="Image Editor Apps" levels="engine ui">
+    <collection id="imgeditor_plat" name="Image Editor Apps Platform Interfaces" level="ui">
+      <component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="sf_build">
+        <meta rel="Api" href="imgeditor_plat/image_editor_debug_utilities_api/image_editor_debug_utilities_api.metaxml"/>
+        <unit bldFile="imgeditor_plat/image_editor_debug_utilities_api/group"/>
+      </component>
+      <component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="sf_build">
+        <meta rel="Api" href="imgeditor_plat/image_editor_utilities_api/image_editor_utilities_api.metaxml"/>
+        <unit bldFile="imgeditor_plat/image_editor_utilities_api/group"/>
+      </component>
+      <component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="sf_build">
+        <meta rel="Api" href="imgeditor_plat/image_editor_definitions_api/image_editor_definitions_api.metaxml"/>
+        <unit bldFile="imgeditor_plat/image_editor_definitions_api/group"/>
+      </component>
+      <component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="sf_build">
+        <meta rel="Api" href="imgeditor_plat/image_editor_system_parameters_api/image_editor_system_parameters_api.metaxml"/>
+        <unit bldFile="imgeditor_plat/image_editor_system_parameters_api/group"/>
+      </component>
+      <component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="sf_build">
+        <meta rel="Api" href="imgeditor_plat/image_processing_engine_api/image_processing_engine_api.metaxml"/>
+        <unit bldFile="imgeditor_plat/image_processing_engine_api/group"/>
+      </component>
+    </collection>
+    <collection id="imageeditor" name="Image Editor UI" level="ui">
+      <component id="pb" filter="sf_build" name="Plugin Base">
+        <unit bldFile="imageeditor/pb/group"/>
+      </component>
+      <component id="iepb" filter="sf_build" name="Image Editor Plugin Base">
+        <unit bldFile="imageeditor/iepb/group"/>
+      </component>
+      <component id="imageeditorui" filter="sf_build" name="Image Editor UI">
+        <unit bldFile="imageeditor/imageeditorui/group"/>
+      </component>
+      <component id="imageeditormanager" filter="sf_build" name="Image Editor Manager">
+        <unit bldFile="imageeditor/imageeditormanager/group"/>
+      </component>
+      <component id="imageeditorapp" filter="sf_build" name="Image Editor Application">
+        <unit bldFile="imageeditor/imageeditorapp/group"/>
+      </component>
+      <component id="imageeditor_plugins" filter="sf_build" name="Image Editor Plugins" class="plugin">
+      	<!-- can only have one unit. Need to include all from a single bld.inf -->
+        <unit bldFile="imageeditor/plugins/blackwhiteplugin/group"/>
+        <unit bldFile="imageeditor/plugins/brightnessplugin/group"/>
+        <unit bldFile="imageeditor/plugins/bubbleplugin/group"/>
+        <unit bldFile="imageeditor/plugins/cartoonizeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/clipartplugin/group"/>
+        <unit bldFile="imageeditor/plugins/contrastplugin/group"/>
+        <unit bldFile="imageeditor/plugins/cropplugin/group"/>
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+        <unit bldFile="imageeditor/plugins/frameplugin/group"/>
+        <unit bldFile="imageeditor/plugins/negativeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/redeyeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/resizeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/rotatelplugin/group"/>
+        <unit bldFile="imageeditor/plugins/rotaterplugin/group"/>
+        <unit bldFile="imageeditor/plugins/sepiaplugin/group"/>
+        <unit bldFile="imageeditor/plugins/sharpnessplugin/group"/>
+        <unit bldFile="imageeditor/plugins/textplugin/group"/>
+        <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
-          </component>
-          <component name="editorprovider" filter="sf_build" long-name="Image Editor Provider">
-            <unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
-          </component>
-          <component name="imageeditor_build" filter="sf_build" long-name="Image Editor Build">
-            <!-- should distribute this to the other components -->
-            <unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
-          </component>
-        </collection>
-        <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-          <component name="filters" filter="sf_build" long-name="Image Editor Filters">
-            <!-- can only have one unit. Need to include all from a single bld.inf -->
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-            <!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+      </component>
+      <component id="editorprovider" filter="sf_build" name="Image Editor Provider">
+        <unit bldFile="imageeditor/editorprovider/group"/>
+      </component>
+      <component id="imageeditor_build" filter="sf_build" name="Image Editor Build">
+      	<!-- should distribute this to the other components -->
+        <unit bldFile="imageeditor/group"/>
+      </component>
+    </collection>
+    <collection id="imageeditorengine" name="Image Editor Engine" level="engine">
+      <component id="filters" filter="sf_build" name="Image Editor Filters">
+      	<!-- can only have one unit. Need to include all from a single bld.inf -->
+        <unit bldFile="imageeditorengine/filters/filterbrightness/group"/>
+        <unit bldFile="imageeditorengine/filters/filterbubble/group"/>
+        <unit bldFile="imageeditorengine/filters/filterbuffer/group"/>
+        <unit bldFile="imageeditorengine/filters/filtercartoon/group"/>
+        <unit bldFile="imageeditorengine/filters/filterclipart/group"/>
+        <unit bldFile="imageeditorengine/filters/filtercontrast/group"/>
+        <unit bldFile="imageeditorengine/filters/filtercrop/group"/>
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+        <unit bldFile="imageeditorengine/filters/filterframe/group"/>
+        <unit bldFile="imageeditorengine/filters/filtergrayscale/group"/>
+        <unit bldFile="imageeditorengine/filters/filtericlsource/group"/>
+        <unit bldFile="imageeditorengine/filters/filterjpegsource/group"/>
+        <unit bldFile="imageeditorengine/filters/filterjpegtarget/group"/>
+        <unit bldFile="imageeditorengine/filters/filternegate/group"/>
+        <unit bldFile="imageeditorengine/filters/filterredeye/group"/>
+        <unit bldFile="imageeditorengine/filters/filterrotate/group"/>
+        <unit bldFile="imageeditorengine/filters/filterscale/group"/>
+        <unit bldFile="imageeditorengine/filters/filtersepia/group"/>
+        <unit bldFile="imageeditorengine/filters/filtersharpness/group"/>
+        <unit bldFile="imageeditorengine/filters/filtertext/group"/>
+        <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
-          </component>
-          <component name="imageeditorutils" filter="sf_build" long-name="Image Editor Utilities">
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-          </component>
-          <component name="systemparameters" filter="sf_build" long-name="System Parameters">
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
-          </component>
-          <component name="enginewrapper" filter="sf_build" long-name="Image Editor Engine Wrapper">
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
-          </component>
-          <component name="imageeditorengine_build" filter="sf_build" long-name="Image Editor Engine Build">
-            <!-- should distribute this to the other components -->
-            <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+      </component>
+      <component id="imageeditorutils" filter="sf_build" name="Image Editor Utilities">
+        <unit bldFile="imageeditorengine/imageeditorutils/group"/>
+      </component>
+      <component id="systemparameters" filter="sf_build" name="System Parameters">
+        <unit bldFile="imageeditorengine/systemparameters/group"/>
+      </component>
+      <component id="enginewrapper" filter="sf_build" name="Image Editor Engine Wrapper">
+        <unit bldFile="imageeditorengine/enginewrapper/group"/>
+      </component>
+      <component id="imageeditorengine_build" filter="sf_build" name="Image Editor Engine Build">
+      	<!-- should distribute this to the other components -->
+        <unit bldFile="imageeditorengine/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/imgeditor/package_definition_3.0.xml
--- a/symbian4/app/imgeditor/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="imgeditor" name="Image Editor Apps" levels="engine ui">
-    <collection id="imgeditor_plat" name="Image Editor Apps Platform Interfaces" level="ui">
-      <component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="sf_build">
-        <meta rel="Api" href="imgeditor_plat/image_editor_debug_utilities_api/image_editor_debug_utilities_api.metaxml"/>
-        <unit bldFile="imgeditor_plat/image_editor_debug_utilities_api/group"/>
-      </component>
-      <component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="sf_build">
-        <meta rel="Api" href="imgeditor_plat/image_editor_utilities_api/image_editor_utilities_api.metaxml"/>
-        <unit bldFile="imgeditor_plat/image_editor_utilities_api/group"/>
-      </component>
-      <component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="sf_build">
-        <meta rel="Api" href="imgeditor_plat/image_editor_definitions_api/image_editor_definitions_api.metaxml"/>
-        <unit bldFile="imgeditor_plat/image_editor_definitions_api/group"/>
-      </component>
-      <component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="sf_build">
-        <meta rel="Api" href="imgeditor_plat/image_editor_system_parameters_api/image_editor_system_parameters_api.metaxml"/>
-        <unit bldFile="imgeditor_plat/image_editor_system_parameters_api/group"/>
-      </component>
-      <component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="sf_build">
-        <meta rel="Api" href="imgeditor_plat/image_processing_engine_api/image_processing_engine_api.metaxml"/>
-        <unit bldFile="imgeditor_plat/image_processing_engine_api/group"/>
-      </component>
-    </collection>
-    <collection id="imageeditor" name="Image Editor UI" level="ui">
-      <component id="pb" filter="sf_build" name="Plugin Base">
-        <unit bldFile="imageeditor/pb/group"/>
-      </component>
-      <component id="iepb" filter="sf_build" name="Image Editor Plugin Base">
-        <unit bldFile="imageeditor/iepb/group"/>
-      </component>
-      <component id="imageeditorui" filter="sf_build" name="Image Editor UI">
-        <unit bldFile="imageeditor/imageeditorui/group"/>
-      </component>
-      <component id="imageeditormanager" filter="sf_build" name="Image Editor Manager">
-        <unit bldFile="imageeditor/imageeditormanager/group"/>
-      </component>
-      <component id="imageeditorapp" filter="sf_build" name="Image Editor Application">
-        <unit bldFile="imageeditor/imageeditorapp/group"/>
-      </component>
-      <component id="imageeditor_plugins" filter="sf_build" name="Image Editor Plugins" class="plugin">
-      	<!-- can only have one unit. Need to include all from a single bld.inf -->
-        <unit bldFile="imageeditor/plugins/blackwhiteplugin/group"/>
-        <unit bldFile="imageeditor/plugins/brightnessplugin/group"/>
-        <unit bldFile="imageeditor/plugins/bubbleplugin/group"/>
-        <unit bldFile="imageeditor/plugins/cartoonizeplugin/group"/>
-        <unit bldFile="imageeditor/plugins/clipartplugin/group"/>
-        <unit bldFile="imageeditor/plugins/contrastplugin/group"/>
-        <unit bldFile="imageeditor/plugins/cropplugin/group"/>
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-        <unit bldFile="imageeditor/plugins/frameplugin/group"/>
-        <unit bldFile="imageeditor/plugins/negativeplugin/group"/>
-        <unit bldFile="imageeditor/plugins/redeyeplugin/group"/>
-        <unit bldFile="imageeditor/plugins/resizeplugin/group"/>
-        <unit bldFile="imageeditor/plugins/rotatelplugin/group"/>
-        <unit bldFile="imageeditor/plugins/rotaterplugin/group"/>
-        <unit bldFile="imageeditor/plugins/sepiaplugin/group"/>
-        <unit bldFile="imageeditor/plugins/sharpnessplugin/group"/>
-        <unit bldFile="imageeditor/plugins/textplugin/group"/>
-        <!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-         -->
-      </component>
-      <component id="editorprovider" filter="sf_build" name="Image Editor Provider">
-        <unit bldFile="imageeditor/editorprovider/group"/>
-      </component>
-      <component id="imageeditor_build" filter="sf_build" name="Image Editor Build">
-      	<!-- should distribute this to the other components -->
-        <unit bldFile="imageeditor/group"/>
-      </component>
-    </collection>
-    <collection id="imageeditorengine" name="Image Editor Engine" level="engine">
-      <component id="filters" filter="sf_build" name="Image Editor Filters">
-      	<!-- can only have one unit. Need to include all from a single bld.inf -->
-        <unit bldFile="imageeditorengine/filters/filterbrightness/group"/>
-        <unit bldFile="imageeditorengine/filters/filterbubble/group"/>
-        <unit bldFile="imageeditorengine/filters/filterbuffer/group"/>
-        <unit bldFile="imageeditorengine/filters/filtercartoon/group"/>
-        <unit bldFile="imageeditorengine/filters/filterclipart/group"/>
-        <unit bldFile="imageeditorengine/filters/filtercontrast/group"/>
-        <unit bldFile="imageeditorengine/filters/filtercrop/group"/>
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-        <unit bldFile="imageeditorengine/filters/filterframe/group"/>
-        <unit bldFile="imageeditorengine/filters/filtergrayscale/group"/>
-        <unit bldFile="imageeditorengine/filters/filtericlsource/group"/>
-        <unit bldFile="imageeditorengine/filters/filterjpegsource/group"/>
-        <unit bldFile="imageeditorengine/filters/filterjpegtarget/group"/>
-        <unit bldFile="imageeditorengine/filters/filternegate/group"/>
-        <unit bldFile="imageeditorengine/filters/filterredeye/group"/>
-        <unit bldFile="imageeditorengine/filters/filterrotate/group"/>
-        <unit bldFile="imageeditorengine/filters/filterscale/group"/>
-        <unit bldFile="imageeditorengine/filters/filtersepia/group"/>
-        <unit bldFile="imageeditorengine/filters/filtersharpness/group"/>
-        <unit bldFile="imageeditorengine/filters/filtertext/group"/>
-        <!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-         -->
-      </component>
-      <component id="imageeditorutils" filter="sf_build" name="Image Editor Utilities">
-        <unit bldFile="imageeditorengine/imageeditorutils/group"/>
-      </component>
-      <component id="systemparameters" filter="sf_build" name="System Parameters">
-        <unit bldFile="imageeditorengine/systemparameters/group"/>
-      </component>
-      <component id="enginewrapper" filter="sf_build" name="Image Editor Engine Wrapper">
-        <unit bldFile="imageeditorengine/enginewrapper/group"/>
-      </component>
-      <component id="imageeditorengine_build" filter="sf_build" name="Image Editor Engine Build">
-      	<!-- should distribute this to the other components -->
-        <unit bldFile="imageeditorengine/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/internetradio/package_definition.xml
--- a/symbian4/app/internetradio/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,105 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-        <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">
-            <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">
-            <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">
-            <!--  Move down a dir or break into components-->
-            <unit bldFile="/sf/app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-          </component>
-          <component name="qtinternetradio_internal" long-name="Qt Internet Radio Internal" filter="test" class="placeholder">
-            <!-- appears to be missing. Remove? 
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="internetradio" name="Internet Radio Apps" levels="engine server ui">
+   <collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
+	<!-- collection is really a component. Move down a dir -->
+    <component id="internetradio2_0_build" name="Internet Radio 2.0 Build">
+      <unit bldFile="internetradio2.0/group"/>
+     </component>
+    </collection>
+    <collection id="presetserver" name="Preset Server" level="server">
+	<!-- collection is really a component. Move down a dir -->
+    <component id="presetserver_build" name="Preset Server Build">
+      <unit bldFile="presetserver/group"/>
+     </component>
+    </collection>
+    <collection id="qtinternetradio" name="Qt Internet Radio">
+    <component id="qtinternetradio_build" name="Qt Internet Radio Build">
+	<!--  Move down a dir or break into components-->
+      <unit bldFile="qtinternetradio"  qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+     <component id="qtinternetradio_internal" name="Qt Internet Radio Internal" filter="test">
+	  <!-- appears to be missing. Remove? 
 	  <unit bldFile="qtinternetradio/internal/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r -config rom"/> -->
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+     </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/internetradio/package_definition_3.0.xml
--- a/symbian4/app/internetradio/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="internetradio" name="Internet Radio Apps" levels="engine server ui">
-   <collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
-	<!-- collection is really a component. Move down a dir -->
-    <component id="internetradio2_0_build" name="Internet Radio 2.0 Build">
-      <unit bldFile="internetradio2.0/group"/>
-     </component>
-    </collection>
-    <collection id="presetserver" name="Preset Server" level="server">
-	<!-- collection is really a component. Move down a dir -->
-    <component id="presetserver_build" name="Preset Server Build">
-      <unit bldFile="presetserver/group"/>
-     </component>
-    </collection>
-    <collection id="qtinternetradio" name="Qt Internet Radio">
-    <component id="qtinternetradio_build" name="Qt Internet Radio Build">
-	<!--  Move down a dir or break into components-->
-      <unit bldFile="qtinternetradio"  qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
-     </component>
-     <component id="qtinternetradio_internal" name="Qt Internet Radio Internal" filter="test">
-	  <!-- appears to be missing. Remove? 
-	  <unit bldFile="qtinternetradio/internal/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r -config rom"/> -->
-     </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/jrt/package_definition.xml
--- a/symbian4/app/jrt/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,136 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-        <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/jrt/jrt_plat/java_debug_api/build"/>
-          </component>
-        </collection>
-        <collection name="build_nativejava" long-name="Build Native Java">
-          <component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="jrt" name="Java Runtime" levels="util generic rt ui">
+  <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+   <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+    <meta rel="Api" href="jrt_plat/java_registry_api/java_registry_api.metaxml"/>
+    <unit bldFile="jrt_plat/java_registry_api/build"/>
+   </component>
+   <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+    <meta rel="Api" href="jrt_plat/java_env_info_api/java_env_info_api.metaxml"/>
+    <unit bldFile="jrt_plat/java_env_info_api/build"/>
+   </component>
+   <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+    <meta rel="Api" href="jrt_plat/java_debug_api/java_debug_api.metaxml"/>
+    <unit bldFile="jrt_plat/java_debug_api/build"/>
+   </component>
+  </collection>
+
+   <collection id="build_nativejava" name="Build Native Java">
+   <component id="nativejava"  name="Build Native Java" filter="s60" introduced="^4">
+      <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+   </component>
+  </collection>
+  <collection id="javacommons" name="Java Commons" level="generic">
+   <component id="javacommons_build" filter="s60" name="JRT Build">
+      <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+  <collection id="javaruntimes" name="Java Runtimes" level="rt">
+   <component id="javaruntimes_build" filter="s60" name="JRT Build">
+      <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+		<collection id="javauis" name="Java UIs" level="ui">
+   <component id="javauis_build" filter="s60" name="JRT Build">
+      <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+
+  </collection>
+		<collection id="javamanager" level="generic">
+   <component id="javamanager_build" filter="s60" name="JRT Build">
+      <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+		<collection id="javatools" name="Java Tools" level="util">
+   <component id="javatools_build" filter="s60" name="JRT Build">
+      <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+		<collection id="javaextensions" name="Java Extensions" level="generic">
+   <component id="javaextensions_build" filter="s60" name="JRT Build">
+      <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/jrt/package_definition_3.0.xml
--- a/symbian4/app/jrt/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="jrt" name="Java Runtime" levels="util generic rt ui">
-  <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
-   <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
-    <meta rel="Api" href="jrt_plat/java_registry_api/java_registry_api.metaxml"/>
-    <unit bldFile="jrt_plat/java_registry_api/build"/>
-   </component>
-   <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
-    <meta rel="Api" href="jrt_plat/java_env_info_api/java_env_info_api.metaxml"/>
-    <unit bldFile="jrt_plat/java_env_info_api/build"/>
-   </component>
-   <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
-    <meta rel="Api" href="jrt_plat/java_debug_api/java_debug_api.metaxml"/>
-    <unit bldFile="jrt_plat/java_debug_api/build"/>
-   </component>
-  </collection>
-
-   <collection id="build_nativejava" name="Build Native Java">
-   <component id="nativejava"  name="Build Native Java" filter="s60" introduced="^4">
-      <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-   </component>
-  </collection>
-  <collection id="javacommons" name="Java Commons" level="generic">
-   <component id="javacommons_build" filter="s60" name="JRT Build">
-      <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-     </component>
-  </collection>
-  <collection id="javaruntimes" name="Java Runtimes" level="rt">
-   <component id="javaruntimes_build" filter="s60" name="JRT Build">
-      <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-     </component>
-  </collection>
-		<collection id="javauis" name="Java UIs" level="ui">
-   <component id="javauis_build" filter="s60" name="JRT Build">
-      <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-     </component>
-
-  </collection>
-		<collection id="javamanager" level="generic">
-   <component id="javamanager_build" filter="s60" name="JRT Build">
-      <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-     </component>
-  </collection>
-		<collection id="javatools" name="Java Tools" level="util">
-   <component id="javatools_build" filter="s60" name="JRT Build">
-      <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-     </component>
-  </collection>
-		<collection id="javaextensions" name="Java Extensions" level="generic">
-   <component id="javaextensions_build" filter="s60" name="JRT Build">
-      <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-      <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
-     </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/location/package_definition.xml
--- a/symbian4/app/location/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/location/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-        <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="location" name="Location Apps" levels="ui events loc api">
+  <collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
+   <component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
+    <unit bldFile="location_plat" qt:proFile="location_plat.pro"/>
+   </component>
+  </collection>
+  <collection id="locationpickerservice" name="Location Picker Service" level="loc">
+	<!--collection is really a component. Should move down a directory -->
+   <component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
+    <unit bldFile="locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+   </component>
+  </collection>
+  <collection id="locationdataharvester" name="Location Data Harvester" level="events">
+	<!--collection is really a component. Should move down a directory -->
+     <component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
+      <unit bldFile="locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+     </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/location/package_definition_3.0.xml
--- a/symbian4/app/location/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="location" name="Location Apps" levels="ui events loc api">
-  <collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
-   <component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
-    <unit bldFile="location_plat" qt:proFile="location_plat.pro"/>
-   </component>
-  </collection>
-  <collection id="locationpickerservice" name="Location Picker Service" level="loc">
-	<!--collection is really a component. Should move down a directory -->
-   <component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
-    <unit bldFile="locationpickerservice" qt:proFile="locationpickerservice.pro"/>
-   </component>
-  </collection>
-  <collection id="locationdataharvester" name="Location Data Harvester" level="events">
-	<!--collection is really a component. Should move down a directory -->
-     <component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
-      <unit bldFile="locationdataharvester" qt:proFile="locationdataharvester.pro"/>
-     </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/messaging/package_definition.xml
--- a/symbian4/app/messaging/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,213 +1,172 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <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">
-            <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-          </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">
-            <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-          </component>
-        </collection>
-        <collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-          <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-          </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">
-            <!-- 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="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>
-          <component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/Group" mrp="/sf/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmsengine" long-name="MMS Engine" level="eng">
-          <component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-          </component>
-          <component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-            <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-          </component>
-          <component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-          </component>
-          <component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-          </component>
-          <component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-          </component>
-          <component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-          </component>
-          <component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-          </component>
-          <component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-            <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-          </component>
-          <component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-          </component>
-          <component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-          </component>
-          <component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-            <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-          </component>
-          <component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-            <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-          </component>
-          <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/app/messaging/mmsengine/mmssettings/group" mrp="/sf/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-          </component>
-          <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">
-            <!-- 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="messagingapp_build" filter="s60" long-name="MMS Engine Build">
-            <!-- this should be broken up into the individual other components -->
-            <unit bldFile="/sf/app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-            <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">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-            <unit bldFile="/sf/app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgui" proFile="msgui.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">
-            <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">
-            <unit bldFile="/sf/app/messaging/email/imap4mtm/group" mrp="/sf/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-          </component>
-        </collection>
-        <collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-          <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="messaging" name="Messaging Apps" levels="plugin eng base app api">
+  <collection id="msg_plat" name="Messaging Apps Platform APIs" level="api">
+   <component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/messaging_media_resolver_api/messaging_media_resolver_api.metaxml"/>
+    <unit base="msg_plat/messaging_media_resolver_api"/>
+   </component>
+   <component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/mms_application_api/mms_application_api.metaxml"/>
+    <unit base="msg_plat/mms_application_api"/>
+   </component>
+   <component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/mms_codec_client_api/mms_codec_client_api.metaxml"/>
+    <unit base="msg_plat/mms_codec_client_api"/>
+   </component>
+   <component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/mms_conformance_api/mms_conformance_api.metaxml"/>
+    <unit base="msg_plat/mms_conformance_api"/>
+   </component>
+   <component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/mms_engine_settings_api/mms_engine_settings_api.metaxml"/>
+    <unit base="msg_plat/mms_engine_settings_api"/>
+   </component>
+   <component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/mms_server_settings_api/mms_server_settings_api.metaxml"/>
+    <unit base="msg_plat/mms_server_settings_api"/>
+   </component>
+   <component id="conversation_services_client_api" name="Conversation Services Client API" class="api" filter="s60" introduced="^4">
+    <unit base="msg_plat/conversation_services_client_api"/>
+   </component>
+   <component id="conversation_services_plugin_api" name="Conversation Services Plugin API" class="api" filter="s60" introduced="^4">
+    <unit base="msg_plat/conversation_services_plugin_api"/>
+   </component>
+   <component id="conversation_services_utilities_api" name="Conversation Services Utilities API" class="api" filter="s60" introduced="^4">
+    <unit base="msg_plat/conversation_services_utilities_api"/>
+   </component>
+   <component id="shareui_api" name="Share UI API" class="api" filter="s60" introduced="^4">
+    <unit base="msg_plat/shareui_api"/>
+   </component>
+   <component id="messaging_history_api" name="Messaging History API" class="api" filter="s60" introduced="^4">
+    <unit base="msg_plat/messaging_history_api"/>
+   </component>
+   <component id="msg_plat_build" name="Messaging Apps Platform APIs Build" class="api" filter="s60" introduced="^4">
+	<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+    <unit base="msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="msg_pub" name="Messaging Apps Public APIs" level="api">
+   <component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
+    <meta rel="Api" href="msg_pub/mms_client_mtm_api/mms_client_mtm_api.metaxml"/>
+    <unit base="msg_pub/mms_client_mtm_api"/>
+   </component>
+   <component id="msg_smil_dtd_api" name="Messaging SMIL DTD API" class="api" filter="s60" introduced="^4">
+    <unit base="msg_pub/msg_smil_dtd_api"/>
+   </component>
+   <component id="msg_pub_build" name="Messaging Apps Public APIs Build" class="api" filter="s60" introduced="^4">
+	<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+    <unit base="msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
+   <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+    <unit bldFile="mobilemessaging/smsmtm/group" mrp="mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+   </component>
+  </collection>
+  <collection id="messagingappbase" name="Messaging App Base" level="base">
+   <component id="messagingappbase_build" filter="s60" name="Messaging App Base Build"  introduced="^4">
+	<!-- break this up into the below components -->
+    <unit bldFile="messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="msgmedia" filter="s60" name="Message Media">
+      <unit base="messagingappbase/msgmedia"/>
+   </component>
+   <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+    <unit bldFile="messagingappbase/smilparser/GROUP" mrp="messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+   </component>
+   <component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="messagingappbase/obexmtms/Group" mrp="messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmsengine" name="MMS Engine" level="eng">
+   <component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
+    <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+   </component>
+   <component id="genutils" filter="s60" name="General Utils">
+    <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+   </component>
+   <component id="mmsserversettings" filter="s60" name="MMS Server Settings">
+    <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+   </component>
+   <component id="mmsmessage" filter="s60" name="MMS Message">
+    <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+   </component>
+   <component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
+    <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+   </component>
+   <component id="mmscodec" filter="s60" name="MMS Codec">
+    <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+   </component>
+   <component id="mmsserver" filter="s60" name="MMS Server">
+    <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+   </component>
+   <component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
+    <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+   </component>
+   <component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
+    <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+   </component>
+   <component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
+    <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+   </component>
+   <component id="applicationadapter" filter="s60" name="MMS Application Adapter">
+    <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+   </component>
+   <component id="mmscodecclient" filter="s60" name="MMS Codec Client">
+    <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+   </component>
+   <component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
+    <unit bldFile="mmsengine/mmssettings/group" mrp="mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+   </component>
+   <component id="mmsconf" name="MMS Configuration" purpose="optional">
+    <unit bldFile="mmsengine/mmsconf" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+   </component>
+   <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+    <!-- this should be broken up into the individual other components -->
+    <unit bldFile="mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="messagingapp" name="Messaging Application" level="app">
+   <component id="messagingapp_build" filter="s60" name="MMS Engine Build">
+    <!-- this should be broken up into the individual other components -->
+    <unit bldFile="messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
+   </component>
+     <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
+      <unit bldFile="messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
+      <unit bldFile="messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
+      <unit bldFile="messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
+      <unit bldFile="messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="smartmessaging" filter="s60" name="Smart Messaging">
+      <unit bldFile="messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="shareui" filter="s60" name="Shared UI" introduced="^4">
+      <unit bldFile="messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
+      <unit bldFile="messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+     </component>
+  </collection>
+  <collection id="email" name="Email" level="plugin">
+   <!-- use commonemail instead -->
+   <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+    <unit bldFile="email/pop3andsmtpmtm/group" mrp="email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+   </component>
+   <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+    <unit bldFile="email/imap4mtm/group" mrp="email/imap4mtm/group/messaging_email_imap.mrp"/>
+   </component>
+  </collection>
+  <collection id="messaging_info" name="Messaging Apps Info" level="api">
+   <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/messaging/package_definition_3.0.xml
--- a/symbian4/app/messaging/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="messaging" name="Messaging Apps" levels="plugin eng base app api">
-  <collection id="msg_plat" name="Messaging Apps Platform APIs" level="api">
-   <component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
-    <meta rel="Api" href="msg_plat/messaging_media_resolver_api/messaging_media_resolver_api.metaxml"/>
-    <unit base="msg_plat/messaging_media_resolver_api"/>
-   </component>
-   <component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
-    <meta rel="Api" href="msg_plat/mms_application_api/mms_application_api.metaxml"/>
-    <unit base="msg_plat/mms_application_api"/>
-   </component>
-   <component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
-    <meta rel="Api" href="msg_plat/mms_codec_client_api/mms_codec_client_api.metaxml"/>
-    <unit base="msg_plat/mms_codec_client_api"/>
-   </component>
-   <component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
-    <meta rel="Api" href="msg_plat/mms_conformance_api/mms_conformance_api.metaxml"/>
-    <unit base="msg_plat/mms_conformance_api"/>
-   </component>
-   <component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
-    <meta rel="Api" href="msg_plat/mms_engine_settings_api/mms_engine_settings_api.metaxml"/>
-    <unit base="msg_plat/mms_engine_settings_api"/>
-   </component>
-   <component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
-    <meta rel="Api" href="msg_plat/mms_server_settings_api/mms_server_settings_api.metaxml"/>
-    <unit base="msg_plat/mms_server_settings_api"/>
-   </component>
-   <component id="conversation_services_client_api" name="Conversation Services Client API" class="api" filter="s60" introduced="^4">
-    <unit base="msg_plat/conversation_services_client_api"/>
-   </component>
-   <component id="conversation_services_plugin_api" name="Conversation Services Plugin API" class="api" filter="s60" introduced="^4">
-    <unit base="msg_plat/conversation_services_plugin_api"/>
-   </component>
-   <component id="conversation_services_utilities_api" name="Conversation Services Utilities API" class="api" filter="s60" introduced="^4">
-    <unit base="msg_plat/conversation_services_utilities_api"/>
-   </component>
-   <component id="shareui_api" name="Share UI API" class="api" filter="s60" introduced="^4">
-    <unit base="msg_plat/shareui_api"/>
-   </component>
-   <component id="messaging_history_api" name="Messaging History API" class="api" filter="s60" introduced="^4">
-    <unit base="msg_plat/messaging_history_api"/>
-   </component>
-   <component id="msg_plat_build" name="Messaging Apps Platform APIs Build" class="api" filter="s60" introduced="^4">
-	<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-    <unit base="msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
-  <collection id="msg_pub" name="Messaging Apps Public APIs" level="api">
-   <component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
-    <meta rel="Api" href="msg_pub/mms_client_mtm_api/mms_client_mtm_api.metaxml"/>
-    <unit base="msg_pub/mms_client_mtm_api"/>
-   </component>
-   <component id="msg_smil_dtd_api" name="Messaging SMIL DTD API" class="api" filter="s60" introduced="^4">
-    <unit base="msg_pub/msg_smil_dtd_api"/>
-   </component>
-   <component id="msg_pub_build" name="Messaging Apps Public APIs Build" class="api" filter="s60" introduced="^4">
-	<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-    <unit base="msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
-  <collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
-   <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
-    <unit bldFile="mobilemessaging/smsmtm/group" mrp="mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-   </component>
-  </collection>
-  <collection id="messagingappbase" name="Messaging App Base" level="base">
-   <component id="messagingappbase_build" filter="s60" name="Messaging App Base Build"  introduced="^4">
-	<!-- break this up into the below components -->
-    <unit bldFile="messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
-   </component>
-   <component id="msgmedia" filter="s60" name="Message Media">
-      <unit base="messagingappbase/msgmedia"/>
-   </component>
-   <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
-    <unit bldFile="messagingappbase/smilparser/GROUP" mrp="messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-   </component>
-   <component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="messagingappbase/obexmtms/Group" mrp="messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmsengine" name="MMS Engine" level="eng">
-   <component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
-    <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-   </component>
-   <component id="genutils" filter="s60" name="General Utils">
-    <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-   </component>
-   <component id="mmsserversettings" filter="s60" name="MMS Server Settings">
-    <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-   </component>
-   <component id="mmsmessage" filter="s60" name="MMS Message">
-    <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-   </component>
-   <component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
-    <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-   </component>
-   <component id="mmscodec" filter="s60" name="MMS Codec">
-    <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-   </component>
-   <component id="mmsserver" filter="s60" name="MMS Server">
-    <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-   </component>
-   <component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
-    <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-   </component>
-   <component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
-    <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-   </component>
-   <component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
-    <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-   </component>
-   <component id="applicationadapter" filter="s60" name="MMS Application Adapter">
-    <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-   </component>
-   <component id="mmscodecclient" filter="s60" name="MMS Codec Client">
-    <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-   </component>
-   <component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
-    <unit bldFile="mmsengine/mmssettings/group" mrp="mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-   </component>
-   <component id="mmsconf" name="MMS Configuration" purpose="optional">
-    <unit bldFile="mmsengine/mmsconf" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-   </component>
-   <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
-    <!-- this should be broken up into the individual other components -->
-    <unit bldFile="mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
-  <collection id="messagingapp" name="Messaging Application" level="app">
-   <component id="messagingapp_build" filter="s60" name="MMS Engine Build">
-    <!-- this should be broken up into the individual other components -->
-    <unit bldFile="messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
-   </component>
-     <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
-      <unit bldFile="messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
-      <unit bldFile="messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
-      <unit bldFile="messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
-      <unit bldFile="messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="smartmessaging" filter="s60" name="Smart Messaging">
-      <unit bldFile="messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="shareui" filter="s60" name="Shared UI" introduced="^4">
-      <unit bldFile="messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
-      <unit bldFile="messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
-     </component>
-  </collection>
-  <collection id="email" name="Email" level="plugin">
-   <!-- use commonemail instead -->
-   <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
-    <unit bldFile="email/pop3andsmtpmtm/group" mrp="email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-   </component>
-   <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
-    <unit bldFile="email/imap4mtm/group" mrp="email/imap4mtm/group/messaging_email_imap.mrp"/>
-   </component>
-  </collection>
-  <collection id="messaging_info" name="Messaging Apps Info" level="api">
-   <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/mmsharinguis/package_definition.xml
--- a/symbian4/app/mmsharinguis/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/mmsharinguis/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,145 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <!-- pending removal -->
-      <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
-        <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
-          <component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-          </component>
-          <component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-          </component>
-          <component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-          </component>
-        </collection>
-        <collection name="mmsharing" long-name="Multimedia Sharing" level="base">
-          <component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshavailability/group"/>
-          </component>
-          <component name="mmshindicator" filter="s60" long-name="Multimedia Sharing Indicator">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/group"/>
-          </component>
-          <!-- consider putting client and server in the same component -->
-          <component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
-          </component>
-          <component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-          </component>
-          <component name="mmshengine" filter="s60" long-name="Multimedia Sharing Engine">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshengine/group"/>
-          </component>
-          <component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-            <!-- can only have one unit: need to #include one from the other if it's needed -->
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
-          </component>
-          <component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/group"/>
-          </component>
-        </collection>
-        <collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
-          <component name="mmshaoplugin" filter="s60" long-name="Multimedia Sharing Always Online Plugin" plugin="Y">
-            <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-          </component>
-          <component name="mmshaiwplugin" filter="s60" long-name="Multimedia Sharing AIW Plugin" plugin="Y">
-            <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-          </component>
-          <component name="mmshsipcrplugin" filter="s60" long-name="Multimedia Sharing SIP Client Resolver Plugin" plugin="Y">
-            <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-          </component>
-          <component name="mmshsettingsuiplugin" filter="s60" long-name="Multimedia Sharing Settings UI Plugin" plugin="Y">
-            <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-          </component>
-          <component name="mmshwpadapterplugin" filter="s60" long-name="Multimedia Sharing WAP Provisioning Adapter" plugin="Y">
-            <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-          </component>
-        </collection>
-        <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-          <component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-            <!--  consider distributing to other components -->
-            <unit bldFile="/sf/app/mmsharinguis/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="mmsharinguis" name="Multimedia Sharing UIs" levels="base plugin if">
+  <collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
+   <component id="multimedia_sharing_settings_api" name="Multimedia Sharing Settings API" class="api" filter="s60">
+    <meta rel="Api" href="mmsharinguis_plat/multimedia_sharing_settings_api/multimedia_sharing_settings_api.metaxml"/>
+    <unit bldFile="mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+   </component>
+   <component id="multimedia_sharing_resource_api" name="Multimedia Sharing Resource API" class="api" filter="s60">
+    <meta rel="Api" href="mmsharinguis_plat/multimedia_sharing_resource_api/multimedia_sharing_resource_api.metaxml"/>
+    <unit bldFile="mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+   </component>
+   <component id="multimedia_sharing_manager_api" name="Multimedia Sharing Manager API" class="api" filter="s60">
+    <meta rel="Api" href="mmsharinguis_plat/multimedia_sharing_manager_api/multimedia_sharing_manager_api.metaxml"/>
+    <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+   </component>
+  </collection>
+  <collection id="mmsharing" name="Multimedia Sharing" level="base">
+   <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
+    <unit bldFile="mmsharing/mmshavailability/group"/>
+   </component>
+   <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
+    <unit bldFile="mmsharing/mmshindicator/group"/>
+   </component>
+   <!-- consider putting client and server in the same component -->
+   <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
+    <unit bldFile="mmsharing/mmshmanagercli/group" filter="!test"/>
+    <unit bldFile="mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
+   </component>
+   <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
+    <unit bldFile="mmsharing/mmshmanagersrv/group"/>
+   </component>
+   <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
+    <unit bldFile="mmsharing/mmshengine/group"/>
+   </component>
+   <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
+    <!-- can only have one unit: need to #include one from the other if it's needed -->
+    <unit bldFile="mmsharing/mmshui/group"/>
+    <unit bldFile="mmsharing/mmshui/help/group"/>
+   </component>
+   <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
+    <unit bldFile="mmsharing/group"/>
+   </component>
+  </collection>
+  <collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
+   <component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshaoplugin/group"/>
+   </component>
+   <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshaiwplugin/group"/>
+   </component>
+   <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
+   </component>
+   <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
+   </component>
+   <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
+    <unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
+   </component>
+  </collection>
+  <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
+   <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
+    <!--  consider distributing to other components -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/mmsharinguis/package_definition_3.0.xml
--- a/symbian4/app/mmsharinguis/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="mmsharinguis" name="Multimedia Sharing UIs" levels="base plugin if">
-  <collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
-   <component id="multimedia_sharing_settings_api" name="Multimedia Sharing Settings API" class="api" filter="s60">
-    <meta rel="Api" href="mmsharinguis_plat/multimedia_sharing_settings_api/multimedia_sharing_settings_api.metaxml"/>
-    <unit bldFile="mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-   </component>
-   <component id="multimedia_sharing_resource_api" name="Multimedia Sharing Resource API" class="api" filter="s60">
-    <meta rel="Api" href="mmsharinguis_plat/multimedia_sharing_resource_api/multimedia_sharing_resource_api.metaxml"/>
-    <unit bldFile="mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-   </component>
-   <component id="multimedia_sharing_manager_api" name="Multimedia Sharing Manager API" class="api" filter="s60">
-    <meta rel="Api" href="mmsharinguis_plat/multimedia_sharing_manager_api/multimedia_sharing_manager_api.metaxml"/>
-    <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-   </component>
-  </collection>
-  <collection id="mmsharing" name="Multimedia Sharing" level="base">
-   <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
-    <unit bldFile="mmsharing/mmshavailability/group"/>
-   </component>
-   <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
-    <unit bldFile="mmsharing/mmshindicator/group"/>
-   </component>
-   <!-- consider putting client and server in the same component -->
-   <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
-    <unit bldFile="mmsharing/mmshmanagercli/group" filter="!test"/>
-    <unit bldFile="mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
-   </component>
-   <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
-    <unit bldFile="mmsharing/mmshmanagersrv/group"/>
-   </component>
-   <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
-    <unit bldFile="mmsharing/mmshengine/group"/>
-   </component>
-   <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
-    <!-- can only have one unit: need to #include one from the other if it's needed -->
-    <unit bldFile="mmsharing/mmshui/group"/>
-    <unit bldFile="mmsharing/mmshui/help/group"/>
-   </component>
-   <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
-    <unit bldFile="mmsharing/group"/>
-   </component>
-  </collection>
-  <collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
-   <component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
-    <unit bldFile="mmshplugins/mmshaoplugin/group"/>
-   </component>
-   <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
-    <unit bldFile="mmshplugins/mmshaiwplugin/group"/>
-   </component>
-   <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
-    <unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
-   </component>
-   <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
-    <unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
-   </component>
-   <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
-    <unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
-   </component>
-  </collection>
-  <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
-   <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
-    <!--  consider distributing to other components -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/musicplayer/package_definition.xml
--- a/symbian4/app/musicplayer/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,139 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-        <!-- move the export .pri files into their components and uncomment the units -->
-        <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">
-            <!-- <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">
-            <!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-          </component>
-        </collection>
-        <collection name="musicfetcher " long-name="Music Fetcher" level="support">
-          <!-- collection is really a component, move down a directory -->
-          <component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-            <!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-          </component>
-        </collection>
-        <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">
-            <!-- <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">
-            <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-          </component>
-          <component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-            <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-          </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">
-            <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-          </component>
-          <component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" 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">
-            <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-          </component>
-          <component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" 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">
-            <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-          </component>
-          <component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" 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">
-            <!-- should brak up into individual components  -->
-            <unit bldFile="/sf/app/musicplayer/." proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
+	<!-- move the export .pri files into their components and uncomment the units -->
+
+  <collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
+   <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
+	<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpsettingsmanager" filter="s60" name="MP Settings Manager" introduced="^4">
+	<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="musicfetcher " name="Music Fetcher" level="support">
+	<!-- collection is really a component, move down a directory -->
+   <component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
+	<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="musicplayer_app " name="Music Player Application" level="app">
+	<!-- collection is really a component, move down a directory -->
+   <component id="musicplayer_app_build" filter="s60" name="Music Player Application Build" introduced="^4">
+	<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
+   <component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+   </component>
+   <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+   </component>
+  </collection>
+  <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
+   <component id="audioeffects" filter="s60" name="Audio Effects" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
+   </component>
+   <component id="localaudio" filter="s60" name="Local Audio" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
+   </component>
+   <!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
+   <component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
+    <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
+   </component>
+   <component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
+   </component>
+   <component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+   </component>
+   <component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
+   </component>
+  </collection>
+  <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+   <component id="musicplayer_build" filter="s60" name="Music Player Build">
+    <!-- should brak up into individual components  -->
+	<unit bldFile="." qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/musicplayer/package_definition_3.0.xml
--- a/symbian4/app/musicplayer/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
-	<!-- move the export .pri files into their components and uncomment the units -->
-
-  <collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
-   <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
-	<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-   </component>
-   <component id="mpsettingsmanager" filter="s60" name="MP Settings Manager" introduced="^4">
-	<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-   </component>
-  </collection>
-  <collection id="musicfetcher " name="Music Fetcher" level="support">
-	<!-- collection is really a component, move down a directory -->
-   <component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
-	<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-   </component>
-  </collection>
-  <collection id="musicplayer_app " name="Music Player Application" level="app">
-	<!-- collection is really a component, move down a directory -->
-   <component id="musicplayer_app_build" filter="s60" name="Music Player Application Build" introduced="^4">
-	<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-   </component>
-  </collection>
-  <collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
-   <component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-   </component>
-   <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-   </component>
-  </collection>
-  <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
-   <component id="audioeffects" filter="s60" name="Audio Effects" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-   </component>
-   <component id="localaudio" filter="s60" name="Local Audio" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-   </component>
-   <!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-   <component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
-    <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-   </component>
-   <component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-   </component>
-   <component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-   </component>
-   <component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-   </component>
-  </collection>
-  <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
-   <component id="musicplayer_build" filter="s60" name="Music Player Build">
-    <!-- should brak up into individual components  -->
-	<unit bldFile="." qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,234 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <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">
-            <!-- 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">
-            <!-- break up into individual .pro files -->
-            <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">
-            <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-          </component>
-          <component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
-            <!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-          </component>
-          <component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
-            <!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-          </component>
-          <component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" 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"/>
-        </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">
-            <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">
-            <unit bldFile="/sf/app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-          </component>
-          <component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-            <unit bldFile="/sf/app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
-          </component>
-          <component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-            <unit bldFile="/sf/app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-          </component>
-          <component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-            <unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-          </component>
-          <component name="globaldata" filter="s60" long-name="Calendar Global Data">
-            <unit bldFile="/sf/app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-          </component>
-          <component name="settings" filter="s60" long-name="Calendar Settings">
-            <unit bldFile="/sf/app/organizer/calendarui/settings" proFile="settings.pro"/>
-          </component>
-          <component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-          </component>
-          <component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-            <unit bldFile="/sf/app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-          </component>
-          <component name="views" filter="s60" long-name="Calendar Views">
-            <unit bldFile="/sf/app/organizer/calendarui/views" proFile="views.pro"/>
-          </component>
-          <component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-            <unit bldFile="/sf/app/organizer/calendarui/controller" proFile="controller.pro"/>
-          </component>
-          <component name="calendarui_application" filter="s60" long-name="Calendar Application">
-            <unit bldFile="/sf/app/organizer/calendarui/application" proFile="application.pro"/>
-          </component>
-          <component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
-          </component>
-          <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
-          </component>
-        </collection>
-        <collection name="notes" long-name="Notes" level="ui">
-          <component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-            <unit bldFile="/sf/app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-          </component>
-          <component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/organizer/calendarengines/agnversit2/group"/>
-          </component>
-          <component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-            <unit bldFile="/sf/app/organizer/calendarengines/caleninterimutils/group"/>
-          </component>
-          <component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-            <unit bldFile="/sf/app/organizer/calendarengines/calenimp/group"/>
-          </component>
-          <component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-            <unit bldFile="/sf/app/organizer/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">
-            <!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-          </component>
-          <component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-            <!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-          </component>
-          <component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-            <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-          </component>
-          <component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-            <!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-          </component>
-          <component name="clock_build" filter="s60" long-name="Clock Build">
-            <!-- 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>
-        </collection>
-        <collection name="pimappservices" long-name="PIM Application Services" level="services">
-          <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/app/organizer/pimappservices/calendar/group" mrp="/sf/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-          </component>
-          <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/sf/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-          </component>
-          <component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-          </component>
-        </collection>
-        <collection name="pimappsupport" long-name="PIM Application Support" level="support">
-          <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-            <unit bldFile="/sf/app/organizer/pimappsupport/vcardandvcal/group" mrp="/sf/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-          </component>
-          <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-          </component>
-          <component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-          </component>
-        </collection>
-        <collection name="alarmui" long-name="Alarm UI" level="app">
-          <!-- collection is really a component, should move down a directory -->
-          <component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-            <unit bldFile="/sf/app/organizer/alarmui" proFile="alarmui.pro"/>
-          </component>
-        </collection>
-        <collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-          <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
+  <collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+   <component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_pub/calendar_interim_utils2_api/calendar_interim_utils2_api.metaxml"/>
+		<!-- move into own .pro file -->
+    <unit bldFile="organizer_pub" qt:proFile="organizer_pub.pro"/>
+   </component>
+  </collection>
+  <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+   <component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
+		<!-- break up into individual .pro files -->
+    <unit bldFile="organizer_plat" qt:proFile="organizer_plat.pro"/>
+   </component>
+   <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/agenda_versit_2_api/agenda_versit_2_api.metaxml"/>
+    <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
+   </component>
+   <component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/calendar_exporter_api/calendar_exporter_api.metaxml"/>
+    <!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
+   </component>
+   <component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/calendar_importer_api/calendar_importer_api.metaxml"/>
+    <!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
+   </component>
+   <component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+    <!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
+   </component>
+   <component id="agenda_interface_api" name="Agenda Interface API" class="api" filter="s60" introduced="^4">
+    <unit base="organizer_plat/agenda_interface_api"/>
+   </component>
+   <component id="calendar_editor_api" name="Calendar Editor API" class="api" filter="s60" introduced="^4">
+    <unit base="organizer_plat/calendar_editor_api"/>
+   </component>
+   <component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
+    <unit base="organizer_plat/notes_editor_api"/>
+   </component>
+  </collection>
+  <collection id="agendainterface" name="Agenda Interface" level="services">
+   <!-- collection is really a component, should move down a directory -->
+   <component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
+    <unit bldFile="agendainterface" qt:proFile="agendainterface.pro"/>
+   </component>
+  </collection>
+  <collection id="calendarui" name="Calendar UI" level="ui">
+   <component id="commonutils" filter="s60" name="Calendar Common Utils">
+    <unit bldFile="calendarui/commonutils" qt:proFile="commonutils.pro"/>
+   </component>
+   <component id="calenlauncher" filter="s60" name="Calendar Launcher">
+    <unit bldFile="calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+   </component>
+   <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
+    <unit bldFile="calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+   </component>
+   <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4" >
+    <unit bldFile="calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+   </component>
+   <component id="globaldata" filter="s60" name="Calendar Global Data">
+    <unit bldFile="calendarui/globaldata" qt:proFile="globaldata.pro"/>
+   </component>
+   <component id="settings" filter="s60" name="Calendar Settings">
+    <unit bldFile="calendarui/settings"  qt:proFile="settings.pro"/>
+   </component>
+   <component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4"  class="plugin">
+    <unit bldFile="calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+   </component>
+   <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+    <unit bldFile="calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+   </component>
+   <component id="views" filter="s60" name="Calendar Views">
+    <unit bldFile="calendarui/views" qt:proFile="views.pro"/>
+   </component>
+   <component id="calendarui_controller" filter="s60" name="Calendar Controller">
+    <unit bldFile="calendarui/controller" qt:proFile="controller.pro"/>
+   </component>
+   <component id="calendarui_application" filter="s60" name="Calendar Application">
+    <unit bldFile="calendarui/application" qt:proFile="application.pro"/>
+   </component>
+   <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
+      <unit bldFile="calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+   </component>
+   <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+    <unit bldFile="calendarui/caldav/group"/>
+   </component>
+  </collection>
+  <collection id="notes" name="Notes" level="ui">
+   <component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
+    <unit bldFile="notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
+   </component>
+   <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
+    <unit bldFile="notes" qt:proFile="notes.pro"/>
+   </component>
+  </collection>
+<collection id="calendarengines" name="Calendar Engines" level="engine">
+   <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+    <unit bldFile="calendarengines/versit2/group"/>
+   </component>
+   <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+    <unit bldFile="calendarengines/agnversit2/group"/>
+   </component>
+   <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+    <unit bldFile="calendarengines/caleninterimutils/group"/>
+   </component>
+   <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+    <unit bldFile="calendarengines/calenimp/group"/>
+   </component>
+   <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+    <unit bldFile="calendarengines/caldav/group"/>
+   </component>
+  </collection>
+  <collection id="clock" name="Clock" level="app">
+  <!-- uncomment unit when block_build is split up-->
+   <component id="clockengines" filter="s60" name="Clock Engines">
+    <!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
+   </component>
+   <component id="clockmw" filter="s60" name="Clock Middleware" introduced="^4">
+    <!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
+   </component>
+   <component id="clockui" filter="s60" name="Clock UI">
+    <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
+   </component>
+   <component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
+    <!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
+   </component>
+   <component id="clock_build" filter="s60" name="Clock Build">
+    <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
+    <unit bldFile="clock" qt:proFile="clock.pro"/>
+   </component>
+  </collection>
+  <collection id="pimappservices" name="PIM Application Services" level="services">
+   <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+    <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
+   </component>
+   <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+    <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+   </component>
+   <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+    <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="pimappsupport" name="PIM Application Support" level="support">
+   <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+    <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+   </component>
+   <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+    <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+   </component>
+   <component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="pimappsupport/chinesecalendaralg/group" mrp="pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+   </component>
+  </collection>
+  <collection id="alarmui" name="Alarm UI" level="app">
+   <!-- collection is really a component, should move down a directory -->
+   <component id="alarmui_build" filter="s60" name="Alarm UI Build">
+    <unit bldFile="alarmui" qt:proFile="alarmui.pro"/>
+   </component>
+  </collection>
+  <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+   <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/organizer/package_definition_3.0.xml
--- a/symbian4/app/organizer/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
-  <collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
-   <component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
-    <meta rel="Api" href="organizer_pub/calendar_interim_utils2_api/calendar_interim_utils2_api.metaxml"/>
-		<!-- move into own .pro file -->
-    <unit bldFile="organizer_pub" qt:proFile="organizer_pub.pro"/>
-   </component>
-  </collection>
-  <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
-   <component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
-		<!-- break up into individual .pro files -->
-    <unit bldFile="organizer_plat" qt:proFile="organizer_plat.pro"/>
-   </component>
-   <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
-    <meta rel="Api" href="organizer_plat/agenda_versit_2_api/agenda_versit_2_api.metaxml"/>
-    <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-   </component>
-   <component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
-    <meta rel="Api" href="organizer_plat/calendar_exporter_api/calendar_exporter_api.metaxml"/>
-    <!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-   </component>
-   <component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
-    <meta rel="Api" href="organizer_plat/calendar_importer_api/calendar_importer_api.metaxml"/>
-    <!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-   </component>
-   <component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
-    <!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-   </component>
-   <component id="agenda_interface_api" name="Agenda Interface API" class="api" filter="s60" introduced="^4">
-    <unit base="organizer_plat/agenda_interface_api"/>
-   </component>
-   <component id="calendar_editor_api" name="Calendar Editor API" class="api" filter="s60" introduced="^4">
-    <unit base="organizer_plat/calendar_editor_api"/>
-   </component>
-   <component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
-    <unit base="organizer_plat/notes_editor_api"/>
-   </component>
-  </collection>
-  <collection id="agendainterface" name="Agenda Interface" level="services">
-   <!-- collection is really a component, should move down a directory -->
-   <component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
-    <unit bldFile="agendainterface" qt:proFile="agendainterface.pro"/>
-   </component>
-  </collection>
-  <collection id="calendarui" name="Calendar UI" level="ui">
-   <component id="commonutils" filter="s60" name="Calendar Common Utils">
-    <unit bldFile="calendarui/commonutils" qt:proFile="commonutils.pro"/>
-   </component>
-   <component id="calenlauncher" filter="s60" name="Calendar Launcher">
-    <unit bldFile="calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
-   </component>
-   <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
-    <unit bldFile="calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
-   </component>
-   <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4" >
-    <unit bldFile="calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
-   </component>
-   <component id="globaldata" filter="s60" name="Calendar Global Data">
-    <unit bldFile="calendarui/globaldata" qt:proFile="globaldata.pro"/>
-   </component>
-   <component id="settings" filter="s60" name="Calendar Settings">
-    <unit bldFile="calendarui/settings"  qt:proFile="settings.pro"/>
-   </component>
-   <component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4"  class="plugin">
-    <unit bldFile="calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
-   </component>
-   <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
-    <unit bldFile="calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
-   </component>
-   <component id="views" filter="s60" name="Calendar Views">
-    <unit bldFile="calendarui/views" qt:proFile="views.pro"/>
-   </component>
-   <component id="calendarui_controller" filter="s60" name="Calendar Controller">
-    <unit bldFile="calendarui/controller" qt:proFile="controller.pro"/>
-   </component>
-   <component id="calendarui_application" filter="s60" name="Calendar Application">
-    <unit bldFile="calendarui/application" qt:proFile="application.pro"/>
-   </component>
-   <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
-      <unit bldFile="calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
-   </component>
-   <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
-    <unit bldFile="calendarui/caldav/group"/>
-   </component>
-  </collection>
-  <collection id="notes" name="Notes" level="ui">
-   <component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
-    <unit bldFile="notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
-   </component>
-   <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
-    <unit bldFile="notes" qt:proFile="notes.pro"/>
-   </component>
-  </collection>
-<collection id="calendarengines" name="Calendar Engines" level="engine">
-   <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
-    <unit bldFile="calendarengines/versit2/group"/>
-   </component>
-   <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
-    <unit bldFile="calendarengines/agnversit2/group"/>
-   </component>
-   <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
-    <unit bldFile="calendarengines/caleninterimutils/group"/>
-   </component>
-   <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
-    <unit bldFile="calendarengines/calenimp/group"/>
-   </component>
-   <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
-    <unit bldFile="calendarengines/caldav/group"/>
-   </component>
-  </collection>
-  <collection id="clock" name="Clock" level="app">
-  <!-- uncomment unit when block_build is split up-->
-   <component id="clockengines" filter="s60" name="Clock Engines">
-    <!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-   </component>
-   <component id="clockmw" filter="s60" name="Clock Middleware" introduced="^4">
-    <!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-   </component>
-   <component id="clockui" filter="s60" name="Clock UI">
-    <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-   </component>
-   <component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
-    <!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-   </component>
-   <component id="clock_build" filter="s60" name="Clock Build">
-    <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-    <unit bldFile="clock" qt:proFile="clock.pro"/>
-   </component>
-  </collection>
-  <collection id="pimappservices" name="PIM Application Services" level="services">
-   <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
-    <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
-   </component>
-   <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
-    <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
-   </component>
-   <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
-    <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-   </component>
-  </collection>
-  <collection id="pimappsupport" name="PIM Application Support" level="support">
-   <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
-    <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-   </component>
-   <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-    <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-   </component>
-   <component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
-    <unit bldFile="pimappsupport/chinesecalendaralg/group" mrp="pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-   </component>
-  </collection>
-  <collection id="alarmui" name="Alarm UI" level="app">
-   <!-- collection is really a component, should move down a directory -->
-   <component id="alarmui_build" filter="s60" name="Alarm UI Build">
-    <unit bldFile="alarmui" qt:proFile="alarmui.pro"/>
-   </component>
-  </collection>
-  <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
-   <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,216 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <!-- pending removal -->
-      <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-        <collection name="phoneapp" long-name="Phone Application" level="app">
-          <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
-          </component>
-          <component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
-          </component>
-          <component name="phoneuistates" filter="s60" long-name="Phone UI States">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneuistates/group"/>
-          </component>
-          <component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneuiutils/group"/>
-          </component>
-          <component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneapp/silenceactionplugin/group"/>
-          </component>
-          <component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-            <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
-          </component>
-          <component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-            <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">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-          </component>
-          <component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-            <unit bldFile="/sf/app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-          </component>
-          <component name="phoneui2" filter="s60" long-name="Phone UI">
-            <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">
-            <unit bldFile="/sf/app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-          </component>
-          <component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-            <unit bldFile="/sf/app/phone/phoneengine/audiohandling/group"/>
-          </component>
-          <component name="callhandling" filter="s60" long-name="Call Handling">
-            <unit bldFile="/sf/app/phone/phoneengine/callhandling/group"/>
-          </component>
-          <component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-            <unit bldFile="/sf/app/phone/phoneengine/contacthandling2/group"/>
-          </component>
-          <component name="loghandling" filter="s60" long-name="Phone Log Handling">
-            <unit bldFile="/sf/app/phone/phoneengine/loghandling/group"/>
-          </component>
-          <component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-            <unit bldFile="/sf/app/phone/phoneengine/engineinfo/group"/>
-          </component>
-          <component name="phonemodel" filter="s60" long-name="Phone Model">
-            <unit bldFile="/sf/app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-          </component>
-          <component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-            <unit bldFile="/sf/app/phone/phoneengine/servicehandling/group"/>
-          </component>
-          <component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-            <unit bldFile="/sf/app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-          </component>
-          <component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-          </component>
-        </collection>
-        <collection name="phoneuis" long-name="Phone UIs" level="ui">
-          <component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-            <unit bldFile="/sf/app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-          </component>
-          <component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-          </component>
-          <component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" 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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/phone/phoneplugins/csplugin/group"/>
-          </component>
-          <component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-          </component>
-          <component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.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">
-            <unit bldFile="/sf/app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="phone" name="Phone Apps" levels="engine plugin ui app">
+  <collection id="phoneapp" name="Phone Application" level="app">
+   <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+    <unit bldFile="phoneapp/blacklist/group"/>
+   </component>
+   <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+    <unit bldFile="phoneapp/phoneuicontrol/group"/>
+   </component>
+   <component id="phoneuistates" filter="s60" name="Phone UI States">
+    <unit bldFile="phoneapp/phoneuistates/group"/>
+   </component>
+   <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+    <unit bldFile="phoneapp/phoneuiutils/group"/>
+   </component>   
+   <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+    <unit bldFile="phoneapp/silenceactionplugin/group"/>
+   </component>
+   <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+    <unit bldFile="phoneapp/phonemediatorcenter/group"/>
+   </component>
+   <component id="phoneuiview2" filter="s60" name="Phone UI View">
+    <unit bldFile="phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+   </component>
+   <component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
+    <unit bldFile="phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+   </component>
+   <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
+    <unit bldFile="phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+   </component>
+   <component id="phoneui2" filter="s60" name="Phone UI">
+    <unit bldFile="phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+   </component>
+  </collection>
+  <collection id="phoneengine" name="Phone Engine" level="engine">
+   <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
+    <unit bldFile="phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+   </component>
+   <component id="audiohandling" filter="s60" name="Phone Audio Handling">
+    <unit bldFile="phoneengine/audiohandling/group"/>
+   </component>
+   <component id="callhandling" filter="s60" name="Call Handling">
+    <unit bldFile="phoneengine/callhandling/group"/>
+   </component>
+   <component id="contacthandling2" filter="s60" name="Phone Contact Handling">
+    <unit bldFile="phoneengine/contacthandling2/group"/>
+   </component>
+   <component id="loghandling" filter="s60" name="Phone Log Handling">
+    <unit bldFile="phoneengine/loghandling/group"/>
+   </component>
+   <component id="engineinfo" filter="s60" name="Phone Engine Info">
+    <unit bldFile="phoneengine/engineinfo/group"/>
+   </component>
+   <component id="phonemodel" filter="s60" name="Phone Model">
+    <unit bldFile="phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+   </component>
+   <component id="servicehandling" filter="s60" name="Phone Service Handling">
+    <unit bldFile="phoneengine/servicehandling/group"/>
+   </component>
+   <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
+    <unit bldFile="phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+   </component>
+   <component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
+    <unit bldFile="phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
+   </component>
+  </collection>
+  <collection id="phoneuis" name="Phone UIs" level="ui">
+   <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
+    <unit bldFile="phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+   </component>
+   <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+    <unit bldFile="phoneuis/telephonydevicemode/group"/>
+   </component>
+  </collection>
+  <collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+   <component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/3d_ringing_tone_enabler_api/3d_ringing_tone_enabler_api.metaxml"/>
+    <unit bldFile="phone_plat/3d_ringing_tone_enabler_api/group"/>
+   </component>
+   <component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_comms_information_api/telephony_comms_information_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_comms_information_api/group"/>
+   </component>
+   <component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_information_api/telephony_information_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_information_api/group"/>
+   </component>
+   <component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_device_mode_api/telephony_device_mode_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_device_mode_api/group"/>
+   </component>
+   <component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_remote_party_information_api/telephony_remote_party_information_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_remote_party_information_api/group"/>
+   </component>
+   <component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_video_mailbox_settings_api/telephony_video_mailbox_settings_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_video_mailbox_settings_api/group"/>
+   </component>
+   <component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_microphone_mute_status_api/telephony_microphone_mute_status_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_microphone_mute_status_api/group"/>
+   </component>
+   <component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+    <unit bldFile="phone_plat/telephony_logging_extension_api/group"/>
+   </component>
+   <component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+    <unit bldFile="phone_plat/telephony_matching_extension_api/group"/>
+   </component>
+   <component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+    <unit bldFile="phone_plat/phone_application_commands_api/group"/>
+   </component>
+   <component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+    <unit bldFile="phone_plat/phone_application_voip_commands_api/group"/>
+   </component>
+   <component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+    <unit bldFile="phone_plat/telephony_mediator_api/group"/>
+   </component>
+   <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+    <unit bldFile="phone_plat/video_telephony_mediator_api/group"/>
+   </component>
+   <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="phone_plat/video_telephony_control_mediator_api/group"/>
+   </component>
+  </collection>
+  <collection id="phoneplugins" name="Phone Plugins" level="plugin">
+   <component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
+    <unit bldFile="phoneplugins/csplugin/group"/>
+   </component>
+   <component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
+    <unit bldFile="phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+   </component>
+   <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
+    <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+   </component>
+  </collection>
+  <collection id="phonesettings" name="Phone Settings" level="plugin">
+   <component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
+    <unit bldFile="phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/phone/package_definition_3.0.xml
--- a/symbian4/app/phone/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="phone" name="Phone Apps" levels="engine plugin ui app">
-  <collection id="phoneapp" name="Phone Application" level="app">
-   <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
-    <unit bldFile="phoneapp/blacklist/group"/>
-   </component>
-   <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
-    <unit bldFile="phoneapp/phoneuicontrol/group"/>
-   </component>
-   <component id="phoneuistates" filter="s60" name="Phone UI States">
-    <unit bldFile="phoneapp/phoneuistates/group"/>
-   </component>
-   <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
-    <unit bldFile="phoneapp/phoneuiutils/group"/>
-   </component>   
-   <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
-    <unit bldFile="phoneapp/silenceactionplugin/group"/>
-   </component>
-   <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
-    <unit bldFile="phoneapp/phonemediatorcenter/group"/>
-   </component>
-   <component id="phoneuiview2" filter="s60" name="Phone UI View">
-    <unit bldFile="phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
-   </component>
-   <component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
-    <unit bldFile="phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
-   </component>
-   <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
-    <unit bldFile="phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
-   </component>
-   <component id="phoneui2" filter="s60" name="Phone UI">
-    <unit bldFile="phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
-   </component>
-  </collection>
-  <collection id="phoneengine" name="Phone Engine" level="engine">
-   <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
-    <unit bldFile="phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
-   </component>
-   <component id="audiohandling" filter="s60" name="Phone Audio Handling">
-    <unit bldFile="phoneengine/audiohandling/group"/>
-   </component>
-   <component id="callhandling" filter="s60" name="Call Handling">
-    <unit bldFile="phoneengine/callhandling/group"/>
-   </component>
-   <component id="contacthandling2" filter="s60" name="Phone Contact Handling">
-    <unit bldFile="phoneengine/contacthandling2/group"/>
-   </component>
-   <component id="loghandling" filter="s60" name="Phone Log Handling">
-    <unit bldFile="phoneengine/loghandling/group"/>
-   </component>
-   <component id="engineinfo" filter="s60" name="Phone Engine Info">
-    <unit bldFile="phoneengine/engineinfo/group"/>
-   </component>
-   <component id="phonemodel" filter="s60" name="Phone Model">
-    <unit bldFile="phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
-   </component>
-   <component id="servicehandling" filter="s60" name="Phone Service Handling">
-    <unit bldFile="phoneengine/servicehandling/group"/>
-   </component>
-   <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
-    <unit bldFile="phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
-   </component>
-   <component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
-    <unit bldFile="phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
-   </component>
-  </collection>
-  <collection id="phoneuis" name="Phone UIs" level="ui">
-   <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
-    <unit bldFile="phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
-   </component>
-   <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
-    <unit bldFile="phoneuis/telephonydevicemode/group"/>
-   </component>
-  </collection>
-  <collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
-   <component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/3d_ringing_tone_enabler_api/3d_ringing_tone_enabler_api.metaxml"/>
-    <unit bldFile="phone_plat/3d_ringing_tone_enabler_api/group"/>
-   </component>
-   <component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/telephony_comms_information_api/telephony_comms_information_api.metaxml"/>
-    <unit bldFile="phone_plat/telephony_comms_information_api/group"/>
-   </component>
-   <component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/telephony_information_api/telephony_information_api.metaxml"/>
-    <unit bldFile="phone_plat/telephony_information_api/group"/>
-   </component>
-   <component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/telephony_device_mode_api/telephony_device_mode_api.metaxml"/>
-    <unit bldFile="phone_plat/telephony_device_mode_api/group"/>
-   </component>
-   <component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/telephony_remote_party_information_api/telephony_remote_party_information_api.metaxml"/>
-    <unit bldFile="phone_plat/telephony_remote_party_information_api/group"/>
-   </component>
-   <component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/telephony_video_mailbox_settings_api/telephony_video_mailbox_settings_api.metaxml"/>
-    <unit bldFile="phone_plat/telephony_video_mailbox_settings_api/group"/>
-   </component>
-   <component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
-    <meta rel="Api" href="phone_plat/telephony_microphone_mute_status_api/telephony_microphone_mute_status_api.metaxml"/>
-    <unit bldFile="phone_plat/telephony_microphone_mute_status_api/group"/>
-   </component>
-   <component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
-    <unit bldFile="phone_plat/telephony_logging_extension_api/group"/>
-   </component>
-   <component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
-    <unit bldFile="phone_plat/telephony_matching_extension_api/group"/>
-   </component>
-   <component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
-    <unit bldFile="phone_plat/phone_application_commands_api/group"/>
-   </component>
-   <component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
-    <unit bldFile="phone_plat/phone_application_voip_commands_api/group"/>
-   </component>
-   <component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
-    <unit bldFile="phone_plat/telephony_mediator_api/group"/>
-   </component>
-   <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
-    <unit bldFile="phone_plat/video_telephony_mediator_api/group"/>
-   </component>
-   <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60" introduced="^4">
-    <unit bldFile="phone_plat/video_telephony_control_mediator_api/group"/>
-   </component>
-  </collection>
-  <collection id="phoneplugins" name="Phone Plugins" level="plugin">
-   <component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
-    <unit bldFile="phoneplugins/csplugin/group"/>
-   </component>
-   <component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
-    <unit bldFile="phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
-   </component>
-   <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
-    <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
-   </component>
-  </collection>
-  <collection id="phonesettings" name="Phone Settings" level="plugin">
-   <component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
-    <unit bldFile="phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/photos/package_definition.xml
--- a/symbian4/app/photos/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,131 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-        <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">
-            <!--<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">
-            <!--<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">
-            <!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-          </component>
-          <component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-            <!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-          </component>
-        </collection>
-        <collection name="photos_ui" long-name="Photos UI" level="ui">
-          <component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" 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">
-            <!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-          </component>
-          <component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" 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">
-            <!--<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">
-            <!--<unit bldFile="main" qt:proFile="main.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">
-            <!--<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">
-            <!--  split this up into the above components  -->
-            <unit bldFile="/sf/app/photos/." proFile="photos.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="photos" name="Photos" levels="util support ui app">
+  <collection id="photos_group" name="Photos Group" level="support">
+   <component id="photos_group_build" filter="s60" name="Photos Group Build" introduced="^4">
+    <!--<unit bldFile="group" qt:proFile="group.pro"/> -->
+   </component>
+  </collection>
+  <collection id="photos_loggers" name="Photos Loggers" level="util">
+   <component id="photos_loggerqt" filter="s60" name="Photos Logger Qt" introduced="^4">
+    <!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
+   </component>
+  </collection>
+  <collection id="photos_commonutilities" name="Photos Common Utilities" level="util">
+   <component id="photos_externalutility" filter="s60" name="Photos External Utility" introduced="^4">
+    <!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
+   </component>
+   <component id="imagedecoderwrapper" filter="s60" name="Image Decoder Wrapper" introduced="^4">
+    <!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
+   </component>
+  </collection>
+  <collection id="photos_ui" name="Photos UI" level="ui">
+   <component id="photos_uiengine" filter="s60" name="Photos UI Engine" introduced="^4">
+    <!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
+   </component>
+   <component id="photos_commandhandlers" filter="s60" name="Photos Command Handlers" introduced="^4">
+    <!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
+   </component>
+   <component id="photos_views" filter="s60" name="Photos Views" introduced="^4">
+    <!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
+   </component>
+   <component id="photos_viewmanagement" filter="s60" name="Photos View Management" introduced="^4">
+    <!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
+   </component>
+  </collection>
+  <collection id="photos_main" name="Photos Main" level="support">
+   <component id="photos_main_build" filter="s60" name="Photos Main Build" introduced="^4">
+    <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
+   </component>
+  </collection>
+  <collection id="imageviewerapp" name="Image Viewer App" level="support">
+   <component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
+    <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
+   </component>
+  </collection>
+  <collection id="photos_info" name="Photos Info" level="support">
+   <component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
+    <!--  split this up into the above components  -->
+    <unit bldFile="." qt:proFile="photos.pro"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/photos/package_definition_3.0.xml
--- a/symbian4/app/photos/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="photos" name="Photos" levels="util support ui app">
-  <collection id="photos_group" name="Photos Group" level="support">
-   <component id="photos_group_build" filter="s60" name="Photos Group Build" introduced="^4">
-    <!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-   </component>
-  </collection>
-  <collection id="photos_loggers" name="Photos Loggers" level="util">
-   <component id="photos_loggerqt" filter="s60" name="Photos Logger Qt" introduced="^4">
-    <!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-   </component>
-  </collection>
-  <collection id="photos_commonutilities" name="Photos Common Utilities" level="util">
-   <component id="photos_externalutility" filter="s60" name="Photos External Utility" introduced="^4">
-    <!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-   </component>
-   <component id="imagedecoderwrapper" filter="s60" name="Image Decoder Wrapper" introduced="^4">
-    <!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-   </component>
-  </collection>
-  <collection id="photos_ui" name="Photos UI" level="ui">
-   <component id="photos_uiengine" filter="s60" name="Photos UI Engine" introduced="^4">
-    <!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-   </component>
-   <component id="photos_commandhandlers" filter="s60" name="Photos Command Handlers" introduced="^4">
-    <!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-   </component>
-   <component id="photos_views" filter="s60" name="Photos Views" introduced="^4">
-    <!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-   </component>
-   <component id="photos_viewmanagement" filter="s60" name="Photos View Management" introduced="^4">
-    <!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-   </component>
-  </collection>
-  <collection id="photos_main" name="Photos Main" level="support">
-   <component id="photos_main_build" filter="s60" name="Photos Main Build" introduced="^4">
-    <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-   </component>
-  </collection>
-  <collection id="imageviewerapp" name="Image Viewer App" level="support">
-   <component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
-    <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-   </component>
-  </collection>
-  <collection id="photos_info" name="Photos Info" level="support">
-   <component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
-    <!--  split this up into the above components  -->
-    <unit bldFile="." qt:proFile="photos.pro"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/podcatcher/package_definition.xml
--- a/symbian4/app/podcatcher/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,95 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
-        <collection name="podcatcher_info" long-name="Podcatcher" level="app">
-          <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
-            <!-- 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">
-            <unit bldFile="/sf/app/podcatcher/application/group"/>
-          </component>
-          <component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
-            <unit bldFile="/sf/app/podcatcher/engine/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="podcatcher" name="Podcatcher" levels="app">
+    <collection id="podcatcher_info" name="Podcatcher" level="app">
+      <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+        <!-- has exports from top level bld.inf -->
+        <unit bldFile="group"/> 
+      </component>
+      <component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
+        <unit bldFile="application/group"/>
+      </component>
+      <component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
+        <unit bldFile="engine/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/podcatcher/package_definition_3.0.xml
--- a/symbian4/app/podcatcher/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="podcatcher" name="Podcatcher" levels="app">
-    <collection id="podcatcher_info" name="Podcatcher" level="app">
-      <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
-        <!-- has exports from top level bld.inf -->
-        <unit bldFile="group"/> 
-      </component>
-      <component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
-        <unit bldFile="application/group"/>
-      </component>
-      <component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
-        <unit bldFile="engine/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/radio/package_definition.xml
--- a/symbian4/app/radio/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,114 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-        <collection name="radioengine" long-name="Radio Engine" level="engine">
-          <component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioengine/utils/group"/>
-          </component>
-          <component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioengine/settings/group"/>
-          </component>
-          <component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-            <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">
-            <unit bldFile="/sf/app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-          </component>
-          <component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-          </component>
-          <component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-          </component>
-          <component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-          </component>
-          <component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-          </component>
-          <component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-            <unit bldFile="/sf/app/radio/rom"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="radio" name="Radio Apps" levels="engine ui">
+    <collection id="radioengine" name="Radio Engine" level="engine">
+      <component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
+        <unit bldFile="radioengine/utils/group"/>
+      </component>
+      <component id="radioenginesettings" filter="s60" name="Radio Engine Settings" introduced="^4">
+        <unit bldFile="radioengine/settings/group"/>
+      </component>
+      <component id="radioengine_engine" filter="s60" name="Radio Engine" introduced="^4">
+        <unit bldFile="radioengine/engine/group"/>
+      </component>
+    </collection>
+    <collection id="radioapp" name="Radio App" level="ui">
+      <component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
+        <unit bldFile="radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
+      </component>
+      <component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
+        <unit bldFile="radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
+      </component>
+      <component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
+        <unit bldFile="radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
+      </component>
+      <component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
+        <unit bldFile="radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
+      </component>
+      <component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
+        <unit bldFile="radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
+      </component>
+      <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
+        <unit bldFile="rom"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/radio/package_definition_3.0.xml
--- a/symbian4/app/radio/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="radio" name="Radio Apps" levels="engine ui">
-    <collection id="radioengine" name="Radio Engine" level="engine">
-      <component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
-        <unit bldFile="radioengine/utils/group"/>
-      </component>
-      <component id="radioenginesettings" filter="s60" name="Radio Engine Settings" introduced="^4">
-        <unit bldFile="radioengine/settings/group"/>
-      </component>
-      <component id="radioengine_engine" filter="s60" name="Radio Engine" introduced="^4">
-        <unit bldFile="radioengine/engine/group"/>
-      </component>
-    </collection>
-    <collection id="radioapp" name="Radio App" level="ui">
-      <component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
-        <unit bldFile="radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
-      </component>
-      <component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
-        <unit bldFile="radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
-      </component>
-      <component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
-        <unit bldFile="radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
-      </component>
-      <component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
-        <unit bldFile="radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
-      </component>
-      <component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
-        <unit bldFile="radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
-      </component>
-      <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
-        <unit bldFile="rom"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/recents/package_definition.xml
--- a/symbian4/app/recents/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/recents/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,95 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
-        <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"/>
-        </collection>
-        <collection name="logsui" long-name="Logs UI" level="ui">
-          <component name="logsui_build" filter="s60" long-name="Logs UI Build">
-            <!-- component at too high a rank, should move down one directory -->
-            <unit bldFile="/sf/app/recents/logsui" proFile="logsui.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+   <package id="recents" name="Recent Events" levels="engine support ui api">
+  <collection id="recents_plat" name="Recent Events Platform Interfaces" level="api">
+   <component id="logs_services_api" name="Logs Services API" class="api" filter="s60" introduced="^4">
+    <unit base="recents_plat/logs_services_api"/>
+   </component>
+   <component id="logs_engine_api" name="Logs Engine API" class="api" filter="s60" introduced="^4">
+    <unit base="recents_plat/logs_engine_api"/>
+   </component>
+   <component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
+    <unit base="recents_plat/logs_timers_api"/>
+   </component>
+   <component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
+    <unit base="recents_plat/logs_engine_api_extensions"/>
+   </component>
+  </collection>
+  <collection id="logsui" name="Logs UI" level="ui">
+   <component id="logsui_build" filter="s60" name="Logs UI Build">
+    <!-- component at too high a rank, should move down one directory -->
+    <unit bldFile="logsui" qt:proFile="logsui.pro"/>
+   </component>
+  </collection>
+   </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/recents/package_definition_3.0.xml
--- a/symbian4/app/recents/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-   <package id="recents" name="Recent Events" levels="engine support ui api">
-  <collection id="recents_plat" name="Recent Events Platform Interfaces" level="api">
-   <component id="logs_services_api" name="Logs Services API" class="api" filter="s60" introduced="^4">
-    <unit base="recents_plat/logs_services_api"/>
-   </component>
-   <component id="logs_engine_api" name="Logs Engine API" class="api" filter="s60" introduced="^4">
-    <unit base="recents_plat/logs_engine_api"/>
-   </component>
-   <component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
-    <unit base="recents_plat/logs_timers_api"/>
-   </component>
-   <component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
-    <unit base="recents_plat/logs_engine_api_extensions"/>
-   </component>
-  </collection>
-  <collection id="logsui" name="Logs UI" level="ui">
-   <component id="logsui_build" filter="s60" name="Logs UI Build">
-    <!-- component at too high a rank, should move down one directory -->
-    <unit bldFile="logsui" qt:proFile="logsui.pro"/>
-   </component>
-  </collection>
-   </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,172 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <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">
-            <unit bldFile="/sf/app/rndtools/creator/group"/>
-          </component>
-        </collection>
-        <collection name="filebrowser" long-name="File Browser" level="util">
-          <!-- consider collapsing into a single component -->
-          <component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-            <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-          </component>
-          <component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-            <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-          </component>
-          <component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-            <!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-            <unit bldFile="/sf/app/rndtools/filebrowser/group"/>
-          </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">
-            <unit bldFile="/sf/app/rndtools/launcher/group"/>
-          </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">
-            <unit bldFile="/sf/app/rndtools/loadgen/group"/>
-          </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">
-            <unit bldFile="/sf/app/rndtools/perfmon" proFile="perfmon.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">
-            <unit bldFile="/sf/app/rndtools/screengrabber" proFile="screengrabber.pro"/>
-          </component>
-        </collection>
-        <collection name="stifui" long-name="STIF UI" level="generic">
-          <component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-            <unit bldFile="/sf/app/rndtools/stifui/stifui/group"/>
-          </component>
-          <component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-            <unit bldFile="/sf/app/rndtools/stifui/uitestserverstarter/group"/>
-          </component>
-          <component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-            <!-- can this be split up into the other components or made a ROM component? -->
-            <unit bldFile="/sf/app/rndtools/stifui/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">
-            <unit bldFile="/sf/app/rndtools/memspyui/group"/>
-          </component>
-        </collection>
-        <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-          <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-            <!-- can only have a single unit. Should #include from a common bld.inf file -->
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-            <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-          </component>
-          <component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-            <unit bldFile="/sf/app/rndtools/htiui/htidevicereboot/group"/>
-          </component>
-          <component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-            <unit bldFile="/sf/app/rndtools/htiui/htistartupwait/group"/>
-          </component>
-          <component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-            <unit bldFile="/sf/app/rndtools/htiui/htiadmin/group"/>
-          </component>
-          <component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-            <!-- can this be split up into the other components or made a ROM component? -->
-            <unit bldFile="/sf/app/rndtools/htiui/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="rndtools" name="R&amp;D tools" levels="support generic test util">
+    <collection id="creator" name="Creator" level="support">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+        <unit bldFile="creator/group"/>
+      </component>
+    </collection>
+    <collection id="filebrowser" name="File Browser" level="util">
+		<!-- consider collapsing into a single component -->
+      <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
+      	<meta rel="config">
+      		<not-defined condition="FILEBROWSER_LITE"/>
+      	</meta>
+      	<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+        <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+      </component>
+      <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+      	<meta rel="config">
+      		<not-defined condition="FILEBROWSER_LITE"/>
+      	</meta>
+      	<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+        <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+      </component>
+      <component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+		<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+        <unit bldFile="filebrowser/group"/>
+      </component>
+    </collection>
+    <collection id="launcher" name="Launcher" level="util">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+        <unit bldFile="launcher/group"/>
+      </component>
+    </collection>
+    <collection id="loadgen" name="Load Generator" level="test">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+        <unit bldFile="loadgen/group"/>
+      </component>
+    </collection>
+    <collection id="perfmon" name="Performance Monitor" level="test">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
+           <unit bldFile="perfmon" qt:proFile="perfmon.pro"/>
+      </component>
+    </collection>
+    <collection id="screengrabber" name="Screen Grabber" level="util">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="screengrabber_build" filter="s60"  name="ScreenGrabber" purpose="development" target="device" class="tool">
+		<unit bldFile="screengrabber" qt:proFile="screengrabber.pro"/>
+      </component>
+    </collection>
+    <collection id="stifui" name="STIF UI" level="generic">
+      <component id="stifui_stifui" filter="s60" name="STIF UI" purpose="development" target="device">
+        <unit bldFile="stifui/stifui/group"/>
+      </component>
+      <component id="uitestserverstarter" filter="s60" name="UI Test Server Starter" purpose="development" target="device">
+        <unit bldFile="stifui/uitestserverstarter/group"/>
+      </component>
+      <component id="stifui_build" filter="s60" name="STIF UI Build" purpose="development">
+		<!-- can this be split up into the other components or made a ROM component? -->
+        <unit bldFile="stifui/group"/>
+      </component>
+    </collection>
+    <collection id="memspyui" name="Memspy UI" level="generic">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+        <unit bldFile="memspyui/group"/>
+      </component>
+    </collection>
+    <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
+      <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
+		<!-- can only have a single unit. Should #include from a common bld.inf file -->
+        <unit bldFile="htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+      </component>
+      <component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+        <unit bldFile="htiui/htidevicereboot/group"/>
+      </component>
+      <component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+        <unit bldFile="htiui/htistartupwait/group"/>
+      </component>
+      <component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+        <unit bldFile="htiui/htiadmin/group"/>
+      </component>
+      <component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development">
+		<!-- can this be split up into the other components or made a ROM component? -->
+        <unit bldFile="htiui/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/rndtools/package_definition_3.0.xml
--- a/symbian4/app/rndtools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="rndtools" name="R&amp;D tools" levels="support generic test util">
-    <collection id="creator" name="Creator" level="support">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
-        <unit bldFile="creator/group"/>
-      </component>
-    </collection>
-    <collection id="filebrowser" name="File Browser" level="util">
-		<!-- consider collapsing into a single component -->
-      <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
-      	<meta rel="config">
-      		<not-defined condition="FILEBROWSER_LITE"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-        <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-      </component>
-      <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
-      	<meta rel="config">
-      		<not-defined condition="FILEBROWSER_LITE"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-        <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-      </component>
-      <component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
-		<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-        <unit bldFile="filebrowser/group"/>
-      </component>
-    </collection>
-    <collection id="launcher" name="Launcher" level="util">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
-        <unit bldFile="launcher/group"/>
-      </component>
-    </collection>
-    <collection id="loadgen" name="Load Generator" level="test">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
-        <unit bldFile="loadgen/group"/>
-      </component>
-    </collection>
-    <collection id="perfmon" name="Performance Monitor" level="test">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
-           <unit bldFile="perfmon" qt:proFile="perfmon.pro"/>
-      </component>
-    </collection>
-    <collection id="screengrabber" name="Screen Grabber" level="util">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="screengrabber_build" filter="s60"  name="ScreenGrabber" purpose="development" target="device" class="tool">
-		<unit bldFile="screengrabber" qt:proFile="screengrabber.pro"/>
-      </component>
-    </collection>
-    <collection id="stifui" name="STIF UI" level="generic">
-      <component id="stifui_stifui" filter="s60" name="STIF UI" purpose="development" target="device">
-        <unit bldFile="stifui/stifui/group"/>
-      </component>
-      <component id="uitestserverstarter" filter="s60" name="UI Test Server Starter" purpose="development" target="device">
-        <unit bldFile="stifui/uitestserverstarter/group"/>
-      </component>
-      <component id="stifui_build" filter="s60" name="STIF UI Build" purpose="development">
-		<!-- can this be split up into the other components or made a ROM component? -->
-        <unit bldFile="stifui/group"/>
-      </component>
-    </collection>
-    <collection id="memspyui" name="Memspy UI" level="generic">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
-        <unit bldFile="memspyui/group"/>
-      </component>
-    </collection>
-    <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-      <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
-		<!-- can only have a single unit. Should #include from a common bld.inf file -->
-        <unit bldFile="htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-      </component>
-      <component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
-        <unit bldFile="htiui/htidevicereboot/group"/>
-      </component>
-      <component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
-        <unit bldFile="htiui/htistartupwait/group"/>
-      </component>
-      <component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
-        <unit bldFile="htiui/htiadmin/group"/>
-      </component>
-      <component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development">
-		<!-- can this be split up into the other components or made a ROM component? -->
-        <unit bldFile="htiui/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/search/package_definition.xml
--- a/symbian4/app/search/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,93 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-        <collection name="search_info" long-name="Search Info">
-          <component name="search_build" long-name="Search Build" introduced="^4">
-            <unit bldFile="/sf/app/search/group"/>
-          </component>
-        </collection>
-        <collection name="searchui" long-name="Search UI">
-          <component name="searchui_build" long-name="Search UI Build" introduced="^4">
-            <unit bldFile="/sf/app/search/searchui" proFile="searchui.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="search" name="Search Apps" levels="eng base app api">
+	<collection id="search_info" name="Search Info"> 
+	<component id="search_build" name="Search Build" introduced="^4">
+	  <unit bldFile="group"/>
+	 </component>
+	</collection>
+	<collection id="searchui" name="Search UI">
+	<component id="searchui_build" name="Search UI Build" introduced="^4">
+	  <unit bldFile="searchui" qt:proFile="searchui.pro"/>
+	 </component>
+	</collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/search/package_definition_3.0.xml
--- a/symbian4/app/search/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="search" name="Search Apps" levels="eng base app api">
-	<collection id="search_info" name="Search Info"> 
-	<component id="search_build" name="Search Build" introduced="^4">
-	  <unit bldFile="group"/>
-	 </component>
-	</collection>
-	<collection id="searchui" name="Search UI">
-	<component id="searchui_build" name="Search UI Build" introduced="^4">
-	  <unit bldFile="searchui" qt:proFile="searchui.pro"/>
-	 </component>
-	</collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/settingsuis/package_definition.xml
--- a/symbian4/app/settingsuis/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/settingsuis/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,94 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-        <collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-          <component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-            <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">
-            <unit bldFile="/sf/app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="settingsuis" name="Settings UIs" levels="plugin ui">
+  <collection id="controlpanelplugins" name="Control Panel Plugins" level="plugin">
+   <component id="themeplugin" filter="s60" name="Theme Plugin" introduced="^4">
+    <unit bldFile="controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>	
+  </collection>
+  <collection id="controlpanelui" name="Control Panel UI" level="ui">
+	<!-- collection is really a component, move down a dir -->
+   <component id="controlpanelui_build" filter="s60" name="Control Panel UI Build" introduced="^4">
+    <unit bldFile="controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/settingsuis/package_definition_3.0.xml
--- a/symbian4/app/settingsuis/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="settingsuis" name="Settings UIs" levels="plugin ui">
-  <collection id="controlpanelplugins" name="Control Panel Plugins" level="plugin">
-   <component id="themeplugin" filter="s60" name="Theme Plugin" introduced="^4">
-    <unit bldFile="controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
-   </component>	
-  </collection>
-  <collection id="controlpanelui" name="Control Panel UI" level="ui">
-	<!-- collection is really a component, move down a dir -->
-   <component id="controlpanelui_build" filter="s60" name="Control Panel UI Build" introduced="^4">
-    <unit bldFile="controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/techview/package_definition.xml
--- a/symbian4/app/techview/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/techview/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,243 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <collection name="buildverification" long-name="Build Verification" level="services">
-          <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-            <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">
-            <unit bldFile="/sf/app/techview/buildverification/smoketest/Group" mrp="/sf/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-          </component>
-        </collection>
-        <collection name="techviewplat" long-name="Techview Platform" level="services">
-          <component name="techviewuiklaf" long-name="UIKLAF" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewplat/techviewuiklaf/GROUP" mrp="/sf/app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
-          </component>
-          <component name="eikstdtv" long-name="EIKSTD" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewplat/eikstd/group" mrp="/sf/app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
-          </component>
-          <component name="feps" long-name="FEPS" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewplat/feps/group" mrp="/sf/app/techview/techviewplat/feps/group/techview_feps.mrp"/>
-          </component>
-        </collection>
-        <collection name="techviewui" long-name="Techview UI" level="ui">
-          <component name="techviewextras" long-name="Extras" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewui/techviewextras/group" mrp="/sf/app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
-          </component>
-          <component name="statuspane" long-name="Status Pane" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewui/statuspane/group" mrp="/sf/app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
-          </component>
-          <component name="shell" long-name="Shell" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewui/shell/group" mrp="/sf/app/techview/techviewui/shell/group/techview_shell.mrp"/>
-          </component>
-          <component name="startuptv" long-name="Techview Startup" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/techviewui/startup/group" mrp="/sf/app/techview/techviewui/startup/group/techview_startup.mrp"/>
-          </component>
-        </collection>
-        <collection name="tv_controlpanel" long-name="Control Panel" level="ui">
-          <component name="fepsetup" long-name="FEP Setup" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/controlpanel/fepsetup/group" mrp="/sf/app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
-          </component>
-          <component name="cctlcolscheme" long-name="Colour Scheme Control" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/controlpanel/cctlcolscheme/group" mrp="/sf/app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
-          </component>
-          <component name="soundsetup" long-name="Sound Setup" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/controlpanel/soundsetup/group" mrp="/sf/app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
-          </component>
-          <component name="keyclickref" long-name="Key Click Ref" filter="techview" purpose="development" plugin="Y">
-            <unit bldFile="/sf/app/techview/controlpanel/keyclickref/Group" mrp="/sf/app/techview/controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
-          </component>
-        </collection>
-        <collection name="pimapps" long-name="PIM Apps" level="apps3">
-          <component name="contacui" long-name="Contacts UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/pimapps/contacui/group" mrp="/sf/app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
-          </component>
-          <component name="agenda" long-name="Agenda UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/pimapps/agenda/group" mrp="/sf/app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
-          </component>
-          <component name="contactstechview" long-name="Contacts" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/pimapps/contactstechview/group" mrp="/sf/app/techview/pimapps/contactstechview/group/techview_contacts.mrp"/>
-          </component>
-        </collection>
-        <collection name="securityapps" long-name="Security Apps" level="apps3">
-          <component name="secuitv" long-name="Techview Security UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/securityapps/secui/group" mrp="/sf/app/techview/securityapps/secui/group/techview_secui.mrp"/>
-          </component>
-          <component name="securityupstechview" long-name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
-            <unit bldFile="/sf/app/techview/securityapps/securityupstechview/group" mrp="/sf/app/techview/securityapps/securityupstechview/group/security_ups_techview.mrp"/>
-          </component>
-        </collection>
-        <collection name="utilityapps" long-name="Utility Apps" level="apps2">
-          <component name="helptechview" long-name="Help" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/utilityapps/helptechview/group" mrp="/sf/app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
-          </component>
-          <component name="timew" long-name="World Time" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/utilityapps/timew/group" mrp="/sf/app/techview/utilityapps/timew/group/techview_timew.mrp"/>
-          </component>
-          <component name="cpumonitor" long-name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
-            <unit bldFile="/sf/app/techview/utilityapps/cpumonitor/group" mrp="/sf/app/techview/utilityapps/cpumonitor/group/techview_cpumonitor.mrp"/>
-          </component>
-        </collection>
-        <collection name="installationapps" long-name="Installation Apps" level="apps2">
-          <component name="installapp" long-name="Install App" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/installationapps/installapp/group" mrp="/sf/app/techview/installationapps/installapp/group/techview_installapp.mrp"/>
-          </component>
-        </collection>
-        <collection name="messagingapps" long-name="Messaging Apps" level="apps2">
-          <component name="messagingui" long-name="Messaging UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/messagingapps/messagingui/Group" mrp="/sf/app/techview/messagingapps/messagingui/Group/techview_messagingui.mrp"/>
-          </component>
-        </collection>
-        <collection name="telephonyapps" long-name="Telephony Apps" level="apps1">
-          <component name="techviewphoneui" long-name="Phone UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/telephonyapps/techviewphoneui/group" mrp="/sf/app/techview/telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkingapps" long-name="Networking Apps" level="apps1">
-          <component name="iapstatusapp" long-name="IAP Status App" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/networkingapps/iapstatusapp/group" mrp="/sf/app/techview/networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
-          </component>
-          <component name="networkingagentnotifier" long-name="Networking Agent Notifier" filter="techview" introduced="7.0s" purpose="development" plugin="Y">
-            <unit bldFile="/sf/app/techview/networkingapps/networkingagentnotifier/group" mrp="/sf/app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
-          </component>
-          <component name="techviewvpnui" long-name="VPN UI" filter="techview" introduced="7.0" purpose="development">
-            <unit bldFile="/sf/app/techview/networkingapps/techviewvpnui/group" mrp="/sf/app/techview/networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkingutils" long-name="Networking Utils" level="utils">
-          <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development" filter="test">
-            <unit mrp="/sf/app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="/sf/app/techview/networkingutils/ipadministrationtool/group"/>
-          </component>
-          <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
-            <unit mrp="/sf/app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="/sf/app/techview/networkingutils/nameresolverutility/group"/>
-          </component>
-        </collection>
-        <collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1">
-          <component name="techviewusbui" long-name="USB UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/shortlinkapps/techviewusbui/group" mrp="/sf/app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
-          </component>
-          <component name="bluetoothui" long-name="Bluetooth UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/shortlinkapps/bluetoothui/group" mrp="/sf/app/techview/shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
-          </component>
-          <component name="reftsp" long-name="Remote Control Reference TSP" filter="techview" introduced="9.1" purpose="development" plugin="Y">
-            <unit bldFile="/sf/app/techview/shortlinkapps/reftsp/group" mrp="/sf/app/techview/shortlinkapps/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
-          </component>
-        </collection>
-        <collection name="testapps" long-name="Test Apps" level="utils">
-          <component name="simpleapp" long-name="Simple App" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/testapps/simpleapp/group" mrp="/sf/app/techview/testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
-          </component>
-          <component name="statdevice" long-name="STAT Device" filter="techview" purpose="development">
-            <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
-          </component>
-          <component name="rschandlerui" long-name="Resource Handler UI" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/testapps/rschandler/TVResourceHandler/group" mrp="/sf/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
-          </component>
-          <component name="graphicstestutils" long-name="Graphics Test Utils" filter="techview" introduced="9.2" purpose="development">
-            <unit bldFile="/sf/app/techview/testapps/graphicstestutils/group" mrp="/sf/app/techview/testapps/graphicstestutils/group/graphics_testutils.mrp"/>
-          </component>
-          <component name="rschandler" long-name="Resource Handler" deprecated="^3" purpose="development" filter="test">
-            <unit mrp="/sf/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="/sf/app/techview/testapps/rschandler/TVResourceHandler/group"/>
-          </component>
-        </collection>
-        <collection name="avapps" long-name="A/V Apps" level="apps3">
-          <component name="techviewaudio" long-name="Audio" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/avapps/techviewaudio/Group" mrp="/sf/app/techview/avapps/techviewaudio/Group/techview_audio.mrp"/>
-          </component>
-        </collection>
-        <collection name="toolkit" long-name="Toolkit" level="utils">
-          <component name="romkit" long-name="ROM Kit" filter="techview" purpose="development">
-            <unit bldFile="/sf/app/techview/toolkit/romkit/group" mrp="/sf/app/techview/toolkit/romkit/group/techview_romkit.mrp"/>
-          </component>
-          <component name="romimages" long-name="ROM Images" filter="techview" purpose="development">
-            <unit bldFile="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys" mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys/reference_roms_tb101sf.mrp" version="tb101sf"/>
-          </component>
-          <component name="configfiles" long-name="Configuration Files" filter="techview" purpose="development">
-            <unit mrp="/sf/app/techview/toolkit/configfiles/techview_epoc_ini.mrp"/>
-          </component>
-        </collection>
-        <collection name="techview_info" long-name="Techview Info" level="apps3">
-          <component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="techview" name="Techview" levels="services ui utils apps1 apps2 apps3">
+    <collection id="buildverification" name="Build Verification" level="services">
+     <component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+        <unit bldFile="buildverification/autosmoketest/Group" mrp="buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+      </component>
+      <component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
+        <unit bldFile="buildverification/smoketest/Group" mrp="buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+      </component>
+    </collection>
+    <collection id="techviewplat" name="Techview Platform" level="services">
+      <component id="techviewuiklaf" name="UIKLAF" filter="techview" purpose="development">
+        <unit bldFile="techviewplat/techviewuiklaf/GROUP" mrp="techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
+      </component>
+      <component id="eikstdtv" name="EIKSTD" filter="techview" purpose="development">
+        <unit bldFile="techviewplat/eikstd/group" mrp="techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
+      </component>
+      <component id="feps" name="FEPS" filter="techview" purpose="development">
+        <unit bldFile="techviewplat/feps/group" mrp="techviewplat/feps/group/techview_feps.mrp"/>
+      </component>
+    </collection>
+    <collection id="techviewui" name="Techview UI" level="ui">
+      <component id="techviewextras" name="Extras" filter="techview" purpose="development">
+        <unit bldFile="techviewui/techviewextras/group" mrp="techviewui/techviewextras/group/techview_extras.mrp"/>
+      </component>
+      <component id="statuspane" name="Status Pane" filter="techview" purpose="development">
+        <unit bldFile="techviewui/statuspane/group" mrp="techviewui/statuspane/group/techview_statuspane.mrp"/>
+      </component>
+      <component id="shell" name="Shell" filter="techview" purpose="development">
+        <unit bldFile="techviewui/shell/group" mrp="techviewui/shell/group/techview_shell.mrp"/>
+      </component>
+      <component id="startuptv" name="Techview Startup" filter="techview" purpose="development">
+        <unit bldFile="techviewui/startup/group" mrp="techviewui/startup/group/techview_startup.mrp"/>
+      </component>
+    </collection>
+    <collection id="tv_controlpanel" name="Control Panel" level="ui">
+      <component id="fepsetup" name="FEP Setup" filter="techview" purpose="development">
+        <unit bldFile="controlpanel/fepsetup/group" mrp="controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
+      </component>
+      <component id="cctlcolscheme" name="Colour Scheme Control" filter="techview" purpose="development">
+        <unit bldFile="controlpanel/cctlcolscheme/group" mrp="controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
+      </component>
+      <component id="soundsetup" name="Sound Setup" filter="techview" purpose="development">
+        <unit bldFile="controlpanel/soundsetup/group" mrp="controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
+      </component>
+      <component id="keyclickref" name="Key Click Ref" filter="techview" purpose="development" class="plugin">
+        <unit bldFile="controlpanel/keyclickref/Group" mrp="controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
+      </component>
+    </collection>
+    <collection id="pimapps" name="PIM Apps" level="apps3">
+      <component id="contacui" name="Contacts UI" filter="techview" purpose="development">
+        <unit bldFile="pimapps/contacui/group" mrp="pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
+      </component>
+      <component id="agenda" name="Agenda UI" filter="techview" purpose="development">
+        <unit bldFile="pimapps/agenda/group" mrp="pimapps/agenda/group/techview_agenda.mrp"/>
+      </component>
+      <component id="contactstechview" name="Contacts" filter="techview" purpose="development">
+        <unit bldFile="pimapps/contactstechview/group" mrp="pimapps/contactstechview/group/techview_contacts.mrp"/>
+      </component>
+    </collection>
+    <collection id="securityapps" name="Security Apps" level="apps3">
+      <component id="secuitv" name="Techview Security UI" filter="techview" purpose="development">
+        <unit bldFile="securityapps/secui/group" mrp="securityapps/secui/group/techview_secui.mrp"/>
+      </component>
+      <component id="securityupstechview" name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
+        <unit bldFile="securityapps/securityupstechview/group" mrp="securityapps/securityupstechview/group/security_ups_techview.mrp"/>
+      </component>
+    </collection>
+    <collection id="utilityapps" name="Utility Apps" level="apps2">
+      <component id="helptechview" name="Help" filter="techview" purpose="development">
+        <unit bldFile="utilityapps/helptechview/group" mrp="utilityapps/helptechview/group/techview_help.mrp"/>
+      </component>
+      <component id="timew" name="World Time" filter="techview" purpose="development">
+        <unit bldFile="utilityapps/timew/group" mrp="utilityapps/timew/group/techview_timew.mrp"/>
+      </component>
+      <component id="cpumonitor" name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
+        <unit bldFile="utilityapps/cpumonitor/group" mrp="utilityapps/cpumonitor/group/techview_cpumonitor.mrp"/>
+      </component>
+    </collection>
+    <collection id="installationapps" name="Installation Apps" level="apps2">
+      <component id="installapp" name="Install App" filter="techview" purpose="development">
+        <unit bldFile="installationapps/installapp/group" mrp="installationapps/installapp/group/techview_installapp.mrp"/>
+      </component>
+    </collection>
+    <collection id="messagingapps" name="Messaging Apps" level="apps2">
+      <component id="messagingui" name="Messaging UI" filter="techview" purpose="development">
+        <unit bldFile="messagingapps/messagingui/Group" mrp="messagingapps/messagingui/Group/techview_messagingui.mrp"/>
+      </component>
+    </collection>
+    <collection id="telephonyapps" name="Telephony Apps" level="apps1">
+      <component id="techviewphoneui" name="Phone UI" filter="techview" purpose="development">
+        <unit bldFile="telephonyapps/techviewphoneui/group" mrp="telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkingapps" name="Networking Apps" level="apps1">
+      <component id="iapstatusapp" name="IAP Status App" filter="techview" purpose="development">
+        <unit bldFile="networkingapps/iapstatusapp/group" mrp="networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
+      </component>
+      <component id="networkingagentnotifier" name="Networking Agent Notifier" filter="techview" introduced="7.0s" purpose="development" class="plugin">
+        <unit bldFile="networkingapps/networkingagentnotifier/group" mrp="networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
+      </component>
+      <component id="techviewvpnui" name="VPN UI" filter="techview" introduced="7.0" purpose="development">
+        <unit bldFile="networkingapps/techviewvpnui/group" mrp="networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkingutils" name="Networking Utils" level="utils">
+      <component id="ipadministrationtool" name="IP Administration Tool" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="networkingutils/ipadministrationtool/group"/>
+      </component>
+      <component id="nameresolverutility" name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
+        <unit mrp="networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="networkingutils/nameresolverutility/group"/>
+      </component>
+    </collection>
+    <collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
+      <component id="techviewusbui" name="USB UI" filter="techview" purpose="development">
+        <unit bldFile="shortlinkapps/techviewusbui/group" mrp="shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
+      </component>
+      <component id="bluetoothui" name="Bluetooth UI" filter="techview" purpose="development">
+        <unit bldFile="shortlinkapps/bluetoothui/group" mrp="shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
+      </component>
+      <component id="reftsp" name="Remote Control Reference TSP" filter="techview" introduced="9.1" purpose="development" class="plugin">
+		<unit bldFile="shortlinkapps/reftsp/group" mrp="shortlinkapps/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
+      </component>
+    </collection>
+    <collection id="testapps" name="Test Apps" level="utils">
+      <component id="simpleapp" name="Simple App" filter="techview" purpose="development">
+        <unit bldFile="testapps/simpleapp/group" mrp="testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
+      </component>
+      <component id="statdevice" name="STAT Device" filter="techview" purpose="development">
+        <unit bldFile="../../os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="../../os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
+      </component>
+      <component id="rschandlerui" name="Resource Handler UI" filter="techview" purpose="development">
+        <unit bldFile="testapps/rschandler/TVResourceHandler/group" mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
+      </component>
+      <component id="graphicstestutils" name="Graphics Test Utils" filter="techview" introduced="9.2" purpose="development">
+        <unit bldFile="testapps/graphicstestutils/group" mrp="testapps/graphicstestutils/group/graphics_testutils.mrp"/>
+      </component>
+      <component id="rschandler" name="Resource Handler" deprecated="^3" purpose="development" filter="test">
+        <unit mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="testapps/rschandler/TVResourceHandler/group"/>
+      </component>
+    </collection>
+    <collection id="avapps" name="A/V Apps" level="apps3">
+      <component id="techviewaudio" name="Audio" filter="techview" purpose="development">
+        <unit bldFile="avapps/techviewaudio/Group" mrp="avapps/techviewaudio/Group/techview_audio.mrp"/>
+      </component>
+    </collection>
+    <collection id="toolkit" name="Toolkit" level="utils">
+      <component id="romkit" name="ROM Kit" filter="techview" purpose="development">
+        <unit bldFile="toolkit/romkit/group" mrp="toolkit/romkit/group/techview_romkit.mrp"/>
+      </component>
+      <component id="romimages" name="ROM Images" filter="techview" purpose="development">
+        <unit version="tb101sf" bldFile="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys" mrp="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys/reference_roms_tb101sf.mrp"/>
+      </component>
+      <component id="configfiles" name="Configuration Files" filter="techview" purpose="development">
+        <unit mrp="toolkit/configfiles/techview_epoc_ini.mrp"/>
+      </component>
+
+    </collection>
+    <collection id="techview_info" name="Techview Info" level="apps3">
+      <component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="techview_info/techview_metadata/techview_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/techview/package_definition_3.0.xml
--- a/symbian4/app/techview/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="techview" name="Techview" levels="services ui utils apps1 apps2 apps3">
-    <collection id="buildverification" name="Build Verification" level="services">
-     <component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-        <unit bldFile="buildverification/autosmoketest/Group" mrp="buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-      </component>
-      <component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
-        <unit bldFile="buildverification/smoketest/Group" mrp="buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-      </component>
-    </collection>
-    <collection id="techviewplat" name="Techview Platform" level="services">
-      <component id="techviewuiklaf" name="UIKLAF" filter="techview" purpose="development">
-        <unit bldFile="techviewplat/techviewuiklaf/GROUP" mrp="techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
-      </component>
-      <component id="eikstdtv" name="EIKSTD" filter="techview" purpose="development">
-        <unit bldFile="techviewplat/eikstd/group" mrp="techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
-      </component>
-      <component id="feps" name="FEPS" filter="techview" purpose="development">
-        <unit bldFile="techviewplat/feps/group" mrp="techviewplat/feps/group/techview_feps.mrp"/>
-      </component>
-    </collection>
-    <collection id="techviewui" name="Techview UI" level="ui">
-      <component id="techviewextras" name="Extras" filter="techview" purpose="development">
-        <unit bldFile="techviewui/techviewextras/group" mrp="techviewui/techviewextras/group/techview_extras.mrp"/>
-      </component>
-      <component id="statuspane" name="Status Pane" filter="techview" purpose="development">
-        <unit bldFile="techviewui/statuspane/group" mrp="techviewui/statuspane/group/techview_statuspane.mrp"/>
-      </component>
-      <component id="shell" name="Shell" filter="techview" purpose="development">
-        <unit bldFile="techviewui/shell/group" mrp="techviewui/shell/group/techview_shell.mrp"/>
-      </component>
-      <component id="startuptv" name="Techview Startup" filter="techview" purpose="development">
-        <unit bldFile="techviewui/startup/group" mrp="techviewui/startup/group/techview_startup.mrp"/>
-      </component>
-    </collection>
-    <collection id="tv_controlpanel" name="Control Panel" level="ui">
-      <component id="fepsetup" name="FEP Setup" filter="techview" purpose="development">
-        <unit bldFile="controlpanel/fepsetup/group" mrp="controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
-      </component>
-      <component id="cctlcolscheme" name="Colour Scheme Control" filter="techview" purpose="development">
-        <unit bldFile="controlpanel/cctlcolscheme/group" mrp="controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
-      </component>
-      <component id="soundsetup" name="Sound Setup" filter="techview" purpose="development">
-        <unit bldFile="controlpanel/soundsetup/group" mrp="controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
-      </component>
-      <component id="keyclickref" name="Key Click Ref" filter="techview" purpose="development" class="plugin">
-        <unit bldFile="controlpanel/keyclickref/Group" mrp="controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
-      </component>
-    </collection>
-    <collection id="pimapps" name="PIM Apps" level="apps3">
-      <component id="contacui" name="Contacts UI" filter="techview" purpose="development">
-        <unit bldFile="pimapps/contacui/group" mrp="pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
-      </component>
-      <component id="agenda" name="Agenda UI" filter="techview" purpose="development">
-        <unit bldFile="pimapps/agenda/group" mrp="pimapps/agenda/group/techview_agenda.mrp"/>
-      </component>
-      <component id="contactstechview" name="Contacts" filter="techview" purpose="development">
-        <unit bldFile="pimapps/contactstechview/group" mrp="pimapps/contactstechview/group/techview_contacts.mrp"/>
-      </component>
-    </collection>
-    <collection id="securityapps" name="Security Apps" level="apps3">
-      <component id="secuitv" name="Techview Security UI" filter="techview" purpose="development">
-        <unit bldFile="securityapps/secui/group" mrp="securityapps/secui/group/techview_secui.mrp"/>
-      </component>
-      <component id="securityupstechview" name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
-        <unit bldFile="securityapps/securityupstechview/group" mrp="securityapps/securityupstechview/group/security_ups_techview.mrp"/>
-      </component>
-    </collection>
-    <collection id="utilityapps" name="Utility Apps" level="apps2">
-      <component id="helptechview" name="Help" filter="techview" purpose="development">
-        <unit bldFile="utilityapps/helptechview/group" mrp="utilityapps/helptechview/group/techview_help.mrp"/>
-      </component>
-      <component id="timew" name="World Time" filter="techview" purpose="development">
-        <unit bldFile="utilityapps/timew/group" mrp="utilityapps/timew/group/techview_timew.mrp"/>
-      </component>
-      <component id="cpumonitor" name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
-        <unit bldFile="utilityapps/cpumonitor/group" mrp="utilityapps/cpumonitor/group/techview_cpumonitor.mrp"/>
-      </component>
-    </collection>
-    <collection id="installationapps" name="Installation Apps" level="apps2">
-      <component id="installapp" name="Install App" filter="techview" purpose="development">
-        <unit bldFile="installationapps/installapp/group" mrp="installationapps/installapp/group/techview_installapp.mrp"/>
-      </component>
-    </collection>
-    <collection id="messagingapps" name="Messaging Apps" level="apps2">
-      <component id="messagingui" name="Messaging UI" filter="techview" purpose="development">
-        <unit bldFile="messagingapps/messagingui/Group" mrp="messagingapps/messagingui/Group/techview_messagingui.mrp"/>
-      </component>
-    </collection>
-    <collection id="telephonyapps" name="Telephony Apps" level="apps1">
-      <component id="techviewphoneui" name="Phone UI" filter="techview" purpose="development">
-        <unit bldFile="telephonyapps/techviewphoneui/group" mrp="telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkingapps" name="Networking Apps" level="apps1">
-      <component id="iapstatusapp" name="IAP Status App" filter="techview" purpose="development">
-        <unit bldFile="networkingapps/iapstatusapp/group" mrp="networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
-      </component>
-      <component id="networkingagentnotifier" name="Networking Agent Notifier" filter="techview" introduced="7.0s" purpose="development" class="plugin">
-        <unit bldFile="networkingapps/networkingagentnotifier/group" mrp="networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
-      </component>
-      <component id="techviewvpnui" name="VPN UI" filter="techview" introduced="7.0" purpose="development">
-        <unit bldFile="networkingapps/techviewvpnui/group" mrp="networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkingutils" name="Networking Utils" level="utils">
-      <component id="ipadministrationtool" name="IP Administration Tool" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="networkingutils/ipadministrationtool/group"/>
-      </component>
-      <component id="nameresolverutility" name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
-        <unit mrp="networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="networkingutils/nameresolverutility/group"/>
-      </component>
-    </collection>
-    <collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
-      <component id="techviewusbui" name="USB UI" filter="techview" purpose="development">
-        <unit bldFile="shortlinkapps/techviewusbui/group" mrp="shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
-      </component>
-      <component id="bluetoothui" name="Bluetooth UI" filter="techview" purpose="development">
-        <unit bldFile="shortlinkapps/bluetoothui/group" mrp="shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
-      </component>
-      <component id="reftsp" name="Remote Control Reference TSP" filter="techview" introduced="9.1" purpose="development" class="plugin">
-		<unit bldFile="shortlinkapps/reftsp/group" mrp="shortlinkapps/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
-      </component>
-    </collection>
-    <collection id="testapps" name="Test Apps" level="utils">
-      <component id="simpleapp" name="Simple App" filter="techview" purpose="development">
-        <unit bldFile="testapps/simpleapp/group" mrp="testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
-      </component>
-      <component id="statdevice" name="STAT Device" filter="techview" purpose="development">
-        <unit bldFile="../../os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="../../os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
-      </component>
-      <component id="rschandlerui" name="Resource Handler UI" filter="techview" purpose="development">
-        <unit bldFile="testapps/rschandler/TVResourceHandler/group" mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
-      </component>
-      <component id="graphicstestutils" name="Graphics Test Utils" filter="techview" introduced="9.2" purpose="development">
-        <unit bldFile="testapps/graphicstestutils/group" mrp="testapps/graphicstestutils/group/graphics_testutils.mrp"/>
-      </component>
-      <component id="rschandler" name="Resource Handler" deprecated="^3" purpose="development" filter="test">
-        <unit mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="testapps/rschandler/TVResourceHandler/group"/>
-      </component>
-    </collection>
-    <collection id="avapps" name="A/V Apps" level="apps3">
-      <component id="techviewaudio" name="Audio" filter="techview" purpose="development">
-        <unit bldFile="avapps/techviewaudio/Group" mrp="avapps/techviewaudio/Group/techview_audio.mrp"/>
-      </component>
-    </collection>
-    <collection id="toolkit" name="Toolkit" level="utils">
-      <component id="romkit" name="ROM Kit" filter="techview" purpose="development">
-        <unit bldFile="toolkit/romkit/group" mrp="toolkit/romkit/group/techview_romkit.mrp"/>
-      </component>
-      <component id="romimages" name="ROM Images" filter="techview" purpose="development">
-        <unit version="tb101sf" bldFile="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys" mrp="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys/reference_roms_tb101sf.mrp"/>
-      </component>
-      <component id="configfiles" name="Configuration Files" filter="techview" purpose="development">
-        <unit mrp="toolkit/configfiles/techview_epoc_ini.mrp"/>
-      </component>
-
-    </collection>
-    <collection id="techview_info" name="Techview Info" level="apps3">
-      <component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="techview_info/techview_metadata/techview_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/videoeditor/package_definition.xml
--- a/symbian4/app/videoeditor/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/videoeditor/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,140 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-        <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-          <component name="video_editor_engine_api" filter="sf_build" long-name="Video Editor Engine API" introduced="^2" class="api">
-            <unit bldFile="/sf/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-          </component>
-        </collection>
-        <collection name="videditor" long-name="Video Editor" level="ui">
-          <component name="videoeditorcommon" filter="sf_build" long-name="Video Editor Common" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
-          </component>
-          <component name="videoeditoruicomponents" filter="sf_build" long-name="Video Editor UI Components" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-          </component>
-          <component name="simplevideoeditor" filter="sf_build" long-name="Simple Video Editor" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
-          </component>
-          <component name="simplecutvideo" filter="sf_build" long-name="Simple Cut Video" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
-          </component>
-          <component name="videoprovider" filter="sf_build" long-name="Video Provider" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
-          </component>
-          <component name="manualvideoeditor" filter="sf_build" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-            <!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
+<SystemDefinition schema="3.0.0">
+  <package id="videoeditor" name="Video Editor Apps" levels="engine ui">
+    <collection id="videoeditor_plat" filter="sf_build" name="Video Editor Apps Platform Interfaces" level="ui">
+      <component id="video_editor_engine_api" filter="sf_build" name="Video Editor Engine API" class="api" introduced="^2">
+        <meta rel="Api" href="videoeditor_plat/video_editor_engine_api/video_editor_engine_api.metaxml"/>
+        <unit bldFile="videoeditor_plat/video_editor_engine_api/group"/>
+      </component>
+    </collection>
+    <collection id="videditor" name="Video Editor" level="ui">
+      <component id="videoeditorcommon" filter="sf_build" name="Video Editor Common" introduced="^2">
+        <unit bldFile="videditor/videoeditorcommon/group"/>
+      </component>
+      <component id="videoeditoruicomponents" filter="sf_build" name="Video Editor UI Components" introduced="^2">
+        <unit bldFile="videditor/videoeditoruicomponents/group"/>
+      </component>
+      <component id="simplevideoeditor" filter="sf_build" name="Simple Video Editor" introduced="^2">
+        <unit bldFile="videditor/simplevideoeditor/group"/>
+      </component>
+      <component id="simplecutvideo" filter="sf_build" name="Simple Cut Video" introduced="^2">
+        <unit bldFile="videditor/simplecutvideo/group"/>
+      </component>
+      <component id="videoprovider" filter="sf_build" name="Video Provider" introduced="^2">
+        <unit bldFile="videditor/videoprovider/group"/>
+      </component>
+      <component id="manualvideoeditor" filter="sf_build" name="Manual Video Editor" introduced="^2">
+      <!--  uncomment when supported
+      	<meta rel="config">
+      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
+      	</meta>
         <unit bldFile="videditor/manualvideoeditor/group"/> -->
-          </component>
-          <component name="videditor_build" filter="sf_build" long-name="Video Editor Build" introduced="^2">
-            <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-            <unit bldFile="/sf/app/videoeditor/videditor/group"/>
-          </component>
-        </collection>
-        <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-          <component name="audioeditorengine" filter="sf_build" long-name="Audio Editor Engine" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-          </component>
-          <component name="avcedit" filter="sf_build" long-name="AVC Editing" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
-          </component>
-          <component name="h263decoder" filter="sf_build" long-name="H.263 Decoder" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
-          </component>
-          <component name="mp3aacmaniplib" filter="sf_build" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-          </component>
-          <component name="vedtranscoder" filter="sf_build" long-name="Video Editor Transcoder" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-          </component>
-          <component name="vedengine" filter="sf_build" long-name="Video Editor Engine" introduced="^2">
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
-          </component>
-          <component name="videoeditorengine_build" filter="sf_build" long-name="Video Editor Engine Build" introduced="^2">
-            <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-            <unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+      </component>
+      <component id="videditor_build" filter="sf_build" name="Video Editor Build" introduced="^2">
+		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+        <unit bldFile="videditor/group"/>
+      </component>
+    </collection>
+    <collection id="videoeditorengine" name="Video Editor Engine" level="engine">
+      <component id="audioeditorengine" filter="sf_build" name="Audio Editor Engine" introduced="^2">
+        <unit bldFile="videoeditorengine/audioeditorengine/group"/>
+      </component>
+      <component id="avcedit" filter="sf_build" name="AVC Editing" introduced="^2">
+        <unit bldFile="videoeditorengine/avcedit/group"/>
+      </component>
+      <component id="h263decoder" filter="sf_build" name="H.263 Decoder" introduced="^2">
+        <unit bldFile="videoeditorengine/h263decoder/group"/>
+      </component>
+      <component id="mp3aacmaniplib" filter="sf_build" name="MP3 and AAC Manipulation Library" introduced="^2">
+        <unit bldFile="videoeditorengine/mp3aacmaniplib/group"/>
+      </component>
+      <component id="vedtranscoder" filter="sf_build" name="Video Editor Transcoder" introduced="^2">
+        <unit bldFile="videoeditorengine/vedtranscoder/group"/>
+      </component>
+      <component id="vedengine" filter="sf_build" name="Video Editor Engine" introduced="^2">
+        <unit bldFile="videoeditorengine/vedengine/group"/>
+      </component>
+      <component id="videoeditorengine_build" filter="sf_build" name="Video Editor Engine Build" introduced="^2">
+		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+        <unit bldFile="videoeditorengine/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/videoeditor/package_definition_3.0.xml
--- a/symbian4/app/videoeditor/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="videoeditor" name="Video Editor Apps" levels="engine ui">
-    <collection id="videoeditor_plat" filter="sf_build" name="Video Editor Apps Platform Interfaces" level="ui">
-      <component id="video_editor_engine_api" filter="sf_build" name="Video Editor Engine API" class="api" introduced="^2">
-        <meta rel="Api" href="videoeditor_plat/video_editor_engine_api/video_editor_engine_api.metaxml"/>
-        <unit bldFile="videoeditor_plat/video_editor_engine_api/group"/>
-      </component>
-    </collection>
-    <collection id="videditor" name="Video Editor" level="ui">
-      <component id="videoeditorcommon" filter="sf_build" name="Video Editor Common" introduced="^2">
-        <unit bldFile="videditor/videoeditorcommon/group"/>
-      </component>
-      <component id="videoeditoruicomponents" filter="sf_build" name="Video Editor UI Components" introduced="^2">
-        <unit bldFile="videditor/videoeditoruicomponents/group"/>
-      </component>
-      <component id="simplevideoeditor" filter="sf_build" name="Simple Video Editor" introduced="^2">
-        <unit bldFile="videditor/simplevideoeditor/group"/>
-      </component>
-      <component id="simplecutvideo" filter="sf_build" name="Simple Cut Video" introduced="^2">
-        <unit bldFile="videditor/simplecutvideo/group"/>
-      </component>
-      <component id="videoprovider" filter="sf_build" name="Video Provider" introduced="^2">
-        <unit bldFile="videditor/videoprovider/group"/>
-      </component>
-      <component id="manualvideoeditor" filter="sf_build" name="Manual Video Editor" introduced="^2">
-      <!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-      </component>
-      <component id="videditor_build" filter="sf_build" name="Video Editor Build" introduced="^2">
-		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-        <unit bldFile="videditor/group"/>
-      </component>
-    </collection>
-    <collection id="videoeditorengine" name="Video Editor Engine" level="engine">
-      <component id="audioeditorengine" filter="sf_build" name="Audio Editor Engine" introduced="^2">
-        <unit bldFile="videoeditorengine/audioeditorengine/group"/>
-      </component>
-      <component id="avcedit" filter="sf_build" name="AVC Editing" introduced="^2">
-        <unit bldFile="videoeditorengine/avcedit/group"/>
-      </component>
-      <component id="h263decoder" filter="sf_build" name="H.263 Decoder" introduced="^2">
-        <unit bldFile="videoeditorengine/h263decoder/group"/>
-      </component>
-      <component id="mp3aacmaniplib" filter="sf_build" name="MP3 and AAC Manipulation Library" introduced="^2">
-        <unit bldFile="videoeditorengine/mp3aacmaniplib/group"/>
-      </component>
-      <component id="vedtranscoder" filter="sf_build" name="Video Editor Transcoder" introduced="^2">
-        <unit bldFile="videoeditorengine/vedtranscoder/group"/>
-      </component>
-      <component id="vedengine" filter="sf_build" name="Video Editor Engine" introduced="^2">
-        <unit bldFile="videoeditorengine/vedengine/group"/>
-      </component>
-      <component id="videoeditorengine_build" filter="sf_build" name="Video Editor Engine Build" introduced="^2">
-		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-        <unit bldFile="videoeditorengine/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/videoplayer/package_definition.xml
--- a/symbian4/app/videoplayer/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,154 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-          </component>
-          <component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="videocollectionwrapper_test" filter="test,qt_unit_test" long-name="Video Collection Wrapper Tests" introduced="^4">
-            <!--Can only have one unit. Need to split into separate component or #include from a common file-->
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" proFile="testvideocollectionclient.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener" proFile="testvideocollectionlistener.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p" proFile="testvideocollectionwrapper_p.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideodatacontainer" proFile="testvideodatacontainer.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideodeleteworker" proFile="testvideodeleteworker.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideomodel" proFile="testvideomodel.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideomodel_p" proFile="testvideomodel_p.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel" proFile="testvideosortfilterproxymodel.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata" proFile="testvideothumbnaildata.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p" proFile="testvideothumbnaildata_p.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher" proFile="testvideothumbnailfetcher.pro"/>
-          </component>
-          <component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="videocollectionview_test" filter="test,qt_unit_test" long-name="Video Collection View Tests">
-            <!--Can only have one unit. Need to split into separate components or #include from a common file-->
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testcollectionview" proFile="testcollectionview.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testhintwidget" proFile="testhintwidget.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistview" proFile="testlistview.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistwidget" proFile="testlistwidget.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionuiloader" proFile="testvideocollectionuiloader.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionviewutils" proFile="testvideocollectionviewutils.pro"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideolistselectiondialog" proFile="testvideolistselectiondialog.pro"/>
-          </component>
-          <component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-        <collection name="mediasettings" long-name="Media Settings" level="support">
-          <!--  this is really a component. Should be moved down a directory -->
-          <component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-            <unit bldFile="/sf/app/videoplayer/mediasettings/group"/>
-          </component>
-        </collection>
-        <collection name="videoplayerapp" long-name="Video Player App" level="apps">
-          <component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.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">
-            <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">
-            <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">
-            <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="videoplayer" name="Video Player Apps" levels="support plugin util apps" xmlns:qt="http://www.nokia.com/qt">
+  <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
+   <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
+    <unit bldFile="videoplayer_plat/videoplayer_startup_api/group"/>
+   </component>
+   <component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
+    <unit bldFile="videoplayer_plat/videocollection_api/group"/>
+   </component>
+  </collection>
+  <collection id="videocollection" name="Video Collection" level="util">
+   <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+    <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
+   </component>
+   <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
+    <unit bldFile="videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
+   </component>
+     <component id="videocollectionwrapper_test" filter="test,qt_unit_test" name="Video Collection Wrapper Tests" introduced="^4">
+      <!--Can only have one unit. Need to split into separate component or #include from a common file-->
+      <meta rel="testbuild">
+       <group name="vado.videocollection.tsrc"/>
+      </meta>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" qt:proFile="testvideocollectionclient.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener" qt:proFile="testvideocollectionlistener.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p" qt:proFile="testvideocollectionwrapper_p.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideodatacontainer" qt:proFile="testvideodatacontainer.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideodeleteworker" qt:proFile="testvideodeleteworker.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideomodel" qt:proFile="testvideomodel.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideomodel_p" qt:proFile="testvideomodel_p.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel" qt:proFile="testvideosortfilterproxymodel.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata" qt:proFile="testvideothumbnaildata.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p" qt:proFile="testvideothumbnaildata_p.pro"/>
+      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher" qt:proFile="testvideothumbnailfetcher.pro"/>
+     </component>
+   <component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
+    <unit bldFile="videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
+   </component>
+    <component id="videocollectionview_test" filter="test,qt_unit_test" name="Video Collection View Tests">
+      <!--Can only have one unit. Need to split into separate components or #include from a common file-->
+      <meta rel="testbuild">
+       <group name="vado.videocollection.tsrc"/>
+      </meta>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testcollectionview" qt:proFile="testcollectionview.pro"/>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testhintwidget" qt:proFile="testhintwidget.pro"/>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testlistview" qt:proFile="testlistview.pro"/>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testlistwidget" qt:proFile="testlistwidget.pro"/>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testvideocollectionuiloader" qt:proFile="testvideocollectionuiloader.pro"/>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testvideocollectionviewutils" qt:proFile="testvideocollectionviewutils.pro"/>
+      <unit bldFile="videocollection/videocollectionview/tsrc/testvideolistselectiondialog" qt:proFile="testvideolistselectiondialog.pro"/>
+     </component>
+   <component id="videofiledetailsview" filter="s60" name="Video File Details View" introduced="^4">
+    <unit bldFile="videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="mediasettings" name="Media Settings" level="support">
+   <!--  this is really a component. Should be moved down a directory -->
+   <component id="mediasettings_build" filter="s60" name="Media Settings Build">
+    <unit bldFile="mediasettings/group"/>
+   </component>
+  </collection>
+  <collection id="videoplayerapp" name="Video Player App" level="apps">
+   <component id="videoplayerengine" name="Video Player Engine" filter="s60"  introduced="^4">
+    <unit bldFile="videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
+    <unit bldFile="videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
+   <component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
+    <unit bldFile="videoplayback/hbvideoplaybackview"  qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
+    <unit bldFile="videoplayback/hbvideoplaybackviewplugin"  qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
+    <unit bldFile="videoplayback/videohelix/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
+
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/videoplayer/package_definition_3.0.xml
--- a/symbian4/app/videoplayer/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="videoplayer" name="Video Player Apps" levels="support plugin util apps" xmlns:qt="http://www.nokia.com/qt">
-  <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
-   <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
-    <unit bldFile="videoplayer_plat/videoplayer_startup_api/group"/>
-   </component>
-   <component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
-    <unit bldFile="videoplayer_plat/videocollection_api/group"/>
-   </component>
-  </collection>
-  <collection id="videocollection" name="Video Collection" level="util">
-   <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
-    <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
-   </component>
-   <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
-    <unit bldFile="videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
-   </component>
-     <component id="videocollectionwrapper_test" filter="test,qt_unit_test" name="Video Collection Wrapper Tests" introduced="^4">
-      <!--Can only have one unit. Need to split into separate component or #include from a common file-->
-      <meta rel="testbuild">
-       <group name="vado.videocollection.tsrc"/>
-      </meta>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" qt:proFile="testvideocollectionclient.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener" qt:proFile="testvideocollectionlistener.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p" qt:proFile="testvideocollectionwrapper_p.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideodatacontainer" qt:proFile="testvideodatacontainer.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideodeleteworker" qt:proFile="testvideodeleteworker.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideomodel" qt:proFile="testvideomodel.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideomodel_p" qt:proFile="testvideomodel_p.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel" qt:proFile="testvideosortfilterproxymodel.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata" qt:proFile="testvideothumbnaildata.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p" qt:proFile="testvideothumbnaildata_p.pro"/>
-      <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher" qt:proFile="testvideothumbnailfetcher.pro"/>
-     </component>
-   <component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
-    <unit bldFile="videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
-   </component>
-    <component id="videocollectionview_test" filter="test,qt_unit_test" name="Video Collection View Tests">
-      <!--Can only have one unit. Need to split into separate components or #include from a common file-->
-      <meta rel="testbuild">
-       <group name="vado.videocollection.tsrc"/>
-      </meta>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testcollectionview" qt:proFile="testcollectionview.pro"/>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testhintwidget" qt:proFile="testhintwidget.pro"/>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testlistview" qt:proFile="testlistview.pro"/>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testlistwidget" qt:proFile="testlistwidget.pro"/>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testvideocollectionuiloader" qt:proFile="testvideocollectionuiloader.pro"/>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testvideocollectionviewutils" qt:proFile="testvideocollectionviewutils.pro"/>
-      <unit bldFile="videocollection/videocollectionview/tsrc/testvideolistselectiondialog" qt:proFile="testvideolistselectiondialog.pro"/>
-     </component>
-   <component id="videofiledetailsview" filter="s60" name="Video File Details View" introduced="^4">
-    <unit bldFile="videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
-  <collection id="mediasettings" name="Media Settings" level="support">
-   <!--  this is really a component. Should be moved down a directory -->
-   <component id="mediasettings_build" filter="s60" name="Media Settings Build">
-    <unit bldFile="mediasettings/group"/>
-   </component>
-  </collection>
-  <collection id="videoplayerapp" name="Video Player App" level="apps">
-   <component id="videoplayerengine" name="Video Player Engine" filter="s60"  introduced="^4">
-    <unit bldFile="videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
-   </component>
-   <component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
-    <unit bldFile="videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
-  <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
-   <component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
-    <unit bldFile="videoplayback/hbvideoplaybackview"  qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
-   </component>
-   <component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
-    <unit bldFile="videoplayback/hbvideoplaybackviewplugin"  qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
-   </component>
-   <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
-    <unit bldFile="videoplayback/videohelix/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
-
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/videotelephony/package_definition.xml
--- a/symbian4/app/videotelephony/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/videotelephony/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,118 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
-        <collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
-          <component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
-            <unit bldFile="/sf/app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
-          </component>
-          <component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-          </component>
-        </collection>
-        <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-          <component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-            <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/Group"/>
-          </component>
-          <component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
-            <unit bldFile="/sf/app/videotelephony/vtengines/vtmediatorplugin/group"/>
-          </component>
-        </collection>
-        <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-          <component name="videotelui" filter="s60" long-name="Video Telephony UI">
-            <unit bldFile="/sf/app/videotelephony/vtuis/videotelui/group"/>
-          </component>
-        </collection>
-        <collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
-          <component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
-          </component>
-          <component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/VideoSource/group"/>
-          </component>
-        </collection>
-        <collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">
-          <!--  this collection is really a component, move down a directory -->
-          <component name="videotelproto" filter="s60" long-name="Video Telephony Protocol">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
-</SystemDefinition>
+<SystemDefinition schema="3.0.0">
+ <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
+  <collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
+   <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60">
+    <meta rel="Api" href="videotelephony_plat/video_telephony_control_mediator_api/video_telephony_control_mediator_api.metaxml"/>
+    <unit bldFile="videotelephony_plat/video_telephony_control_mediator_api/group"/>
+   </component>
+   <component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="videotelephony_plat/video_telephony_media_configuration_api/video_telephony_media_configuration_api.metaxml"/>
+    <unit bldFile="videotelephony_plat/video_telephony_media_configuration_api/group"/>
+   </component>
+  </collection>
+  <collection id="vtengines" name="Video Telephony Engines" level="engine">
+   <component id="videoteleng" filter="s60" name="Video Telephony Engine">
+    <unit bldFile="vtengines/videoteleng/Group"/>
+   </component>
+   <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
+    <unit bldFile="vtengines/vtmediatorplugin/group"/>
+   </component>
+  </collection>
+  <collection id="vtuis" name="Video Telephony UIs" level="ui">
+   <component id="videotelui" filter="s60" name="Video Telephony UI">
+    <unit bldFile="vtuis/videotelui/group"/>
+   </component>
+  </collection>
+  <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
+   <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
+    <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
+   </component>
+   <component id="videosource" filter="s60" name="Video Source" introduced="^2">
+    <unit bldFile="vtprotocolplugins/VideoSource/group"/>
+   </component>
+  </collection>
+  <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
+   <!--  this collection is really a component, move down a directory -->
+   <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
+    <unit bldFile="vtprotocolsstub/group" filter="sf_build"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>
\ No newline at end of file
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/app/videotelephony/package_definition_3.0.xml
--- a/symbian4/app/videotelephony/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
-  <collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
-   <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60">
-    <meta rel="Api" href="videotelephony_plat/video_telephony_control_mediator_api/video_telephony_control_mediator_api.metaxml"/>
-    <unit bldFile="videotelephony_plat/video_telephony_control_mediator_api/group"/>
-   </component>
-   <component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="videotelephony_plat/video_telephony_media_configuration_api/video_telephony_media_configuration_api.metaxml"/>
-    <unit bldFile="videotelephony_plat/video_telephony_media_configuration_api/group"/>
-   </component>
-  </collection>
-  <collection id="vtengines" name="Video Telephony Engines" level="engine">
-   <component id="videoteleng" filter="s60" name="Video Telephony Engine">
-    <unit bldFile="vtengines/videoteleng/Group"/>
-   </component>
-   <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
-    <unit bldFile="vtengines/vtmediatorplugin/group"/>
-   </component>
-  </collection>
-  <collection id="vtuis" name="Video Telephony UIs" level="ui">
-   <component id="videotelui" filter="s60" name="Video Telephony UI">
-    <unit bldFile="vtuis/videotelui/group"/>
-   </component>
-  </collection>
-  <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
-   <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
-    <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
-   </component>
-   <component id="videosource" filter="s60" name="Video Source" introduced="^2">
-    <unit bldFile="vtprotocolplugins/VideoSource/group"/>
-   </component>
-  </collection>
-  <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
-   <!--  this collection is really a component, move down a directory -->
-   <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
-    <unit bldFile="vtprotocolsstub/group" filter="sf_build"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
\ No newline at end of file
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/accesssec/package_definition.xml
--- a/symbian4/mw/accesssec/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,150 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-          <component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-          </component>
-          <component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-          </component>
-          <component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-          </component>
-          <component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-          </component>
-          <component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-          </component>
-          <component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-          </component>
-          <component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-          </component>
-          <component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_type_api/group"/>
-          </component>
-          <component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-          </component>
-          <component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-          </component>
-          <component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-          </component>
-          <component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-          </component>
-          <component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-          </component>
-          <component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-          </component>
-        </collection>
-        <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-          <component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-            <!-- the directory for this needs to be moved up to the right level -->
-            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-          </component>
-          <component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-          </component>
-          <component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-          </component>
-          <component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-          </component>
-          <component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-          </component>
-        </collection>
-        <collection name="eapol" long-name="EAPOL" level="framework">
-          <component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-            <unit bldFile="/sf/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
+  <collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
+   <component id="wapi_security_settings_ui_api" name="WAPI Security Settings UI API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wapi_security_settings_ui_api/wapi_security_settings_ui_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wapi_security_settings_ui_api/group"/>
+   </component>
+   <component id="wep_security_settings_ui_api" name="WEP Security Settings UI API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wep_security_settings_ui_api/group"/>
+   </component>
+   <component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+   </component>
+   <component id="wlan_eap_settings_ui_api" name="WLAN EAP Settings UI API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wlan_eap_settings_ui_api/wlan_eap_settings_ui_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wlan_eap_settings_ui_api/group"/>
+   </component>
+   <component id="wpa_security_settings_ui_api" name="WPA Security Settings UI API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wpa_security_settings_ui_api/wpa_security_settings_ui_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wpa_security_settings_ui_api/group"/>
+   </component>
+   <component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eap_vpn_api/eap_vpn_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eap_vpn_api/group"/>
+   </component>
+   <component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapsim_db_api/eapsim_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapsim_db_api/group"/>
+   </component>
+   <component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eap_type_api/eap_type_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eap_type_api/group"/>
+   </component>
+   <component id="eaptlspeap_db_api" name="EAP-TLS-PEAP DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eaptlspeap_db_api/eaptlspeap_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eaptlspeap_db_api/group"/>
+   </component>
+   <component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapleap_db_api/eapleap_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapleap_db_api/group"/>
+   </component>
+   <component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapgtc_db_api/eapgtc_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapgtc_db_api/group"/>
+   </component>
+   <component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapmschapv2_db_api/eapmschapv2_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapmschapv2_db_api/group"/>
+   </component>
+   <component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapaka_db_api/eapaka_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapaka_db_api/group"/>
+   </component>
+   <component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wapi_db_api/wapi_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wapi_db_api/group"/>
+   </component>
+  </collection>
+  <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
+   <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
+    <!-- the directory for this needs to be moved up to the right level -->
+    <unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+   </component>
+   <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
+    <unit bldFile="wlansecuritysettings/wepsecuritysettingsui/group"/>
+   </component>
+   <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
+    <unit bldFile="wlansecuritysettings/wifiprotectedsetup/group"/>
+   </component>
+   <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
+    <unit bldFile="wlansecuritysettings/wlaneapsettingsui/group"/>
+   </component>
+   <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
+    <unit bldFile="wlansecuritysettings/wpasecuritysettingsui/group"/>
+   </component>
+  </collection>
+  <collection id="eapol" name="EAPOL" level="framework">
+   <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+    <unit bldFile="eapol/eapol_framework/eapol_symbian/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/accesssec/package_definition_3.0.xml
--- a/symbian4/mw/accesssec/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
-  <collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
-   <component id="wapi_security_settings_ui_api" name="WAPI Security Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wapi_security_settings_ui_api/wapi_security_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wapi_security_settings_ui_api/group"/>
-   </component>
-   <component id="wep_security_settings_ui_api" name="WEP Security Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wep_security_settings_ui_api/group"/>
-   </component>
-   <component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-   </component>
-   <component id="wlan_eap_settings_ui_api" name="WLAN EAP Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wlan_eap_settings_ui_api/wlan_eap_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wlan_eap_settings_ui_api/group"/>
-   </component>
-   <component id="wpa_security_settings_ui_api" name="WPA Security Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wpa_security_settings_ui_api/wpa_security_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wpa_security_settings_ui_api/group"/>
-   </component>
-   <component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eap_vpn_api/eap_vpn_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eap_vpn_api/group"/>
-   </component>
-   <component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapsim_db_api/eapsim_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapsim_db_api/group"/>
-   </component>
-   <component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eap_type_api/eap_type_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eap_type_api/group"/>
-   </component>
-   <component id="eaptlspeap_db_api" name="EAP-TLS-PEAP DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eaptlspeap_db_api/eaptlspeap_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eaptlspeap_db_api/group"/>
-   </component>
-   <component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapleap_db_api/eapleap_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapleap_db_api/group"/>
-   </component>
-   <component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapgtc_db_api/eapgtc_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapgtc_db_api/group"/>
-   </component>
-   <component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapmschapv2_db_api/eapmschapv2_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapmschapv2_db_api/group"/>
-   </component>
-   <component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapaka_db_api/eapaka_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapaka_db_api/group"/>
-   </component>
-   <component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wapi_db_api/wapi_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wapi_db_api/group"/>
-   </component>
-  </collection>
-  <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
-   <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
-    <!-- the directory for this needs to be moved up to the right level -->
-    <unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-   </component>
-   <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
-    <unit bldFile="wlansecuritysettings/wepsecuritysettingsui/group"/>
-   </component>
-   <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
-    <unit bldFile="wlansecuritysettings/wifiprotectedsetup/group"/>
-   </component>
-   <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
-    <unit bldFile="wlansecuritysettings/wlaneapsettingsui/group"/>
-   </component>
-   <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
-    <unit bldFile="wlansecuritysettings/wpasecuritysettingsui/group"/>
-   </component>
-  </collection>
-  <collection id="eapol" name="EAPOL" level="framework">
-   <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
-    <unit bldFile="eapol/eapol_framework/eapol_symbian/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,209 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-        <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-          </component>
-          <component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-          </component>
-          <component name="sifui_api" long-name="STIF UI API" filter="s60" 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">
-            <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-          </component>
-        </collection>
-        <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-          <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-          <component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-            <unit bldFile="/sf/mw/appinstall/ncdengine/engine/group"/>
-          </component>
-          <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-            <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-          </component>
-          <component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-            <unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
-          </component>
-        </collection>
-        <collection name="appinstaller" long-name="Application Installer" level="generic">
-          <component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
-            <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
-          </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">
-            <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
-          </component>
-        </collection>
-        <collection name="iaupdate" long-name="Independent Apps Update" level="api">
-          <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-          <component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-            <unit bldFile="/sf/mw/appinstall/iaupdate/iad/group"/>
-          </component>
-          <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-            <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
-          </component>
-          <component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-            <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
-          </component>
-        </collection>
-        <collection name="installationservices" long-name="Installation Services" level="generic">
-          <component name="swi" long-name="Secure Software Install" purpose="optional">
-            <unit bldFile="/sf/mw/appinstall/installationservices/swi/group" mrp="/sf/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-          </component>
-          <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-            <unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-          </component>
-          <component name="swcomponentregistry" long-name="Software Component Registry" introduced="^4" purpose="mandatory">
-            <unit bldFile="/sf/mw/appinstall/installationservices/swcomponentregistry/group" mrp="/sf/mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-          </component>
-          <component name="swinstallationfw" long-name="Software Installation Framework" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/mw/appinstall/installationservices/swinstallationfw/group" mrp="/sf/mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-          </component>
-          <component name="swtransactionservices" long-name="Software Transaction Services" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/mw/appinstall/installationservices/swtransactionservices/group" mrp="/sf/mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-          </component>
-          <component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="^4" purpose="development" plugin="Y">
-            <unit bldFile="/sf/mw/appinstall/installationservices/refswinstallationplugin/group" mrp="/sf/mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-          </component>
-          <component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="^4" purpose="development">
-            <unit bldFile="/sf/mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="/sf/mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-          </component>
-          <component name="switestfw" long-name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-            <unit mrp="/sf/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp" bldFile="/sf/mw/appinstall/installationservices/switestfw/group"/>
-          </component>
-          <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-            <unit bldFile="/sf/mw/appinstall/installationservices/swiconfig/group" mrp="/sf/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-          </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">
-            <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">
-            <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-          </component>
-          <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-            <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-          </component>
-          <component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-            <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/group" mrp="/sf/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-          </component>
-        </collection>
-        <collection name="appinstall_info" long-name="Application Installation Info" level="api">
-          <component name="appinstall_qt" filter="s60,test,api_test" long-name="Application Installation Qt">
-            <unit bldFile="/sf/mw/appinstall/." proFile="appinstall.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="appinstall_test" filter="s60,test,api_test" long-name="Application Installation Test" purpose="development">
-            <unit bldFile="/sf/mw/appinstall/tsrc/group"/>
-          </component>
-          <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="appinstall" name="Application Installation" levels="tool framework generic api">
+  <collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+   <component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/iaupdate_api/iaupdate_api.metaxml"/>
+    <unit bldFile="appinstall_plat/iaupdate_api/group"/>
+   </component>
+   <component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/task_plugin_api/task_plugin_api.metaxml"/>
+    <unit bldFile="appinstall_plat/task_plugin_api/group"/>
+   </component>
+   <component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_common_ui_api/sw_installer_common_ui_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_common_ui_api/group"/>
+   </component>
+   <component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_launcher_api/sw_installer_launcher_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_launcher_api/group"/>
+   </component>
+   <component id="task_management_api" name="Task Management API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/task_management_api/task_management_api.metaxml"/>
+    <unit bldFile="appinstall_plat/task_management_api/group"/>
+   </component>
+   <component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_ui_plugin_api/sw_installer_ui_plugin_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_ui_plugin_api/group"/>
+   </component>
+   <component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_cr_keys/sw_installer_cr_keys.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_cr_keys/group"/>
+   </component>
+   <component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_ps_keys/sw_installer_ps_keys.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_ps_keys/group"/>
+   </component>
+   <component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/appmngr2runtimeapi/appmngr2runtimeapi.metaxml"/>
+    <unit bldFile="appinstall_plat/appmngr2runtimeapi/group"/>
+   </component>
+   <component id="sifui_api" name="STIF UI API" class="api" filter="s60">
+    <unit bldFile="appinstall_plat/sifui_api/group"/>
+   </component>
+  </collection>
+  <collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+   <component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_pub/startup_list_management_api/startup_list_management_api.metaxml"/>
+    <unit bldFile="appinstall_pub/startup_list_management_api/group"/>
+   </component>
+  </collection>
+    <collection id="ncdengine" name="Nokia Content Discover" level="framework">
+    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+      <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+        <unit bldFile="ncdengine/engine/group"/>
+      </component>
+      <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+        <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+      </component>
+      <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+        <unit bldFile="ncdengine/group"/>
+      </component>
+    </collection>
+    <collection id="appinstaller" name="Application Installer" level="generic">
+      <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+        <unit bldFile="appinstaller/appinstui/group"/>
+      </component>
+    </collection>
+    <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+    	<!-- the collection is really a component. Move down a directory.-->
+      <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+        <unit bldFile="iaupdateapi_stub/group"/>
+      </component>
+    </collection>
+    <collection id="iaupdate" name="Independent Apps Update" level="api">
+    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+      <component id="iad" name="Software Update" filter="s60" introduced="^2">
+        <unit bldFile="iaupdate/iad/group"/>
+      </component>
+      <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+        <unit bldFile="iaupdate/help/group"/>
+      </component>
+      <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+        <unit bldFile="iaupdate/group"/>
+      </component>
+    </collection>
+    <collection id="installationservices" name="Installation Services" level="generic">
+      <component id="swi" name="Secure Software Install" purpose="optional">
+        <unit bldFile="installationservices/swi/group" mrp="installationservices/swi/group/security_swi.mrp"/>
+      </component>
+      <component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+        <unit bldFile="installationservices/swidevicetools/group" mrp="installationservices/swidevicetools/group/security_switools_device.mrp"/>
+      </component>
+      <component id="swcomponentregistry" name="Software Component Registry" introduced="^4" purpose="mandatory">
+        <unit bldFile="installationservices/swcomponentregistry/group" mrp="installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
+      </component>
+      <component id="swinstallationfw" name="Software Installation Framework" introduced="^4" purpose="optional">
+        <unit bldFile="installationservices/swinstallationfw/group" mrp="installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
+      </component>
+      <component id="swtransactionservices" name="Software Transaction Services" introduced="^4" purpose="optional">
+        <unit bldFile="installationservices/swtransactionservices/group" mrp="installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
+      </component>
+      <component id="refswinstallationplugin" name="Reference Software Installation Plugin" introduced="^4" purpose="development" class="plugin">
+        <unit bldFile="installationservices/refswinstallationplugin/group" mrp="installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
+      </component>
+      <component id="refsoftwareappmgr" name="Reference Software Application Manager" introduced="^4" purpose="development">
+        <unit bldFile="installationservices/refsoftwareappmgr/group" mrp="installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
+      </component>
+      <component id="switestfw" name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="installationservices/switestfw/group/install_testframework.mrp" bldFile="installationservices/switestfw/group"/>
+      </component>
+      <component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+        <unit bldFile="installationservices/swiconfig/group" mrp="installationservices/swiconfig/group/install_config.mrp"/>
+      </component>
+    </collection>
+    <collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+      <component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+        <unit bldFile="secureswitools/makekeys/group" mrp="secureswitools/makekeys/group/security_makekeys.mrp"/>
+      </component>
+      <component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+        <unit bldFile="secureswitools/swianalysistoolkit/group" mrp="secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+      </component>
+      <component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+        <unit mrp="secureswitools/openssllib/security_openssl.mrp"/>
+      </component>
+      <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+        <unit bldFile="secureswitools/swisistools/group" mrp="secureswitools/swisistools/group/security_sistools.mrp"/>
+      </component>
+    </collection>
+    <collection id="appinstall_info" name="Application Installation Info" level="api">
+      <component id="appinstall_qt" filter="s60,test,api_test" name="Application Installation Qt">
+        <unit bldFile="." qt:proFile="appinstall.pro" qt:qmakeArgs="-r"/>
+      </component>
+      <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
+        <unit bldFile="tsrc/group"/>
+      </component>
+      <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/appinstall/package_definition_3.0.xml
--- a/symbian4/mw/appinstall/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="appinstall" name="Application Installation" levels="tool framework generic api">
-  <collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
-   <component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/iaupdate_api/iaupdate_api.metaxml"/>
-    <unit bldFile="appinstall_plat/iaupdate_api/group"/>
-   </component>
-   <component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/task_plugin_api/task_plugin_api.metaxml"/>
-    <unit bldFile="appinstall_plat/task_plugin_api/group"/>
-   </component>
-   <component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/sw_installer_common_ui_api/sw_installer_common_ui_api.metaxml"/>
-    <unit bldFile="appinstall_plat/sw_installer_common_ui_api/group"/>
-   </component>
-   <component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/sw_installer_launcher_api/sw_installer_launcher_api.metaxml"/>
-    <unit bldFile="appinstall_plat/sw_installer_launcher_api/group"/>
-   </component>
-   <component id="task_management_api" name="Task Management API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/task_management_api/task_management_api.metaxml"/>
-    <unit bldFile="appinstall_plat/task_management_api/group"/>
-   </component>
-   <component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/sw_installer_ui_plugin_api/sw_installer_ui_plugin_api.metaxml"/>
-    <unit bldFile="appinstall_plat/sw_installer_ui_plugin_api/group"/>
-   </component>
-   <component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/sw_installer_cr_keys/sw_installer_cr_keys.metaxml"/>
-    <unit bldFile="appinstall_plat/sw_installer_cr_keys/group"/>
-   </component>
-   <component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/sw_installer_ps_keys/sw_installer_ps_keys.metaxml"/>
-    <unit bldFile="appinstall_plat/sw_installer_ps_keys/group"/>
-   </component>
-   <component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/appmngr2runtimeapi/appmngr2runtimeapi.metaxml"/>
-    <unit bldFile="appinstall_plat/appmngr2runtimeapi/group"/>
-   </component>
-   <component id="sifui_api" name="STIF UI API" class="api" filter="s60">
-    <unit bldFile="appinstall_plat/sifui_api/group"/>
-   </component>
-  </collection>
-  <collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
-   <component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_pub/startup_list_management_api/startup_list_management_api.metaxml"/>
-    <unit bldFile="appinstall_pub/startup_list_management_api/group"/>
-   </component>
-  </collection>
-    <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-      <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
-        <unit bldFile="ncdengine/engine/group"/>
-      </component>
-      <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
-        <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-      </component>
-      <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
-        <unit bldFile="ncdengine/group"/>
-      </component>
-    </collection>
-    <collection id="appinstaller" name="Application Installer" level="generic">
-      <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
-        <unit bldFile="appinstaller/appinstui/group"/>
-      </component>
-    </collection>
-    <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
-    	<!-- the collection is really a component. Move down a directory.-->
-      <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
-        <unit bldFile="iaupdateapi_stub/group"/>
-      </component>
-    </collection>
-    <collection id="iaupdate" name="Independent Apps Update" level="api">
-    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-      <component id="iad" name="Software Update" filter="s60" introduced="^2">
-        <unit bldFile="iaupdate/iad/group"/>
-      </component>
-      <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
-        <unit bldFile="iaupdate/help/group"/>
-      </component>
-      <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
-        <unit bldFile="iaupdate/group"/>
-      </component>
-    </collection>
-    <collection id="installationservices" name="Installation Services" level="generic">
-      <component id="swi" name="Secure Software Install" purpose="optional">
-        <unit bldFile="installationservices/swi/group" mrp="installationservices/swi/group/security_swi.mrp"/>
-      </component>
-      <component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-        <unit bldFile="installationservices/swidevicetools/group" mrp="installationservices/swidevicetools/group/security_switools_device.mrp"/>
-      </component>
-      <component id="swcomponentregistry" name="Software Component Registry" introduced="^4" purpose="mandatory">
-        <unit bldFile="installationservices/swcomponentregistry/group" mrp="installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-      </component>
-      <component id="swinstallationfw" name="Software Installation Framework" introduced="^4" purpose="optional">
-        <unit bldFile="installationservices/swinstallationfw/group" mrp="installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-      </component>
-      <component id="swtransactionservices" name="Software Transaction Services" introduced="^4" purpose="optional">
-        <unit bldFile="installationservices/swtransactionservices/group" mrp="installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-      </component>
-      <component id="refswinstallationplugin" name="Reference Software Installation Plugin" introduced="^4" purpose="development" class="plugin">
-        <unit bldFile="installationservices/refswinstallationplugin/group" mrp="installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-      </component>
-      <component id="refsoftwareappmgr" name="Reference Software Application Manager" introduced="^4" purpose="development">
-        <unit bldFile="installationservices/refsoftwareappmgr/group" mrp="installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.mrp"/>
-      </component>
-      <component id="switestfw" name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="installationservices/switestfw/group/install_testframework.mrp" bldFile="installationservices/switestfw/group"/>
-      </component>
-      <component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-        <unit bldFile="installationservices/swiconfig/group" mrp="installationservices/swiconfig/group/install_config.mrp"/>
-      </component>
-    </collection>
-    <collection id="secureswitools" name="Secure Software Install Tools" level="tool">
-      <component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
-        <unit bldFile="secureswitools/makekeys/group" mrp="secureswitools/makekeys/group/security_makekeys.mrp"/>
-      </component>
-      <component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
-        <unit bldFile="secureswitools/swianalysistoolkit/group" mrp="secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-      </component>
-      <component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
-        <unit mrp="secureswitools/openssllib/security_openssl.mrp"/>
-      </component>
-      <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
-        <unit bldFile="secureswitools/swisistools/group" mrp="secureswitools/swisistools/group/security_sistools.mrp"/>
-      </component>
-    </collection>
-    <collection id="appinstall_info" name="Application Installation Info" level="api">
-      <component id="appinstall_qt" filter="s60,test,api_test" name="Application Installation Qt">
-        <unit bldFile="." qt:proFile="appinstall.pro" qt:qmakeArgs="-r"/>
-      </component>
-      <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,378 +1,340 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
-          </component>
-        </collection>
-        <collection name="contextframework" long-name="Context Framework" level="framework">
-          <!-- the units that are commented out need to be put back when configuration is in place.
+<SystemDefinition schema="3.0.0">
+ <package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
+  <collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
+   <component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_pub/flash_viewer_framework_api/flash_viewer_framework_api.metaxml"/>
+    <unit bldFile="appsupport_pub/flash_viewer_framework_api/group"/>
+   </component>
+   <component id="network_status_api" name="Network Status API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_pub/network_status_api/network_status_api.metaxml"/>
+    <unit bldFile="appsupport_pub/network_status_api/group"/>
+   </component>
+  </collection>
+  <collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
+   <component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/action_plugin_api/action_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/action_plugin_api/group"/>
+   </component>
+   <component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/application_orientation_api/application_orientation_api.metaxml"/>
+    <unit bldFile="appsupport_plat/application_orientation_api/group"/>
+   </component>
+   <component id="context_access_api" name="Context Access API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_access_api/context_access_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_access_api/group"/>
+   </component>
+   <component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_framework_services_api/context_framework_services_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_framework_services_api/group"/>
+   </component>
+   <component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_framework_client_api/context_framework_client_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_framework_client_api/group"/>
+   </component>
+   <component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_framework_listener_api/context_framework_listener_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_framework_listener_api/group"/>
+   </component>
+   <component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_framework_version_api/context_framework_version_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_framework_version_api/group"/>
+   </component>
+   <component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_source_plugin_api/context_source_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_source_plugin_api/group"/>
+   </component>
+   <component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_source_settings_manager_api/context_source_settings_manager_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_source_settings_manager_api/group"/>
+   </component>
+   <component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_subscription_api/context_subscription_api.metaxml"/>
+    <unit bldFile="appsupport_plat/context_subscription_api/group"/>
+   </component>
+   <component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/key_event_framework_api/key_event_framework_api.metaxml"/>
+    <unit bldFile="appsupport_plat/key_event_framework_api/group"/>
+   </component>
+   <component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/key_event_framework_mapper_api/key_event_framework_mapper_api.metaxml"/>
+    <unit bldFile="appsupport_plat/key_event_framework_mapper_api/group"/>
+   </component>
+   <component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/media_keys_definition_api/media_keys_definition_api.metaxml"/>
+    <unit bldFile="appsupport_plat/media_keys_definition_api/group"/>
+   </component>
+   <component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/ood_threshold_api/ood_threshold_api.metaxml"/>
+    <unit bldFile="appsupport_plat/ood_threshold_api/group"/>
+   </component>
+   <component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/oom_monitor_api/oom_monitor_api.metaxml"/>
+    <unit bldFile="appsupport_plat/oom_monitor_api/group"/>
+   </component>
+   <component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/oom_monitor_plugin_api/oom_monitor_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/oom_monitor_plugin_api/group"/>
+   </component>
+   <component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/operation_provider_api/operation_provider_api.metaxml"/>
+    <unit bldFile="appsupport_plat/operation_provider_api/group"/>
+   </component>
+   <component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/phonecmdhandler_api/phonecmdhandler_api.metaxml"/>
+    <unit bldFile="appsupport_plat/phonecmdhandler_api/group"/>
+   </component>
+   <component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/restore_factory_settings_api/restore_factory_settings_api.metaxml"/>
+    <unit bldFile="appsupport_plat/restore_factory_settings_api/group"/>
+   </component>
+   <component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/restore_factory_settings_plugin_api/restore_factory_settings_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/restore_factory_settings_plugin_api/group"/>
+   </component>
+   <component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/secondary_display_accfw_api/secondary_display_accfw_api.metaxml"/>
+    <unit bldFile="appsupport_plat/secondary_display_accfw_api/group"/>
+   </component>
+   <component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/secondary_display_startup_api/secondary_display_startup_api.metaxml"/>
+    <unit bldFile="appsupport_plat/secondary_display_startup_api/group"/>
+   </component>
+   <component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/secondary_display_sysap_api/secondary_display_sysap_api.metaxml"/>
+    <unit bldFile="appsupport_plat/secondary_display_sysap_api/group"/>
+   </component>
+   <component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/secondary_display_system_state_api/secondary_display_system_state_api.metaxml"/>
+    <unit bldFile="appsupport_plat/secondary_display_system_state_api/group"/>
+   </component>
+   <component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/sensor_user_setting_api/sensor_user_setting_api.metaxml"/>
+    <unit bldFile="appsupport_plat/sensor_user_setting_api/group"/>
+   </component>
+   <component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/startup_configuration_api/startup_configuration_api.metaxml"/>
+    <unit bldFile="appsupport_plat/startup_configuration_api/group"/>
+   </component>
+   <component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/system_application_key_handler_plugin_api/system_application_key_handler_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/system_application_key_handler_plugin_api/group"/>
+   </component>
+   <component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/system_application_light_control_plugin_api/system_application_light_control_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/system_application_light_control_plugin_api/group"/>
+   </component>
+   <component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/system_application_notification_api/system_application_notification_api.metaxml"/>
+    <unit bldFile="appsupport_plat/system_application_notification_api/group"/>
+   </component>
+   <component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/system_application_plugin_callback_api/system_application_plugin_callback_api.metaxml"/>
+    <unit bldFile="appsupport_plat/system_application_plugin_callback_api/group"/>
+   </component>
+   <component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,!sf_build"  introduced="^2">
+      <unit bldFile="appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
+   </component>
+   <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build" introduced="^2">
+      <unit bldFile="appsupport_plat/flash_netscape_plugin_command_api/group"/>
+   </component>
+  </collection>
+  <collection id="contextframework" name="Context Framework" level="framework">
+   <!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-          <component name="cfw" filter="s60" long-name="Context Framework">
-            <!--<unit bldFile="contextframework/cfw/group"/> -->
-          </component>
-          <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-            <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-          </component>
-          <component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-            <unit bldFile="/sf/mw/appsupport/contextframework/group"/>
-          </component>
-        </collection>
-        <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-          <component name="dbrecovery" filter="s60" long-name="Database Recovery">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-          </component>
-          <component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" 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">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
-          </component>
-          <component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-          </component>
-          <component name="sysap" filter="s60" long-name="System Application">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
-          </component>
-          <component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-          </component>
-          <component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-          </component>
-          <component name="kefmapper" filter="s60" long-name="Key Event Framework">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/kefmapper/group"/>
-          </component>
-          <component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-          </component>
-          <component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-          </component>
-          <component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-          </component>
-          <component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-          </component>
-          <component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" 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">
-            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
-          </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"/>
-        </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">
-            <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">
-            <unit bldFile="/sf/mw/appsupport/startupservices/splashscreen/group"/>
-          </component>
-          <component name="startupanimation" filter="s60" long-name="Startup Animation">
-            <unit bldFile="/sf/mw/appsupport/startupservices/startupanimation/group"/>
-          </component>
-          <component name="startup" long-name="Startup Application" filter="s60">
-            <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">
-            <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-          </component>
-          <component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
-            <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">
-            <unit bldFile="/sf/mw/appsupport/systemsettings/gssensorplugin/group"/>
-          </component>
-          <component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-          </component>
-        </collection>
-        <collection name="filehandling" long-name="File Handling" level="server">
-          <component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-            <unit bldFile="/sf/mw/appsupport/filehandling/fileconverterfw/group" mrp="/sf/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-          </component>
-          <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-          </component>
-          <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-          </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">
-            <unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-          </component>
-        </collection>
-        <collection name="commonappservices" long-name="Common Application Services" level="framework">
-          <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">
-            <unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-          </component>
-          <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
-            <unit mrp="/sf/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="/sf/mw/appsupport/commonappservices/coreappstest/Group"/>
-          </component>
-          <component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-          </component>
-          <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-            <unit bldFile="/sf/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/sf/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-          </component>
-        </collection>
-        <collection name="tzservices" long-name="Time Zone Services" level="plugin">
-          <component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/mw/appsupport/tzservices/tzserver/group" mrp="/sf/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-          </component>
-          <component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/mw/appsupport/tzservices/tzloc/group" mrp="/sf/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-          </component>
-          <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-            <unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-          </component>
-          <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-            <unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-          </component>
-        </collection>
-        <collection name="contenthandling" long-name="Content Handling" level="plugin">
-          <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/contenthandling/webrecognisers/group" mrp="/sf/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-          </component>
-        </collection>
-        <collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-          <component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
-            <unit bldFile="/sf/mw/appsupport/openenvutils/commandshell/group" mrp="/sf/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-          </component>
-          <component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
-            <unit bldFile="/sf/mw/appsupport/openenvutils/telnetserver/group" mrp="/sf/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-          </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">
-            <unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-          </component>
-        </collection>
-        <collection name="appfw" long-name="Application Framework" level="framework">
-          <component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-            <unit bldFile="/sf/mw/appsupport/appfw/apparchitecture/group" mrp="/sf/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-          </component>
-          <component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-            <unit bldFile="/sf/mw/appsupport/appfw/viewserver/group" mrp="/sf/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-          </component>
-          <component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
-            <unit mrp="/sf/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="/sf/mw/appsupport/appfw/uiftestfw/group"/>
-          </component>
-        </collection>
-        <collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-          <component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-          </component>
-          <component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/sf/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-          </component>
-        </collection>
-        <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-          <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-            <unit bldFile="/sf/mw/appsupport/tzpcside/tzcompiler/group" mrp="/sf/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-          </component>
-        </collection>
-        <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-          <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+   <component id="cfw" filter="s60" name="Context Framework">
+    <meta rel="config">
+     <defined condition="RD_CONTEXT_FRAMEWORK"/>
+    </meta>
+    <!--<unit bldFile="contextframework/cfw/group"/> -->
+   </component>
+   <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+    <meta rel="config">
+     <defined condition="RD_CONTEXT_FRAMEWORK"/>
+    </meta>
+    <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+   </component>
+   <component id="contextframework_build" filter="s60" name="Context Framework Build">
+    <unit bldFile="contextframework/group"/>
+   </component>
+  </collection>
+  <collection id="coreapplicationuis" name="Core Application UIs" level="server">
+   <component id="dbrecovery" filter="s60" name="Database Recovery">
+    <unit bldFile="coreapplicationuis/dbrecovery/group"/>
+   </component>
+   <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+    <!-- No Service Power Save? Window Server? Please elaborate-->
+    <unit bldFile="coreapplicationuis/nspswsplugin/group"/>
+   </component>
+   <component id="rfs" filter="s60" name="Restore Factory Settings">
+    <unit bldFile="coreapplicationuis/rfs/group"/>
+   </component>
+   <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+    <unit bldFile="coreapplicationuis/rfsplugins/group"/>
+   </component>
+   <component id="sysap" filter="s60" name="System Application">
+    <unit bldFile="coreapplicationuis/sysap/group"/>
+   </component>
+   <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+    <unit bldFile="coreapplicationuis/variatedsettings/group"/>
+   </component>
+   <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+    <unit bldFile="coreapplicationuis/accfwuinotifier/group"/>
+   </component>
+   <component id="kefmapper" filter="s60" name="Key Event Framework">
+    <unit bldFile="coreapplicationuis/kefmapper/group"/>
+   </component>
+   <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+    <unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
+   </component>
+   <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+    <unit bldFile="coreapplicationuis/powersaveutilities/group"/>
+   </component>
+   <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
+    <unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
+   </component>
+   <component id="gsserverengine" filter="s60" name="GS Server Engine" deprecated="^4">
+    <unit bldFile="coreapplicationuis/gsserverengine/group"/>
+   </component>
+   <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+    <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
+   </component>
+   <component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,!oem_build">
+      <unit bldFile="coreapplicationuis/atcmdplugin/group"/>
+   </component>
+  </collection>
+  <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+   <!--  collection is really a component. Move down a directory -->
+   <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+    <unit base="flashliteapi_3_1/group"/>
+   </component>
+  </collection>
+  <collection id="mediakeys" name="Media Keys" level="plugin">
+   <!--  collection is really a component. Move down a directory -->
+   <component id="mediakeys_build" filter="s60" name="Media Keys Build">
+    <unit bldFile="mediakeys/group"/>
+   </component>
+  </collection>
+  <collection id="startupservices" name="Startup Services" level="system">
+   <component id="splashscreen" filter="s60" name="Splash Screen">
+    <unit bldFile="startupservices/splashscreen/group"/>
+   </component>
+   <component id="startupanimation" filter="s60" name="Startup Animation">
+    <unit bldFile="startupservices/startupanimation/group"/>
+   </component>
+   <component id="startup" name="Startup Application" filter="s60">
+    <unit bldFile="startupservices/startup/group"/>
+   </component>
+  </collection>
+  <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+   <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+    <unit bldFile="sysresmonitoring/oodmonitor/group"/>
+   </component>
+   <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+    <unit bldFile="sysresmonitoring/oommonitor/group"/>
+   </component>
+  </collection>
+  <collection id="systemsettings" name="System Settings" level="system">
+   <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+    <unit bldFile="systemsettings/gssensorplugin/group"/>
+   </component>
+   <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+    <unit bldFile="systemsettings/gsaccessoryplugin/group"/>
+   </component>
+  </collection>
+  <collection id="filehandling" name="File Handling" level="server">
+   <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+    <unit bldFile="filehandling/fileconverterfw/group" mrp="filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+   </component>
+   <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+    <unit bldFile="filehandling/htmltorichtextconverter/group" mrp="filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+   </component>
+   <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="filehandling/richtexttohtmlconverter/Group" mrp="filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+   </component>
+  </collection>
+  <collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+   <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" deprecated="^4">
+    <unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+   </component>
+  </collection>
+  <collection id="commonappservices" name="Common Application Services" level="framework">
+   <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
+    <unit bldFile="commonappservices/alarmserver/Group" mrp="commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+   </component>
+   <component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+    <unit bldFile="commonappservices/alarmservertest/TestAlarmSrv" mrp="commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+   </component>
+   <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+    <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
+   </component>
+   <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+    <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+   </component>
+   <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+    <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+   </component>
+  </collection>
+  <collection id="tzservices" name="Time Zone Services" level="plugin">
+   <component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+    <unit bldFile="tzservices/tzserver/group" mrp="tzservices/tzserver/group/app-services_tz.mrp"/>
+   </component>
+   <component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+    <unit bldFile="tzservices/tzloc/group" mrp="tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+   </component>
+   <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+    <unit bldFile="tzservices/tzlocrscfactory/group" mrp="tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+   </component>
+   <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+    <unit bldFile="tzservices/tzdatabase/group" mrp="tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+   </component>
+  </collection>
+  <collection id="contenthandling" name="Content Handling" level="plugin">
+   <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+    <unit bldFile="contenthandling/webrecognisers/group" mrp="contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+   </component>
+  </collection>
+  <collection id="openenvutils" name="Open Environment Utilities" level="specific">
+   <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+    <unit bldFile="openenvutils/commandshell/group" mrp="openenvutils/commandshell/group/oetools_zsh.mrp"/>
+   </component>
+   <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+    <unit bldFile="openenvutils/telnetserver/group" mrp="openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+   </component>
+  </collection>
+  <collection id="printingsupport" name="Printing Support" level="generic">
+   <component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+    <unit bldFile="printingsupport/printinguisupport/group" mrp="printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+   </component>
+  </collection>
+  <collection id="appfw" name="Application Framework" level="framework">
+   <component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+    <unit bldFile="appfw/apparchitecture/group" mrp="appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+   </component>
+   <component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+    <unit bldFile="appfw/viewserver/group" mrp="appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+   </component>
+   <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+    <unit mrp="appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="appfw/uiftestfw/group"/>
+   </component>
+  </collection>
+  <collection id="applaunchservices" name="Application Launch Services" level="generic">
+   <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+    <unit bldFile="applaunchservices/aftermarketappstarter/group" mrp="applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+   </component>
+   <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+    <unit bldFile="applaunchservices/applaunchplugins/group" mrp="applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+   </component>
+  </collection>
+  <collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+   <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+    <unit bldFile="tzpcside/tzcompiler/group" mrp="tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+   </component>
+  </collection>
+  <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+   <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/appsupport/package_definition_3.0.xml
--- a/symbian4/mw/appsupport/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
-  <collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
-   <component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_pub/flash_viewer_framework_api/flash_viewer_framework_api.metaxml"/>
-    <unit bldFile="appsupport_pub/flash_viewer_framework_api/group"/>
-   </component>
-   <component id="network_status_api" name="Network Status API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_pub/network_status_api/network_status_api.metaxml"/>
-    <unit bldFile="appsupport_pub/network_status_api/group"/>
-   </component>
-  </collection>
-  <collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
-   <component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/action_plugin_api/action_plugin_api.metaxml"/>
-    <unit bldFile="appsupport_plat/action_plugin_api/group"/>
-   </component>
-   <component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/application_orientation_api/application_orientation_api.metaxml"/>
-    <unit bldFile="appsupport_plat/application_orientation_api/group"/>
-   </component>
-   <component id="context_access_api" name="Context Access API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_access_api/context_access_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_access_api/group"/>
-   </component>
-   <component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_framework_services_api/context_framework_services_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_framework_services_api/group"/>
-   </component>
-   <component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_framework_client_api/context_framework_client_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_framework_client_api/group"/>
-   </component>
-   <component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_framework_listener_api/context_framework_listener_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_framework_listener_api/group"/>
-   </component>
-   <component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_framework_version_api/context_framework_version_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_framework_version_api/group"/>
-   </component>
-   <component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_source_plugin_api/context_source_plugin_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_source_plugin_api/group"/>
-   </component>
-   <component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_source_settings_manager_api/context_source_settings_manager_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_source_settings_manager_api/group"/>
-   </component>
-   <component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/context_subscription_api/context_subscription_api.metaxml"/>
-    <unit bldFile="appsupport_plat/context_subscription_api/group"/>
-   </component>
-   <component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/key_event_framework_api/key_event_framework_api.metaxml"/>
-    <unit bldFile="appsupport_plat/key_event_framework_api/group"/>
-   </component>
-   <component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/key_event_framework_mapper_api/key_event_framework_mapper_api.metaxml"/>
-    <unit bldFile="appsupport_plat/key_event_framework_mapper_api/group"/>
-   </component>
-   <component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/media_keys_definition_api/media_keys_definition_api.metaxml"/>
-    <unit bldFile="appsupport_plat/media_keys_definition_api/group"/>
-   </component>
-   <component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/ood_threshold_api/ood_threshold_api.metaxml"/>
-    <unit bldFile="appsupport_plat/ood_threshold_api/group"/>
-   </component>
-   <component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/oom_monitor_api/oom_monitor_api.metaxml"/>
-    <unit bldFile="appsupport_plat/oom_monitor_api/group"/>
-   </component>
-   <component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/oom_monitor_plugin_api/oom_monitor_plugin_api.metaxml"/>
-    <unit bldFile="appsupport_plat/oom_monitor_plugin_api/group"/>
-   </component>
-   <component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/operation_provider_api/operation_provider_api.metaxml"/>
-    <unit bldFile="appsupport_plat/operation_provider_api/group"/>
-   </component>
-   <component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/phonecmdhandler_api/phonecmdhandler_api.metaxml"/>
-    <unit bldFile="appsupport_plat/phonecmdhandler_api/group"/>
-   </component>
-   <component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/restore_factory_settings_api/restore_factory_settings_api.metaxml"/>
-    <unit bldFile="appsupport_plat/restore_factory_settings_api/group"/>
-   </component>
-   <component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/restore_factory_settings_plugin_api/restore_factory_settings_plugin_api.metaxml"/>
-    <unit bldFile="appsupport_plat/restore_factory_settings_plugin_api/group"/>
-   </component>
-   <component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/secondary_display_accfw_api/secondary_display_accfw_api.metaxml"/>
-    <unit bldFile="appsupport_plat/secondary_display_accfw_api/group"/>
-   </component>
-   <component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/secondary_display_startup_api/secondary_display_startup_api.metaxml"/>
-    <unit bldFile="appsupport_plat/secondary_display_startup_api/group"/>
-   </component>
-   <component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/secondary_display_sysap_api/secondary_display_sysap_api.metaxml"/>
-    <unit bldFile="appsupport_plat/secondary_display_sysap_api/group"/>
-   </component>
-   <component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/secondary_display_system_state_api/secondary_display_system_state_api.metaxml"/>
-    <unit bldFile="appsupport_plat/secondary_display_system_state_api/group"/>
-   </component>
-   <component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/sensor_user_setting_api/sensor_user_setting_api.metaxml"/>
-    <unit bldFile="appsupport_plat/sensor_user_setting_api/group"/>
-   </component>
-   <component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/startup_configuration_api/startup_configuration_api.metaxml"/>
-    <unit bldFile="appsupport_plat/startup_configuration_api/group"/>
-   </component>
-   <component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/system_application_key_handler_plugin_api/system_application_key_handler_plugin_api.metaxml"/>
-    <unit bldFile="appsupport_plat/system_application_key_handler_plugin_api/group"/>
-   </component>
-   <component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/system_application_light_control_plugin_api/system_application_light_control_plugin_api.metaxml"/>
-    <unit bldFile="appsupport_plat/system_application_light_control_plugin_api/group"/>
-   </component>
-   <component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/system_application_notification_api/system_application_notification_api.metaxml"/>
-    <unit bldFile="appsupport_plat/system_application_notification_api/group"/>
-   </component>
-   <component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
-    <meta rel="Api" href="appsupport_plat/system_application_plugin_callback_api/system_application_plugin_callback_api.metaxml"/>
-    <unit bldFile="appsupport_plat/system_application_plugin_callback_api/group"/>
-   </component>
-   <component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,!sf_build"  introduced="^2">
-      <unit bldFile="appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
-   </component>
-   <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build" introduced="^2">
-      <unit bldFile="appsupport_plat/flash_netscape_plugin_command_api/group"/>
-   </component>
-  </collection>
-  <collection id="contextframework" name="Context Framework" level="framework">
-   <!-- the units that are commented out need to be put back when configuration is in place.
-		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-   <component id="cfw" filter="s60" name="Context Framework">
-    <meta rel="config">
-     <defined condition="RD_CONTEXT_FRAMEWORK"/>
-    </meta>
-    <!--<unit bldFile="contextframework/cfw/group"/> -->
-   </component>
-   <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
-    <meta rel="config">
-     <defined condition="RD_CONTEXT_FRAMEWORK"/>
-    </meta>
-    <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-   </component>
-   <component id="contextframework_build" filter="s60" name="Context Framework Build">
-    <unit bldFile="contextframework/group"/>
-   </component>
-  </collection>
-  <collection id="coreapplicationuis" name="Core Application UIs" level="server">
-   <component id="dbrecovery" filter="s60" name="Database Recovery">
-    <unit bldFile="coreapplicationuis/dbrecovery/group"/>
-   </component>
-   <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
-    <!-- No Service Power Save? Window Server? Please elaborate-->
-    <unit bldFile="coreapplicationuis/nspswsplugin/group"/>
-   </component>
-   <component id="rfs" filter="s60" name="Restore Factory Settings">
-    <unit bldFile="coreapplicationuis/rfs/group"/>
-   </component>
-   <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
-    <unit bldFile="coreapplicationuis/rfsplugins/group"/>
-   </component>
-   <component id="sysap" filter="s60" name="System Application">
-    <unit bldFile="coreapplicationuis/sysap/group"/>
-   </component>
-   <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
-    <unit bldFile="coreapplicationuis/variatedsettings/group"/>
-   </component>
-   <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
-    <unit bldFile="coreapplicationuis/accfwuinotifier/group"/>
-   </component>
-   <component id="kefmapper" filter="s60" name="Key Event Framework">
-    <unit bldFile="coreapplicationuis/kefmapper/group"/>
-   </component>
-   <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
-    <unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
-   </component>
-   <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
-    <unit bldFile="coreapplicationuis/powersaveutilities/group"/>
-   </component>
-   <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
-    <unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
-   </component>
-   <component id="gsserverengine" filter="s60" name="GS Server Engine" deprecated="^4">
-    <unit bldFile="coreapplicationuis/gsserverengine/group"/>
-   </component>
-   <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
-    <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
-   </component>
-   <component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,!oem_build">
-      <unit bldFile="coreapplicationuis/atcmdplugin/group"/>
-   </component>
-  </collection>
-  <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
-   <!--  collection is really a component. Move down a directory -->
-   <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
-    <unit base="flashliteapi_3_1/group"/>
-   </component>
-  </collection>
-  <collection id="mediakeys" name="Media Keys" level="plugin">
-   <!--  collection is really a component. Move down a directory -->
-   <component id="mediakeys_build" filter="s60" name="Media Keys Build">
-    <unit bldFile="mediakeys/group"/>
-   </component>
-  </collection>
-  <collection id="startupservices" name="Startup Services" level="system">
-   <component id="splashscreen" filter="s60" name="Splash Screen">
-    <unit bldFile="startupservices/splashscreen/group"/>
-   </component>
-   <component id="startupanimation" filter="s60" name="Startup Animation">
-    <unit bldFile="startupservices/startupanimation/group"/>
-   </component>
-   <component id="startup" name="Startup Application" filter="s60">
-    <unit bldFile="startupservices/startup/group"/>
-   </component>
-  </collection>
-  <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
-   <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
-    <unit bldFile="sysresmonitoring/oodmonitor/group"/>
-   </component>
-   <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
-    <unit bldFile="sysresmonitoring/oommonitor/group"/>
-   </component>
-  </collection>
-  <collection id="systemsettings" name="System Settings" level="system">
-   <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
-    <unit bldFile="systemsettings/gssensorplugin/group"/>
-   </component>
-   <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
-    <unit bldFile="systemsettings/gsaccessoryplugin/group"/>
-   </component>
-  </collection>
-  <collection id="filehandling" name="File Handling" level="server">
-   <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
-    <unit bldFile="filehandling/fileconverterfw/group" mrp="filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-   </component>
-   <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
-    <unit bldFile="filehandling/htmltorichtextconverter/group" mrp="filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-   </component>
-   <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="filehandling/richtexttohtmlconverter/Group" mrp="filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-   </component>
-  </collection>
-  <collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
-   <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" deprecated="^4">
-    <unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-   </component>
-  </collection>
-  <collection id="commonappservices" name="Common Application Services" level="framework">
-   <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
-    <unit bldFile="commonappservices/alarmserver/Group" mrp="commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
-   </component>
-   <component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-    <unit bldFile="commonappservices/alarmservertest/TestAlarmSrv" mrp="commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-   </component>
-   <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
-    <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
-   </component>
-   <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
-    <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-   </component>
-   <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
-    <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-   </component>
-  </collection>
-  <collection id="tzservices" name="Time Zone Services" level="plugin">
-   <component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
-    <unit bldFile="tzservices/tzserver/group" mrp="tzservices/tzserver/group/app-services_tz.mrp"/>
-   </component>
-   <component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
-    <unit bldFile="tzservices/tzloc/group" mrp="tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-   </component>
-   <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-    <unit bldFile="tzservices/tzlocrscfactory/group" mrp="tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-   </component>
-   <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-    <unit bldFile="tzservices/tzdatabase/group" mrp="tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-   </component>
-  </collection>
-  <collection id="contenthandling" name="Content Handling" level="plugin">
-   <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
-    <unit bldFile="contenthandling/webrecognisers/group" mrp="contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-   </component>
-  </collection>
-  <collection id="openenvutils" name="Open Environment Utilities" level="specific">
-   <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
-    <unit bldFile="openenvutils/commandshell/group" mrp="openenvutils/commandshell/group/oetools_zsh.mrp"/>
-   </component>
-   <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
-    <unit bldFile="openenvutils/telnetserver/group" mrp="openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-   </component>
-  </collection>
-  <collection id="printingsupport" name="Printing Support" level="generic">
-   <component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-    <unit bldFile="printingsupport/printinguisupport/group" mrp="printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-   </component>
-  </collection>
-  <collection id="appfw" name="Application Framework" level="framework">
-   <component id="apparchitecture" name="Application Architecture" purpose="mandatory">
-    <unit bldFile="appfw/apparchitecture/group" mrp="appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-   </component>
-   <component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
-    <unit bldFile="appfw/viewserver/group" mrp="appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-   </component>
-   <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
-    <unit mrp="appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="appfw/uiftestfw/group"/>
-   </component>
-  </collection>
-  <collection id="applaunchservices" name="Application Launch Services" level="generic">
-   <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
-    <unit bldFile="applaunchservices/aftermarketappstarter/group" mrp="applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-   </component>
-   <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
-    <unit bldFile="applaunchservices/applaunchplugins/group" mrp="applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-   </component>
-  </collection>
-  <collection id="tzpcside" name="Time Zone PC Side" level="plugin">
-   <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
-    <unit bldFile="tzpcside/tzcompiler/group" mrp="tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-   </component>
-  </collection>
-  <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
-   <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/browser/package_definition.xml
--- a/symbian4/mw/browser/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,88 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
-        <collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
-          <component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
-            <unit bldFile="/sf/mw/browser/bookmarksengine" proFile="bookmarksengine.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="browser" name="Browser" levels="plugin utils support main">
+  <collection id="bookmarksengine" name="Bookmarks Engine" level="support">
+    <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
+      <unit bldFile="bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+    </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/browser/package_definition_3.0.xml
--- a/symbian4/mw/browser/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="browser" name="Browser" levels="plugin utils support main">
-  <collection id="bookmarksengine" name="Bookmarks Engine" level="support">
-    <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
-      <unit bldFile="bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
-    </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,193 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
-          </component>
-          <component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
-          </component>
-          <component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
-          </component>
-          <component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" 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">
-            <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
-          </component>
-          <component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" 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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-          </component>
-        </collection>
-        <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-          <component name="bteng" filter="s60" long-name="Bluetooth Engine">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/bteng/group"/>
-          </component>
-          <component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/group"/>
-          </component>
-          <component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudioman/group"/>
-          </component>
-          <component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btmac/group"/>
-          </component>
-          <component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btsac/group"/>
-          </component>
-          <component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudiostreamer/group"/>
-          </component>
-          <component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btsap/group"/>
-          </component>
-          <component name="btui" filter="s60" long-name="Bluetooth UI">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btui/group"/>
-          </component>
-          <component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btpbap/group"/>
-          </component>
-          <component name="bthid" filter="s60" long-name="Bluetooth HID">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/bthid/group"/>
-          </component>
-          <component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
-          </component>
-        </collection>
-        <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-          <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/mw/btservices/bluetoothappprofiles/avrcp" mrp="/sf/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-          </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">
-            <unit bldFile="/sf/mw/btservices/atcommands/modematplugin/group"/>
-          </component>
-          <component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/atcommands/lccustomplugin/group"/>
-          </component>
-        </collection>
-        <collection name="cbsatplugin" long-name="CBS AT Plugin">
-          <component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
-          </component>
-        </collection>
-        <collection name="btservices_info" long-name="BT Services Info" level="plugin">
-          <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-          </component>
-          <component name="btservices_api_test" long-name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
-            <unit/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
+  <collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
+   <component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_pub/bluetooth_power_state_api/bluetooth_power_state_api.metaxml"/>
+    <unit bldFile="btservices_pub/bluetooth_power_state_api/group"/>
+   </component>
+   <component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_pub/bluetooth_notifier_api/bluetooth_notifier_api.metaxml"/>
+    <unit bldFile="btservices_pub/bluetooth_notifier_api/group"/>
+   </component>
+  </collection>
+  <collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
+   <component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_dosserver_audio_api/bluetooth_dosserver_audio_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_dosserver_audio_api/group"/>
+   </component>
+   <component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_dut_mode_api/bluetooth_dut_mode_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_dut_mode_api/group"/>
+   </component>
+   <component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_api/bluetooth_engine_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_api/group"/>
+   </component>
+   <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group"/>
+   </component>
+   <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group"/>
+   </component>
+   <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group"/>
+   </component>
+   <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_features_api/group"/>
+   </component>
+   <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group"/>
+   </component>
+   <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_plugin_api/group"/>
+   </component>
+   <component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_local_variation_api/bluetooth_local_variation_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_local_variation_api/group"/>
+   </component>
+   <component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_notifier_internal_api/bluetooth_notifier_internal_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_notifier_internal_api/group"/>
+   </component>
+   <component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_sap_connection_state_api/bluetooth_sap_connection_state_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_sap_connection_state_api/group"/>
+   </component>
+   <component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_secondary_display_notification_api/bluetooth_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+   </component>
+  </collection>
+  <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+   <component id="bteng" filter="s60" name="Bluetooth Engine">
+    <unit bldFile="bluetoothengine/bteng/group"/>
+   </component>
+   <component id="btnotif" filter="s60" name="Bluetooth Notifier">
+    <unit bldFile="bluetoothengine/btnotif/group"/>
+   </component>
+   <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+    <unit bldFile="bluetoothengine/btaudioman/group"/>
+   </component>
+   <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+    <unit bldFile="bluetoothengine/btmac/group"/>
+   </component>
+   <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+    <unit bldFile="bluetoothengine/btsac/group"/>
+   </component>
+   <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+    <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
+   </component>
+   <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+    <unit bldFile="bluetoothengine/btsap/group"/>
+   </component>
+   <component id="btui" filter="s60" name="Bluetooth UI">
+    <unit bldFile="bluetoothengine/btui/group"/>
+   </component>
+   <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+    <unit bldFile="bluetoothengine/btpbap/group"/>
+   </component>
+   <component id="bthid" filter="s60" name="Bluetooth HID">
+    <unit bldFile="bluetoothengine/bthid/group"/>
+   </component>
+   <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+    <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
+   </component>
+   <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
+    <unit bldFile="bluetoothengine/btserviceutil/group"/>
+   </component>
+   <component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
+    <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
+   </component>
+  </collection>
+  <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+   <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+    <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+   </component>
+  </collection>
+  <collection id="atcommands" name="AT Commands" level="generic">
+   <component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
+    <unit bldFile="atcommands/modematplugin/group"/>
+   </component>
+   <component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
+    <unit bldFile="atcommands/lccustomplugin/group"/>
+   </component>
+  </collection>
+  <collection id="cbsatplugin" name="CBS AT Plugin">
+     <component id="atmisccmdplugin" name="AT Misc Commands Plugin"  filter="s60" class="plugin" introduced="^4">
+      <unit bldFile="cbsatplugin/atmisccmdplugin/group"/>
+     </component>
+  </collection>
+  <collection id="btservices_info" name="BT Services Info" level="plugin">
+   <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+    <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+   </component>
+   <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
+    <unit bldFiile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/btservices/package_definition_3.0.xml
--- a/symbian4/mw/btservices/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
-  <collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
-   <component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_pub/bluetooth_power_state_api/bluetooth_power_state_api.metaxml"/>
-    <unit bldFile="btservices_pub/bluetooth_power_state_api/group"/>
-   </component>
-   <component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_pub/bluetooth_notifier_api/bluetooth_notifier_api.metaxml"/>
-    <unit bldFile="btservices_pub/bluetooth_notifier_api/group"/>
-   </component>
-  </collection>
-  <collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
-   <component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_dosserver_audio_api/bluetooth_dosserver_audio_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_dosserver_audio_api/group"/>
-   </component>
-   <component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_dut_mode_api/bluetooth_dut_mode_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_dut_mode_api/group"/>
-   </component>
-   <component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_api/bluetooth_engine_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_api/group"/>
-   </component>
-   <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group"/>
-   </component>
-   <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group"/>
-   </component>
-   <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group"/>
-   </component>
-   <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_features_api/group"/>
-   </component>
-   <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group"/>
-   </component>
-   <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_plugin_api/group"/>
-   </component>
-   <component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_local_variation_api/bluetooth_local_variation_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_local_variation_api/group"/>
-   </component>
-   <component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_notifier_internal_api/bluetooth_notifier_internal_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_notifier_internal_api/group"/>
-   </component>
-   <component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_sap_connection_state_api/bluetooth_sap_connection_state_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_sap_connection_state_api/group"/>
-   </component>
-   <component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
-    <meta rel="Api" href="btservices_plat/bluetooth_secondary_display_notification_api/bluetooth_secondary_display_notification_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_secondary_display_notification_api/group"/>
-   </component>
-  </collection>
-  <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
-   <component id="bteng" filter="s60" name="Bluetooth Engine">
-    <unit bldFile="bluetoothengine/bteng/group"/>
-   </component>
-   <component id="btnotif" filter="s60" name="Bluetooth Notifier">
-    <unit bldFile="bluetoothengine/btnotif/group"/>
-   </component>
-   <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
-    <unit bldFile="bluetoothengine/btaudioman/group"/>
-   </component>
-   <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
-    <unit bldFile="bluetoothengine/btmac/group"/>
-   </component>
-   <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
-    <unit bldFile="bluetoothengine/btsac/group"/>
-   </component>
-   <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
-    <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
-   </component>
-   <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
-    <unit bldFile="bluetoothengine/btsap/group"/>
-   </component>
-   <component id="btui" filter="s60" name="Bluetooth UI">
-    <unit bldFile="bluetoothengine/btui/group"/>
-   </component>
-   <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
-    <unit bldFile="bluetoothengine/btpbap/group"/>
-   </component>
-   <component id="bthid" filter="s60" name="Bluetooth HID">
-    <unit bldFile="bluetoothengine/bthid/group"/>
-   </component>
-   <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
-    <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
-   </component>
-   <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
-    <unit bldFile="bluetoothengine/btserviceutil/group"/>
-   </component>
-   <component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
-    <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
-   </component>
-  </collection>
-  <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
-   <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-    <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-   </component>
-  </collection>
-  <collection id="atcommands" name="AT Commands" level="generic">
-   <component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
-    <unit bldFile="atcommands/modematplugin/group"/>
-   </component>
-   <component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
-    <unit bldFile="atcommands/lccustomplugin/group"/>
-   </component>
-  </collection>
-  <collection id="cbsatplugin" name="CBS AT Plugin">
-     <component id="atmisccmdplugin" name="AT Misc Commands Plugin"  filter="s60" class="plugin" introduced="^4">
-      <unit bldFile="cbsatplugin/atmisccmdplugin/group"/>
-     </component>
-  </collection>
-  <collection id="btservices_info" name="BT Services Info" level="plugin">
-   <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-    <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-   </component>
-   <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
-    <unit bldFiile="tsrc/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/camerasrv/package_definition.xml
--- a/symbian4/mw/camerasrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,119 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
-        <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" 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">
-            <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">
-            <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">
-            <!-- should split into individual bld.infs -->
-            <unit bldFile="/sf/mw/camerasrv/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="camerasrv" name="Camera Services" levels="plugin fw api">
+  <collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+   <component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/media_recorder_sink_api/media_recorder_sink_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_sink_api/group"/>
+   </component>
+   <component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/custom_onboard_camera_api/custom_onboard_camera_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/custom_onboard_camera_api/group"/>
+   </component>
+   <component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/imaging_configuration_manager_api/imaging_configuration_manager_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/media_recorder_api/media_recorder_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/3gp_file_composer_api/3gp_file_composer_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/3gp_file_composer_api/group"/>
+   </component>
+  </collection>
+  <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+   <!-- collection is really a component. Should move down a directory -->
+   <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+    <unit bldFile="camcordermmfplugin/build"/>
+   </component>
+  </collection>
+  <collection id="configmanagers" name="Config Managers" level="api">
+   <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+    <unit bldFile="configmanagers/imagingconfigmanager/group"/>
+   </component>
+  </collection>
+  <collection id="camerasrv_info" name="Camera Services Info" level="api">
+   <component id="camerasrv_build" filter="s60" name="Camera Services Build">
+    <!-- should split into individual bld.infs -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/camerasrv/package_definition_3.0.xml
--- a/symbian4/mw/camerasrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="camerasrv" name="Camera Services" levels="plugin fw api">
-  <collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
-   <component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/media_recorder_sink_api/media_recorder_sink_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/media_recorder_sink_api/group"/>
-   </component>
-   <component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/custom_onboard_camera_api/custom_onboard_camera_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/custom_onboard_camera_api/group"/>
-   </component>
-   <component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/imaging_configuration_manager_api/imaging_configuration_manager_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
-    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/media_recorder_api/media_recorder_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/media_recorder_api/group" filter="!test"/>
-    <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
-    <meta rel="Api" href="camerasrv_plat/3gp_file_composer_api/3gp_file_composer_api.metaxml"/>
-    <unit bldFile="camerasrv_plat/3gp_file_composer_api/group"/>
-   </component>
-  </collection>
-  <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
-   <!-- collection is really a component. Should move down a directory -->
-   <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
-    <unit bldFile="camcordermmfplugin/build"/>
-   </component>
-  </collection>
-  <collection id="configmanagers" name="Config Managers" level="api">
-   <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
-    <unit bldFile="configmanagers/imagingconfigmanager/group"/>
-   </component>
-  </collection>
-  <collection id="camerasrv_info" name="Camera Services Info" level="api">
-   <component id="camerasrv_build" filter="s60" name="Camera Services Build">
-    <!-- should split into individual bld.infs -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/classicui/package_definition.xml
--- a/symbian4/mw/classicui/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,768 +1,833 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <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">
-        <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-          <component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
-          </component>
-          <component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-          </component>
-          <component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_application_api/group"/>
-          </component>
-          <component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="task_list_api" long-name="Task List API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-          </component>
-          <component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" 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">
-            <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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-          </component>
-          <component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-          </component>
-          <component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_status_api" long-name="AVKON Status API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" 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">
-            <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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" 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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_queries_api" long-name="Extended Queries API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="uikon_status_api" long-name="UIKON Status API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_testability_api/group"/>
-          </component>
-          <component name="ganes_api" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/ode_api/group"/>
-          </component>
-          <component name="physics_api" long-name="Physics API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" 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">
-            <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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_test"/>
-          </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">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="queries_api" long-name="Queries API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="editors_api" long-name="Editors API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="notes_api" long-name="Notes API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="grids_api" long-name="Grids API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="lists_api" long-name="Lists API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="popups_api" long-name="Popups API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="animation_api" long-name="Animation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="labels_api" long-name="Labels API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="form_api" long-name="Form API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="calendar_api" long-name="Calendar API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="server_application_api" long-name="Server Application API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="document_handler_api" long-name="Document handler API" filter="s60" 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">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" 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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/classicui/uifw/uiklaf/group"/>
-          </component>
-          <component name="eikctl" filter="s60" long-name="Eikon Controls">
-            <unit bldFile="/sf/mw/classicui/uifw/eikctl/group"/>
-          </component>
-          <component name="avkon" filter="s60" long-name="Avkon">
-            <!-- 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">
-            <unit bldFile="/sf/mw/classicui/uifw/eikstd/group"/>
-          </component>
-          <component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
-            <unit bldFile="/sf/mw/classicui/uifw/aknglobalui/group"/>
-          </component>
-          <component name="ganes" filter="s60" long-name="Ganes">
-            <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">
-            <unit bldFile="/sf/mw/classicui/commonuis/commonui/group"/>
-          </component>
-          <component name="commondialogs" filter="s60" long-name="Common Dialogs">
-            <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">
-            <unit bldFile="/sf/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-          </component>
-        </collection>
-        <collection name="psln" long-name="Personalization" level="specific">
-          <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-          <component name="psln_build" filter="s60" long-name="Personalization Build">
-            <unit bldFile="/sf/mw/classicui/psln/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">
-            <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">
-            <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">
-            <unit bldFile="/sf/mw/classicui/uiutils/localizer/group"/>
-          </component>
-          <component name="findutil" filter="s60" long-name="Find Utility">
-            <unit bldFile="/sf/mw/classicui/uiutils/findutil/group"/>
-          </component>
-          <component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
-            <unit bldFile="/sf/mw/classicui/uiutils/gamerecognizer/group"/>
-          </component>
-          <component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
-            <unit bldFile="/sf/mw/classicui/uiutils/aknjapanesereading/group"/>
-          </component>
-          <component name="hlplch" long-name="Help Launcher" filter="s60,bldfirst">
-            <unit bldFile="/sf/mw/classicui/uiutils/hlplch/group"/>
-          </component>
-        </collection>
-        <collection name="commonuisupport" long-name="Common UI Support" level="support">
-          <component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-            <unit bldFile="/sf/mw/classicui/commonuisupport/uikon/group" mrp="/sf/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-          </component>
-          <component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-            <unit bldFile="/sf/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/sf/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-          </component>
-          <component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-            <unit bldFile="/sf/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/sf/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-          </component>
-          <component name="grid" long-name="Grid" purpose="optional">
-            <unit bldFile="/sf/mw/classicui/commonuisupport/grid/group" mrp="/sf/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-          </component>
-          <component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-          </component>
-        </collection>
-        <collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-          <component name="cone" long-name="Control Environment" purpose="mandatory">
-            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-          </component>
-          <component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-          </component>
-          <component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-          </component>
-          <component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-          </component>
-          <component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-          </component>
-          <component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-          </component>
-        </collection>
-        <collection name="classicui_info" long-name="Classic UI Info" level="specific">
-          <!-- the multiple units in the API test components need to be resolved -->
-          <component name="classicui_plat_api_test" filter="s60,test,api_test" long-name="Classic UI Platform API Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a single bld.inf -->
-            <unit bldFile="/sf/mw/classicui/tsrc/group"/>
-          </component>
-          <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="classicui" name="Classic UI" levels="base support server generic specific">
+  <collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+   <component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/personalisation_framework_api/personalisation_framework_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_framework_api/group"/>
+   </component>
+   <component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/signal_pane_api/signal_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/signal_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/japanese_reading_api/japanese_reading_api.metaxml"/>
+    <unit bldFile="classicui_plat/japanese_reading_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/global_popup_priority_controller_api/global_popup_priority_controller_api.metaxml"/>
+    <unit bldFile="classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/global_popup_priority_controller_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/item_finder_api/item_finder_api.metaxml"/>
+    <unit bldFile="classicui_plat/item_finder_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/item_finder_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_fonts_api/avkon_fonts_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_fonts_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/avkon_fonts_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_utilities_api/extended_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_utilities_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/personalisation_plugin_api/personalisation_plugin_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_plugin_api/group"/>
+   </component>
+   <component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_aiw_criteria_api/extended_aiw_criteria_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/personalisation_application_api/personalisation_application_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_application_api/group"/>
+   </component>
+   <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/volume_popup_api/volume_popup_api.metaxml"/>
+    <unit bldFile="classicui_plat/volume_popup_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/volume_popup_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_secondary_display_support_api/avkon_secondary_display_support_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/avkon_secondary_display_support_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_setting_pages_api/extended_setting_pages_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_setting_pages_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_lists_api/extended_lists_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_lists_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_lists_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="input_block_api" name="Input Block API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/input_block_api/input_block_api.metaxml"/>
+    <unit bldFile="classicui_plat/input_block_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/input_block_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_ui_server_api/avkon_ui_server_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/number_grouping_api/number_grouping_api.metaxml"/>
+    <unit bldFile="classicui_plat/number_grouping_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_status_pane_api/extended_status_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_status_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_status_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_notifiers_api/extended_notifiers_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_notifiers_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_notifiers_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="task_list_api" name="Task List API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/task_list_api/task_list_api.metaxml"/>
+    <unit bldFile="classicui_plat/task_list_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/personalisation_slide_show_dialog_api/personalisation_slide_show_dialog_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_slide_show_dialog_api/group"/>
+   </component>
+   <component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/key_event_utilities_api/key_event_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/key_event_utilities_api/group"/>
+   </component>
+   <component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/emergency_call_support_api/emergency_call_support_api.metaxml"/>
+    <unit bldFile="classicui_plat/emergency_call_support_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/emergency_call_support_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_dialogs_api/extended_dialogs_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_dialogs_api/group"/>
+   </component>
+   <component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/legacy_ui_framework_headers_api/legacy_ui_framework_headers_api.metaxml"/>
+    <unit bldFile="classicui_plat/legacy_ui_framework_headers_api/group"/>
+   </component>
+   <component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_editors_api/extended_editors_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_editors_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_editors_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="alarm_api" name="Alarm API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/alarm_api/alarm_api.metaxml"/>
+    <unit bldFile="classicui_plat/alarm_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/alarm_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/aiw_service_interface_base_api/aiw_service_interface_base_api.metaxml"/>
+    <unit bldFile="classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/aiw_service_interface_base_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="list_effects_api" name="List Effects API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/list_effects_api/list_effects_api.metaxml"/>
+    <unit bldFile="classicui_plat/list_effects_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/list_effects_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/find_item_ui_api/find_item_ui_api.metaxml"/>
+    <unit bldFile="classicui_plat/find_item_ui_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/find_item_ui_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/server_application_services_api/server_application_services_api.metaxml"/>
+    <unit bldFile="classicui_plat/server_application_services_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/server_application_services_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/common_ui_settings_api/common_ui_settings_api.metaxml"/>
+    <unit bldFile="classicui_plat/common_ui_settings_api/group"/>
+   </component>
+   <component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/aiw_service_interface_menu_api/aiw_service_interface_menu_api.metaxml"/>
+    <unit bldFile="classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/aiw_service_interface_menu_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/eikon_server_extension_client_api/eikon_server_extension_client_api.metaxml"/>
+    <unit bldFile="classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/eikon_server_extension_client_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/skinnable_clock_api/skinnable_clock_api.metaxml"/>
+    <unit bldFile="classicui_plat/skinnable_clock_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/skinnable_clock_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/battery_pane_api/battery_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/battery_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/battery_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/fep_document_navigation_api/fep_document_navigation_api.metaxml"/>
+    <unit bldFile="classicui_plat/fep_document_navigation_api/group"/>
+   </component>
+   <component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/personalisation_localised_texts_api/personalisation_localised_texts_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_localised_texts_api/group"/>
+   </component>
+   <component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/memory_card_ui_api/memory_card_ui_api.metaxml"/>
+    <unit bldFile="classicui_plat/memory_card_ui_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/memory_card_ui_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_status_api/avkon_status_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_status_api/group"/>
+   </component>
+   <component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/application_switching_api/application_switching_api.metaxml"/>
+    <unit bldFile="classicui_plat/application_switching_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/application_switching_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_localised_texts_api/avkon_localised_texts_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_localised_texts_api/group"/>
+   </component>
+   <component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_secondary_display_api/avkon_secondary_display_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_secondary_display_api/group"/>
+   </component>
+   <component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_animation_api/extended_animation_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_animation_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_animation_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_notes_api/extended_notes_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_notes_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/text_scroller_api/text_scroller_api.metaxml"/>
+    <unit bldFile="classicui_plat/text_scroller_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/custom_cursors_api/custom_cursors_api.metaxml"/>
+    <unit bldFile="classicui_plat/custom_cursors_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/global_window_priorities_api/global_window_priorities_api.metaxml"/>
+    <unit bldFile="classicui_plat/global_window_priorities_api/group"/>
+   </component>
+   <component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_indicators_api/extended_indicators_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_indicators_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_indicators_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/special_character_table_api/special_character_table_api.metaxml"/>
+    <unit bldFile="classicui_plat/special_character_table_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/special_character_table_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_settings_api/avkon_settings_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_settings_api/group"/>
+   </component>
+   <component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_sounds_api/extended_sounds_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_sounds_api/group"/>
+   </component>
+   <component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/themes_settings_api/themes_settings_api.metaxml"/>
+    <unit bldFile="classicui_plat/themes_settings_api/group"/>
+   </component>
+   <component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/media_shared_document_api/media_shared_document_api.metaxml"/>
+    <unit bldFile="classicui_plat/media_shared_document_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/media_shared_document_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_queries_api/extended_queries_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_queries_api/group"/>
+   </component>
+   <component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/phone_number_text_utilities_api/phone_number_text_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_scroller_api/extended_scroller_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_scroller_api/group"/>
+   </component>
+   <component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/key_rotator_api/key_rotator_api.metaxml"/>
+    <unit bldFile="classicui_plat/key_rotator_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/key_rotator_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_grids_api/extended_grids_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_grids_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_grids_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/generic_parameter_api/generic_parameter_api.metaxml"/>
+    <unit bldFile="classicui_plat/generic_parameter_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/generic_parameter_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/indicator_touch_observer_api/indicator_touch_observer_api.metaxml"/>
+    <unit bldFile="classicui_plat/indicator_touch_observer_api/group"/>
+   </component>
+   <component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/popup_form_api/popup_form_api.metaxml"/>
+    <unit bldFile="classicui_plat/popup_form_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/popup_form_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/stylus_activated_popup_api/stylus_activated_popup_api.metaxml"/>
+    <unit bldFile="classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/stylus_activated_popup_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/indicator_plugin_api/indicator_plugin_api.metaxml"/>
+    <unit bldFile="classicui_plat/indicator_plugin_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/indicator_plugin_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/layout_configuration_api/layout_configuration_api.metaxml"/>
+    <unit bldFile="classicui_plat/layout_configuration_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/common_file_dialogs_filter_factory_api/common_file_dialogs_filter_factory_api.metaxml"/>
+    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_anim_dll_api/avkon_anim_dll_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_anim_dll_api/group"/>
+   </component>
+   <component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_initialization_api/extended_initialization_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_initialization_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_initialization_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/long_tap_animation_api/long_tap_animation_api.metaxml"/>
+    <unit bldFile="classicui_plat/long_tap_animation_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/long_tap_animation_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_ui_framework_definitions_api/extended_ui_framework_definitions_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_ui_framework_definitions_api/group"/>
+   </component>
+   <component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_buttons_api/extended_buttons_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_buttons_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_buttons_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/aiw_provider_utility_api/aiw_provider_utility_api.metaxml"/>
+    <unit bldFile="classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/aiw_provider_utility_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/transition_effect_parameters_api/transition_effect_parameters_api.metaxml"/>
+    <unit bldFile="classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/transition_effect_parameters_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_input_capabilities_api/extended_input_capabilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_input_capabilities_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/uikon_status_api/uikon_status_api.metaxml"/>
+    <unit bldFile="classicui_plat/uikon_status_api/group"/>
+   </component>
+   <component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/transition_effect_utilities_api/transition_effect_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/transition_effect_utilities_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/pointer_event_modifier_api/pointer_event_modifier_api.metaxml"/>
+    <unit bldFile="classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/pointer_event_modifier_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/avkon_testability_api/avkon_testability_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_testability_api/group"/>
+   </component>
+   <component id="ganes_api" name="ganes_api" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/ganes_api/ganes_api.metaxml"/>
+    <unit bldFile="classicui_plat/ganes_api/group"/>
+   </component>
+   <component id="ode_api" name="Ode API" class="api" filter="s60">
+    <unit bldFile="classicui_plat/ode_api/group"/>
+   </component>
+   <component id="physics_api" name="Physics API" class="api" filter="s60">
+    <unit bldFile="classicui_plat/physics_api/group"/>
+   </component>
+   <component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/touch_pane_api/touch_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/touch_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/touch_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/touch_pane_observer_api/touch_pane_observer_api.metaxml"/>
+    <unit bldFile="classicui_plat/touch_pane_observer_api/group"/>
+   </component>
+   <component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/alternate_fs_api/alternate_fs_api.metaxml"/>
+    <unit bldFile="classicui_plat/alternate_fs_api/group"/>
+   </component>
+   <component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+    <unit bldFile="classicui_plat/discreet_popup_api/group"/>
+   </component>
+   <component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/touch_gesture_framework_api/touch_gesture_framework_api.metaxml"/>
+    <unit bldFile="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 id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_options_menu_api/extended_options_menu_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_options_menu_api/group" filter="!test"/>
+    <unit bldFile="classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
+   <component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/input_frame_api/input_frame_api.metaxml"/>
+    <unit bldFile="classicui_pub/input_frame_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/window_server_event_observer_api/window_server_event_observer_api.metaxml"/>
+    <unit bldFile="classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/application_framework_api/application_framework_api.metaxml"/>
+    <unit bldFile="classicui_pub/application_framework_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="scroller_api" name="Scroller API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/scroller_api/scroller_api.metaxml"/>
+    <unit bldFile="classicui_pub/scroller_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/ui_framework_utilities_api/ui_framework_utilities_api.metaxml"/>
+    <unit bldFile="classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/ui_framework_definitions_api/ui_framework_definitions_api.metaxml"/>
+    <unit bldFile="classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="buttons_api" name="Buttons API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/buttons_api/buttons_api.metaxml"/>
+    <unit bldFile="classicui_pub/buttons_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="queries_api" name="Queries API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/queries_api/queries_api.metaxml"/>
+    <unit bldFile="classicui_pub/queries_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/aiw_generic_parameter_api/aiw_generic_parameter_api.metaxml"/>
+    <unit bldFile="classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="editors_api" name="Editors API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/editors_api/editors_api.metaxml"/>
+    <unit bldFile="classicui_pub/editors_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
+    <unit bldFile="classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/dialog_shutter_api/dialog_shutter_api.metaxml"/>
+    <unit bldFile="classicui_pub/dialog_shutter_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="fonts_api" name="Fonts API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/fonts_api/fonts_api.metaxml"/>
+    <unit bldFile="classicui_pub/fonts_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/screen_clearer_api/screen_clearer_api.metaxml"/>
+    <unit bldFile="classicui_pub/screen_clearer_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/notifiers_api/notifiers_api.metaxml"/>
+    <unit bldFile="classicui_pub/notifiers_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="notes_api" name="Notes API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/notes_api/notes_api.metaxml"/>
+    <unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/status_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/base_controls_api/base_controls_api.metaxml"/>
+    <unit bldFile="classicui_pub/base_controls_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="grids_api" name="Grids API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/grids_api/grids_api.metaxml"/>
+    <unit bldFile="classicui_pub/grids_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/context_pane_api/context_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/context_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="lists_api" name="Lists API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/lists_api/lists_api.metaxml"/>
+    <unit bldFile="classicui_pub/lists_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="popups_api" name="Popups API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/popups_api/popups_api.metaxml"/>
+    <unit bldFile="classicui_pub/popups_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/misc_controls_api/misc_controls_api.metaxml"/>
+    <unit bldFile="classicui_pub/misc_controls_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="keylock_api" name="Keylock API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/keylock_api/keylock_api.metaxml"/>
+    <unit bldFile="classicui_pub/keylock_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/options_menu_api/options_menu_api.metaxml"/>
+    <unit bldFile="classicui_pub/options_menu_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/hierarchical_lists_api/hierarchical_lists_api.metaxml"/>
+    <unit bldFile="classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/navigation_pane_api/navigation_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/navigation_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="tabs_api" name="Tabs API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/tabs_api/tabs_api.metaxml"/>
+    <unit bldFile="classicui_pub/tabs_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/title_pane_touch_observer_api/title_pane_touch_observer_api.metaxml"/>
+    <unit bldFile="classicui_pub/title_pane_touch_observer_api/group"/>
+   </component>
+   <component id="choice_list_api" name="Choice List API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/choice_list_api/choice_list_api.metaxml"/>
+    <unit bldFile="classicui_pub/choice_list_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/info_popup_note_api/info_popup_note_api.metaxml"/>
+    <unit bldFile="classicui_pub/info_popup_note_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/setting_pages_api/setting_pages_api.metaxml"/>
+    <unit bldFile="classicui_pub/setting_pages_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/screen_mode_api/screen_mode_api.metaxml"/>
+    <unit bldFile="classicui_pub/screen_mode_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="indicators_api" name="Indicators API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/indicators_api/indicators_api.metaxml"/>
+    <unit bldFile="classicui_pub/indicators_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="error_ui_api" name="Error UI API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/error_ui_api/error_ui_api.metaxml"/>
+    <unit bldFile="classicui_pub/error_ui_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="animation_api" name="Animation API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/animation_api/animation_api.metaxml"/>
+    <unit bldFile="classicui_pub/animation_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/searchfield_api/searchfield_api.metaxml"/>
+    <unit bldFile="classicui_pub/searchfield_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="labels_api" name="Labels API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/labels_api/labels_api.metaxml"/>
+    <unit bldFile="classicui_pub/labels_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/hotkeys_api/hotkeys_api.metaxml"/>
+    <unit bldFile="classicui_pub/hotkeys_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="initialization_api" name="Initialization API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/initialization_api/initialization_api.metaxml"/>
+    <unit bldFile="classicui_pub/initialization_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/volume_control_api/volume_control_api.metaxml"/>
+    <unit bldFile="classicui_pub/volume_control_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/title_pane_api/title_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/title_pane_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="sounds_api" name="Sounds API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/sounds_api/sounds_api.metaxml"/>
+    <unit bldFile="classicui_pub/sounds_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/aiw_service_handler_api/aiw_service_handler_api.metaxml"/>
+    <unit bldFile="classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/aiw_criteria_api/aiw_criteria_api.metaxml"/>
+    <unit bldFile="classicui_pub/aiw_criteria_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/touch_ui_utilities_api/touch_ui_utilities_api.metaxml"/>
+    <unit bldFile="classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/generic_button_api/generic_button_api.metaxml"/>
+    <unit bldFile="classicui_pub/generic_button_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="form_api" name="Form API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/form_api/form_api.metaxml"/>
+    <unit bldFile="classicui_pub/form_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/uikon_core_controls/uikon_core_controls.metaxml"/>
+    <unit bldFile="classicui_pub/uikon_core_controls/group" filter="!test"/>
+    <unit bldFile="classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="calendar_api" name="Calendar API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/calendar_api/calendar_api.metaxml"/>
+    <unit bldFile="classicui_pub/calendar_api/group"/>
+   </component>
+   <component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/toolbar_api/toolbar_api.metaxml"/>
+    <unit bldFile="classicui_pub/toolbar_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="server_application_api" name="Server Application API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/server_application_api/server_application_api.metaxml"/>
+    <unit bldFile="classicui_pub/server_application_api/group"/>
+   </component>
+   <component id="slider_api" name="Slider API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/slider_api/slider_api.metaxml"/>
+    <unit bldFile="classicui_pub/slider_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/private_ui_framework_api/private_ui_framework_api.metaxml"/>
+    <unit bldFile="classicui_pub/private_ui_framework_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/dialogs_api/dialogs_api.metaxml"/>
+    <unit bldFile="classicui_pub/dialogs_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="document_handler_api" name="Document handler API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/document_handler_api/document_handler_api.metaxml"/>
+    <unit bldFile="classicui_pub/document_handler_api/group"/>
+   </component>
+   <component id="images_api" name="Images API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/images_api/images_api.metaxml"/>
+    <unit bldFile="classicui_pub/images_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/stylus_popup_menu_api/stylus_popup_menu_api.metaxml"/>
+    <unit bldFile="classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/information_preview_popup_api/information_preview_popup_api.metaxml"/>
+    <unit bldFile="classicui_pub/information_preview_popup_api/group" filter="!test"/>
+    <unit bldFile="classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/intermediate_state_api/intermediate_state_api.metaxml"/>
+    <unit bldFile="classicui_pub/intermediate_state_api/group"/>
+   </component>
+   <component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+    <unit bldFile="classicui_pub/help_launcher_api/group"/>
+   </component>
+  </collection>
+  <collection id="ode" name="Open Dynamics Engine" level="support">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="ode_build" filter="s60" name="ODE">
+    <unit bldFile="ode/group"/>
+   </component>
+  </collection>
+  <collection id="uifw" name="UI Framework" level="server">
+   <component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+    <unit bldFile="uifw/uiklaf/group"/>
+   </component>
+   <component id="eikctl" filter="s60" name="Eikon Controls">
+    <unit bldFile="uifw/eikctl/group"/>
+   </component>
+   <component id="avkon" filter="s60" name="Avkon">
+    <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+    <unit bldFile="uifw/avkon/aknphysics/group"/>
+    <unit bldFile="uifw/avkon/group"/>
+    <unit bldFile="uifw/avkon/aknconf/group"/>
+   </component>
+   <component id="eikstd" filter="s60" name="Eikon Standard">
+    <unit bldFile="uifw/eikstd/group"/>
+   </component>
+   <component id="aknglobalui" filter="s60" name="Avkon Global UI">
+    <unit bldFile="uifw/aknglobalui/group"/>
+   </component>
+   <component id="ganes" filter="s60" name="Ganes">
+    <unit bldFile="uifw/ganes/group"/>
+   </component>
+  </collection>
+  <collection id="commonuis" name="Common UIs" level="specific">
+   <component id="commonui" filter="s60" name="Common UI">
+    <unit bldFile="commonuis/commonui/group"/>
+   </component>
+   <component id="commondialogs" filter="s60" name="Common Dialogs">
+    <unit bldFile="commonuis/commondialogs/group"/>
+   </component>
+  </collection>
+  <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+   <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+    <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
+   </component>
+  </collection>
+  <collection id="psln" name="Personalization" level="specific">
+   <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+   <component id="psln_build" filter="s60" name="Personalization Build">
+    <unit bldFile="psln/group"/>
+   </component>
+  </collection>
+  <collection id="commonadapter" name="Common Adapter" level="support">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+    <unit bldFile="commonadapter/group"/>
+   </component>
+  </collection>
+  <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+    <unit bldFile="akntouchgesturefw/group"/>
+   </component>
+  </collection>
+  <collection id="uiutils" name="UI Utils" level="specific">
+   <component id="localizer" filter="s60" name="Directory Localizer">
+    <unit bldFile="uiutils/localizer/group"/>
+   </component>
+   <component id="findutil" filter="s60" name="Find Utility">
+    <unit bldFile="uiutils/findutil/group"/>
+   </component>
+   <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+    <unit bldFile="uiutils/gamerecognizer/group"/>
+   </component>
+   <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+    <unit bldFile="uiutils/aknjapanesereading/group"/>
+   </component>
+   <component id="hlplch" name="Help Launcher" filter="s60,bldfirst">
+      <unit bldFile="uiutils/hlplch/group"/>
+   </component>
+  </collection>
+  <collection id="commonuisupport" name="Common UI Support" level="support">
+   <component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+    <unit bldFile="commonuisupport/uikon/group" mrp="commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+   </component>
+   <component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+    <unit bldFile="commonuisupport/errorresolverdata/group" mrp="commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+   </component>
+   <component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+    <unit bldFile="commonuisupport/uilaf/GROUP" mrp="commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+   </component>
+   <component id="grid" name="Grid" purpose="optional">
+    <unit bldFile="commonuisupport/grid/group" mrp="commonuisupport/grid/group/app-framework_grid.mrp"/>
+   </component>
+   <component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+    <unit mrp="commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+   <component id="cone" name="Control Environment" purpose="mandatory">
+    <unit bldFile="lafagnosticuifoundation/cone/group" mrp="lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+   </component>
+   <component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+    <unit bldFile="lafagnosticuifoundation/graphicseffects/group" mrp="lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+   </component>
+   <component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+    <unit bldFile="lafagnosticuifoundation/uigraphicsutils/group" mrp="lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+   </component>
+   <component id="clockanim" name="Clock" purpose="optional" class="plugin">
+    <unit bldFile="lafagnosticuifoundation/clockanim/group" mrp="lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+   </component>
+   <component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+    <unit bldFile="lafagnosticuifoundation/bmpanimation/group" mrp="lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+   </component>
+   <component id="animation" name="Animation" introduced="9.1" purpose="optional">
+    <unit bldFile="lafagnosticuifoundation/animation/group" mrp="lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+   </component>
+  </collection>
+  <collection id="classicui_info" name="Classic UI Info" level="specific">
+   <!-- the multiple units in the API test components need to be resolved -->
+   <component id="classicui_plat_api_test" filter="s60,test,api_test" name="Classic UI Platform API Tests" purpose="development">
+    <!-- can only have one unit. Need to #include from a single bld.inf -->
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/classicui/package_definition_3.0.xml
--- a/symbian4/mw/classicui/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,833 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="classicui" name="Classic UI" levels="base support server generic specific">
-  <collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
-   <component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_framework_api/personalisation_framework_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_framework_api/group"/>
-   </component>
-   <component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/signal_pane_api/signal_pane_api.metaxml"/>
-    <unit bldFile="classicui_plat/signal_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/japanese_reading_api/japanese_reading_api.metaxml"/>
-    <unit bldFile="classicui_plat/japanese_reading_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/global_popup_priority_controller_api/global_popup_priority_controller_api.metaxml"/>
-    <unit bldFile="classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/global_popup_priority_controller_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/item_finder_api/item_finder_api.metaxml"/>
-    <unit bldFile="classicui_plat/item_finder_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/item_finder_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_fonts_api/avkon_fonts_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_fonts_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/avkon_fonts_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_utilities_api/extended_utilities_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_utilities_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_plugin_api/personalisation_plugin_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_plugin_api/group"/>
-   </component>
-   <component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_aiw_criteria_api/extended_aiw_criteria_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_application_api/personalisation_application_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_application_api/group"/>
-   </component>
-   <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/volume_popup_api/volume_popup_api.metaxml"/>
-    <unit bldFile="classicui_plat/volume_popup_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/volume_popup_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_secondary_display_support_api/avkon_secondary_display_support_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/avkon_secondary_display_support_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_setting_pages_api/extended_setting_pages_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_setting_pages_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_setting_pages_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_lists_api/extended_lists_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_lists_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_lists_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="input_block_api" name="Input Block API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/input_block_api/input_block_api.metaxml"/>
-    <unit bldFile="classicui_plat/input_block_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/input_block_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_ui_server_api/avkon_ui_server_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_ui_server_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/number_grouping_api/number_grouping_api.metaxml"/>
-    <unit bldFile="classicui_plat/number_grouping_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_status_pane_api/extended_status_pane_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_status_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_status_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_notifiers_api/extended_notifiers_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_notifiers_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_notifiers_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="task_list_api" name="Task List API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/task_list_api/task_list_api.metaxml"/>
-    <unit bldFile="classicui_plat/task_list_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_slide_show_dialog_api/personalisation_slide_show_dialog_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_slide_show_dialog_api/group"/>
-   </component>
-   <component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/key_event_utilities_api/key_event_utilities_api.metaxml"/>
-    <unit bldFile="classicui_plat/key_event_utilities_api/group"/>
-   </component>
-   <component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/emergency_call_support_api/emergency_call_support_api.metaxml"/>
-    <unit bldFile="classicui_plat/emergency_call_support_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/emergency_call_support_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_dialogs_api/extended_dialogs_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_dialogs_api/group"/>
-   </component>
-   <component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/legacy_ui_framework_headers_api/legacy_ui_framework_headers_api.metaxml"/>
-    <unit bldFile="classicui_plat/legacy_ui_framework_headers_api/group"/>
-   </component>
-   <component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_editors_api/extended_editors_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_editors_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_editors_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="alarm_api" name="Alarm API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/alarm_api/alarm_api.metaxml"/>
-    <unit bldFile="classicui_plat/alarm_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/alarm_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/aiw_service_interface_base_api/aiw_service_interface_base_api.metaxml"/>
-    <unit bldFile="classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/aiw_service_interface_base_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="list_effects_api" name="List Effects API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/list_effects_api/list_effects_api.metaxml"/>
-    <unit bldFile="classicui_plat/list_effects_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/list_effects_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/find_item_ui_api/find_item_ui_api.metaxml"/>
-    <unit bldFile="classicui_plat/find_item_ui_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/find_item_ui_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/server_application_services_api/server_application_services_api.metaxml"/>
-    <unit bldFile="classicui_plat/server_application_services_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/server_application_services_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/common_ui_settings_api/common_ui_settings_api.metaxml"/>
-    <unit bldFile="classicui_plat/common_ui_settings_api/group"/>
-   </component>
-   <component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/aiw_service_interface_menu_api/aiw_service_interface_menu_api.metaxml"/>
-    <unit bldFile="classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/aiw_service_interface_menu_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/eikon_server_extension_client_api/eikon_server_extension_client_api.metaxml"/>
-    <unit bldFile="classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/eikon_server_extension_client_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/skinnable_clock_api/skinnable_clock_api.metaxml"/>
-    <unit bldFile="classicui_plat/skinnable_clock_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/skinnable_clock_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/battery_pane_api/battery_pane_api.metaxml"/>
-    <unit bldFile="classicui_plat/battery_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/battery_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/fep_document_navigation_api/fep_document_navigation_api.metaxml"/>
-    <unit bldFile="classicui_plat/fep_document_navigation_api/group"/>
-   </component>
-   <component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_localised_texts_api/personalisation_localised_texts_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_localised_texts_api/group"/>
-   </component>
-   <component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/memory_card_ui_api/memory_card_ui_api.metaxml"/>
-    <unit bldFile="classicui_plat/memory_card_ui_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/memory_card_ui_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_status_api/avkon_status_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_status_api/group"/>
-   </component>
-   <component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/application_switching_api/application_switching_api.metaxml"/>
-    <unit bldFile="classicui_plat/application_switching_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/application_switching_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_localised_texts_api/avkon_localised_texts_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_localised_texts_api/group"/>
-   </component>
-   <component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_secondary_display_api/avkon_secondary_display_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_secondary_display_api/group"/>
-   </component>
-   <component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_animation_api/extended_animation_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_animation_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_animation_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_notes_api/extended_notes_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_notes_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/text_scroller_api/text_scroller_api.metaxml"/>
-    <unit bldFile="classicui_plat/text_scroller_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/custom_cursors_api/custom_cursors_api.metaxml"/>
-    <unit bldFile="classicui_plat/custom_cursors_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/global_window_priorities_api/global_window_priorities_api.metaxml"/>
-    <unit bldFile="classicui_plat/global_window_priorities_api/group"/>
-   </component>
-   <component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_indicators_api/extended_indicators_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_indicators_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_indicators_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/special_character_table_api/special_character_table_api.metaxml"/>
-    <unit bldFile="classicui_plat/special_character_table_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/special_character_table_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_settings_api/avkon_settings_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_settings_api/group"/>
-   </component>
-   <component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_sounds_api/extended_sounds_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_sounds_api/group"/>
-   </component>
-   <component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/themes_settings_api/themes_settings_api.metaxml"/>
-    <unit bldFile="classicui_plat/themes_settings_api/group"/>
-   </component>
-   <component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/media_shared_document_api/media_shared_document_api.metaxml"/>
-    <unit bldFile="classicui_plat/media_shared_document_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/media_shared_document_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_queries_api/extended_queries_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_queries_api/group"/>
-   </component>
-   <component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/phone_number_text_utilities_api/phone_number_text_utilities_api.metaxml"/>
-    <unit bldFile="classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_scroller_api/extended_scroller_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_scroller_api/group"/>
-   </component>
-   <component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/key_rotator_api/key_rotator_api.metaxml"/>
-    <unit bldFile="classicui_plat/key_rotator_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/key_rotator_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_grids_api/extended_grids_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_grids_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_grids_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/generic_parameter_api/generic_parameter_api.metaxml"/>
-    <unit bldFile="classicui_plat/generic_parameter_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/generic_parameter_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/indicator_touch_observer_api/indicator_touch_observer_api.metaxml"/>
-    <unit bldFile="classicui_plat/indicator_touch_observer_api/group"/>
-   </component>
-   <component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/popup_form_api/popup_form_api.metaxml"/>
-    <unit bldFile="classicui_plat/popup_form_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/popup_form_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/stylus_activated_popup_api/stylus_activated_popup_api.metaxml"/>
-    <unit bldFile="classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/stylus_activated_popup_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/indicator_plugin_api/indicator_plugin_api.metaxml"/>
-    <unit bldFile="classicui_plat/indicator_plugin_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/indicator_plugin_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/layout_configuration_api/layout_configuration_api.metaxml"/>
-    <unit bldFile="classicui_plat/layout_configuration_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/common_file_dialogs_filter_factory_api/common_file_dialogs_filter_factory_api.metaxml"/>
-    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_anim_dll_api/avkon_anim_dll_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_anim_dll_api/group"/>
-   </component>
-   <component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_initialization_api/extended_initialization_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_initialization_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_initialization_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/long_tap_animation_api/long_tap_animation_api.metaxml"/>
-    <unit bldFile="classicui_plat/long_tap_animation_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/long_tap_animation_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_ui_framework_definitions_api/extended_ui_framework_definitions_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_ui_framework_definitions_api/group"/>
-   </component>
-   <component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_buttons_api/extended_buttons_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_buttons_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_buttons_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/aiw_provider_utility_api/aiw_provider_utility_api.metaxml"/>
-    <unit bldFile="classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/aiw_provider_utility_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/transition_effect_parameters_api/transition_effect_parameters_api.metaxml"/>
-    <unit bldFile="classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/transition_effect_parameters_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_input_capabilities_api/extended_input_capabilities_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_input_capabilities_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/uikon_status_api/uikon_status_api.metaxml"/>
-    <unit bldFile="classicui_plat/uikon_status_api/group"/>
-   </component>
-   <component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/transition_effect_utilities_api/transition_effect_utilities_api.metaxml"/>
-    <unit bldFile="classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/transition_effect_utilities_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/pointer_event_modifier_api/pointer_event_modifier_api.metaxml"/>
-    <unit bldFile="classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/pointer_event_modifier_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/avkon_testability_api/avkon_testability_api.metaxml"/>
-    <unit bldFile="classicui_plat/avkon_testability_api/group"/>
-   </component>
-   <component id="ganes_api" name="ganes_api" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/ganes_api/ganes_api.metaxml"/>
-    <unit bldFile="classicui_plat/ganes_api/group"/>
-   </component>
-   <component id="ode_api" name="Ode API" class="api" filter="s60">
-    <unit bldFile="classicui_plat/ode_api/group"/>
-   </component>
-   <component id="physics_api" name="Physics API" class="api" filter="s60">
-    <unit bldFile="classicui_plat/physics_api/group"/>
-   </component>
-   <component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/touch_pane_api/touch_pane_api.metaxml"/>
-    <unit bldFile="classicui_plat/touch_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/touch_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/touch_pane_observer_api/touch_pane_observer_api.metaxml"/>
-    <unit bldFile="classicui_plat/touch_pane_observer_api/group"/>
-   </component>
-   <component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/alternate_fs_api/alternate_fs_api.metaxml"/>
-    <unit bldFile="classicui_plat/alternate_fs_api/group"/>
-   </component>
-   <component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
-    <unit bldFile="classicui_plat/discreet_popup_api/group"/>
-   </component>
-   <component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/touch_gesture_framework_api/touch_gesture_framework_api.metaxml"/>
-    <unit bldFile="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 id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/extended_options_menu_api/extended_options_menu_api.metaxml"/>
-    <unit bldFile="classicui_plat/extended_options_menu_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_test"/>
-   </component>
-  </collection>
-  <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
-   <component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/input_frame_api/input_frame_api.metaxml"/>
-    <unit bldFile="classicui_pub/input_frame_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/window_server_event_observer_api/window_server_event_observer_api.metaxml"/>
-    <unit bldFile="classicui_pub/window_server_event_observer_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/application_framework_api/application_framework_api.metaxml"/>
-    <unit bldFile="classicui_pub/application_framework_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="scroller_api" name="Scroller API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/scroller_api/scroller_api.metaxml"/>
-    <unit bldFile="classicui_pub/scroller_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/ui_framework_utilities_api/ui_framework_utilities_api.metaxml"/>
-    <unit bldFile="classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/ui_framework_definitions_api/ui_framework_definitions_api.metaxml"/>
-    <unit bldFile="classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="buttons_api" name="Buttons API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/buttons_api/buttons_api.metaxml"/>
-    <unit bldFile="classicui_pub/buttons_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="queries_api" name="Queries API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/queries_api/queries_api.metaxml"/>
-    <unit bldFile="classicui_pub/queries_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/aiw_generic_parameter_api/aiw_generic_parameter_api.metaxml"/>
-    <unit bldFile="classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="editors_api" name="Editors API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/editors_api/editors_api.metaxml"/>
-    <unit bldFile="classicui_pub/editors_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
-    <unit bldFile="classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/dialog_shutter_api/dialog_shutter_api.metaxml"/>
-    <unit bldFile="classicui_pub/dialog_shutter_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="fonts_api" name="Fonts API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/fonts_api/fonts_api.metaxml"/>
-    <unit bldFile="classicui_pub/fonts_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/screen_clearer_api/screen_clearer_api.metaxml"/>
-    <unit bldFile="classicui_pub/screen_clearer_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/notifiers_api/notifiers_api.metaxml"/>
-    <unit bldFile="classicui_pub/notifiers_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="notes_api" name="Notes API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/notes_api/notes_api.metaxml"/>
-    <unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>
-    <unit bldFile="classicui_pub/status_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/base_controls_api/base_controls_api.metaxml"/>
-    <unit bldFile="classicui_pub/base_controls_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="grids_api" name="Grids API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/grids_api/grids_api.metaxml"/>
-    <unit bldFile="classicui_pub/grids_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/context_pane_api/context_pane_api.metaxml"/>
-    <unit bldFile="classicui_pub/context_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="lists_api" name="Lists API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/lists_api/lists_api.metaxml"/>
-    <unit bldFile="classicui_pub/lists_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="popups_api" name="Popups API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/popups_api/popups_api.metaxml"/>
-    <unit bldFile="classicui_pub/popups_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/misc_controls_api/misc_controls_api.metaxml"/>
-    <unit bldFile="classicui_pub/misc_controls_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="keylock_api" name="Keylock API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/keylock_api/keylock_api.metaxml"/>
-    <unit bldFile="classicui_pub/keylock_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/options_menu_api/options_menu_api.metaxml"/>
-    <unit bldFile="classicui_pub/options_menu_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/hierarchical_lists_api/hierarchical_lists_api.metaxml"/>
-    <unit bldFile="classicui_pub/hierarchical_lists_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/navigation_pane_api/navigation_pane_api.metaxml"/>
-    <unit bldFile="classicui_pub/navigation_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="tabs_api" name="Tabs API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/tabs_api/tabs_api.metaxml"/>
-    <unit bldFile="classicui_pub/tabs_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/title_pane_touch_observer_api/title_pane_touch_observer_api.metaxml"/>
-    <unit bldFile="classicui_pub/title_pane_touch_observer_api/group"/>
-   </component>
-   <component id="choice_list_api" name="Choice List API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/choice_list_api/choice_list_api.metaxml"/>
-    <unit bldFile="classicui_pub/choice_list_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/info_popup_note_api/info_popup_note_api.metaxml"/>
-    <unit bldFile="classicui_pub/info_popup_note_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/setting_pages_api/setting_pages_api.metaxml"/>
-    <unit bldFile="classicui_pub/setting_pages_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/screen_mode_api/screen_mode_api.metaxml"/>
-    <unit bldFile="classicui_pub/screen_mode_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="indicators_api" name="Indicators API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/indicators_api/indicators_api.metaxml"/>
-    <unit bldFile="classicui_pub/indicators_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="error_ui_api" name="Error UI API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/error_ui_api/error_ui_api.metaxml"/>
-    <unit bldFile="classicui_pub/error_ui_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="animation_api" name="Animation API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/animation_api/animation_api.metaxml"/>
-    <unit bldFile="classicui_pub/animation_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/searchfield_api/searchfield_api.metaxml"/>
-    <unit bldFile="classicui_pub/searchfield_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="labels_api" name="Labels API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/labels_api/labels_api.metaxml"/>
-    <unit bldFile="classicui_pub/labels_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/hotkeys_api/hotkeys_api.metaxml"/>
-    <unit bldFile="classicui_pub/hotkeys_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="initialization_api" name="Initialization API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/initialization_api/initialization_api.metaxml"/>
-    <unit bldFile="classicui_pub/initialization_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/volume_control_api/volume_control_api.metaxml"/>
-    <unit bldFile="classicui_pub/volume_control_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/title_pane_api/title_pane_api.metaxml"/>
-    <unit bldFile="classicui_pub/title_pane_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="sounds_api" name="Sounds API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/sounds_api/sounds_api.metaxml"/>
-    <unit bldFile="classicui_pub/sounds_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/aiw_service_handler_api/aiw_service_handler_api.metaxml"/>
-    <unit bldFile="classicui_pub/aiw_service_handler_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/aiw_criteria_api/aiw_criteria_api.metaxml"/>
-    <unit bldFile="classicui_pub/aiw_criteria_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/touch_ui_utilities_api/touch_ui_utilities_api.metaxml"/>
-    <unit bldFile="classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/generic_button_api/generic_button_api.metaxml"/>
-    <unit bldFile="classicui_pub/generic_button_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="form_api" name="Form API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/form_api/form_api.metaxml"/>
-    <unit bldFile="classicui_pub/form_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/uikon_core_controls/uikon_core_controls.metaxml"/>
-    <unit bldFile="classicui_pub/uikon_core_controls/group" filter="!test"/>
-    <unit bldFile="classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="calendar_api" name="Calendar API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/calendar_api/calendar_api.metaxml"/>
-    <unit bldFile="classicui_pub/calendar_api/group"/>
-   </component>
-   <component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/toolbar_api/toolbar_api.metaxml"/>
-    <unit bldFile="classicui_pub/toolbar_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="server_application_api" name="Server Application API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/server_application_api/server_application_api.metaxml"/>
-    <unit bldFile="classicui_pub/server_application_api/group"/>
-   </component>
-   <component id="slider_api" name="Slider API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/slider_api/slider_api.metaxml"/>
-    <unit bldFile="classicui_pub/slider_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/private_ui_framework_api/private_ui_framework_api.metaxml"/>
-    <unit bldFile="classicui_pub/private_ui_framework_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/dialogs_api/dialogs_api.metaxml"/>
-    <unit bldFile="classicui_pub/dialogs_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="document_handler_api" name="Document handler API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/document_handler_api/document_handler_api.metaxml"/>
-    <unit bldFile="classicui_pub/document_handler_api/group"/>
-   </component>
-   <component id="images_api" name="Images API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/images_api/images_api.metaxml"/>
-    <unit bldFile="classicui_pub/images_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/stylus_popup_menu_api/stylus_popup_menu_api.metaxml"/>
-    <unit bldFile="classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/information_preview_popup_api/information_preview_popup_api.metaxml"/>
-    <unit bldFile="classicui_pub/information_preview_popup_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_pub/intermediate_state_api/intermediate_state_api.metaxml"/>
-    <unit bldFile="classicui_pub/intermediate_state_api/group"/>
-   </component>
-   <component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
-    <unit bldFile="classicui_pub/help_launcher_api/group"/>
-   </component>
-  </collection>
-  <collection id="ode" name="Open Dynamics Engine" level="support">
-   <!-- the collection is really a component. Move down a directory.-->
-   <component id="ode_build" filter="s60" name="ODE">
-    <unit bldFile="ode/group"/>
-   </component>
-  </collection>
-  <collection id="uifw" name="UI Framework" level="server">
-   <component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
-    <unit bldFile="uifw/uiklaf/group"/>
-   </component>
-   <component id="eikctl" filter="s60" name="Eikon Controls">
-    <unit bldFile="uifw/eikctl/group"/>
-   </component>
-   <component id="avkon" filter="s60" name="Avkon">
-    <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-    <unit bldFile="uifw/avkon/aknphysics/group"/>
-    <unit bldFile="uifw/avkon/group"/>
-    <unit bldFile="uifw/avkon/aknconf/group"/>
-   </component>
-   <component id="eikstd" filter="s60" name="Eikon Standard">
-    <unit bldFile="uifw/eikstd/group"/>
-   </component>
-   <component id="aknglobalui" filter="s60" name="Avkon Global UI">
-    <unit bldFile="uifw/aknglobalui/group"/>
-   </component>
-   <component id="ganes" filter="s60" name="Ganes">
-    <unit bldFile="uifw/ganes/group"/>
-   </component>
-  </collection>
-  <collection id="commonuis" name="Common UIs" level="specific">
-   <component id="commonui" filter="s60" name="Common UI">
-    <unit bldFile="commonuis/commonui/group"/>
-   </component>
-   <component id="commondialogs" filter="s60" name="Common Dialogs">
-    <unit bldFile="commonuis/commondialogs/group"/>
-   </component>
-  </collection>
-  <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
-   <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
-    <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
-   </component>
-  </collection>
-  <collection id="psln" name="Personalization" level="specific">
-   <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-   <component id="psln_build" filter="s60" name="Personalization Build">
-    <unit bldFile="psln/group"/>
-   </component>
-  </collection>
-  <collection id="commonadapter" name="Common Adapter" level="support">
-   <!-- the collection is really a component. Move down a directory.-->
-   <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
-    <unit bldFile="commonadapter/group"/>
-   </component>
-  </collection>
-  <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
-   <!-- the collection is really a component. Move down a directory.-->
-   <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
-    <unit bldFile="akntouchgesturefw/group"/>
-   </component>
-  </collection>
-  <collection id="uiutils" name="UI Utils" level="specific">
-   <component id="localizer" filter="s60" name="Directory Localizer">
-    <unit bldFile="uiutils/localizer/group"/>
-   </component>
-   <component id="findutil" filter="s60" name="Find Utility">
-    <unit bldFile="uiutils/findutil/group"/>
-   </component>
-   <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
-    <unit bldFile="uiutils/gamerecognizer/group"/>
-   </component>
-   <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
-    <unit bldFile="uiutils/aknjapanesereading/group"/>
-   </component>
-   <component id="hlplch" name="Help Launcher" filter="s60,bldfirst">
-      <unit bldFile="uiutils/hlplch/group"/>
-   </component>
-  </collection>
-  <collection id="commonuisupport" name="Common UI Support" level="support">
-   <component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
-    <unit bldFile="commonuisupport/uikon/group" mrp="commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-   </component>
-   <component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
-    <unit bldFile="commonuisupport/errorresolverdata/group" mrp="commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-   </component>
-   <component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-    <unit bldFile="commonuisupport/uilaf/GROUP" mrp="commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-   </component>
-   <component id="grid" name="Grid" purpose="optional">
-    <unit bldFile="commonuisupport/grid/group" mrp="commonuisupport/grid/group/app-framework_grid.mrp"/>
-   </component>
-   <component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
-    <unit mrp="commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-   </component>
-  </collection>
-  <collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
-   <component id="cone" name="Control Environment" purpose="mandatory">
-    <unit bldFile="lafagnosticuifoundation/cone/group" mrp="lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-   </component>
-   <component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
-    <unit bldFile="lafagnosticuifoundation/graphicseffects/group" mrp="lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-   </component>
-   <component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
-    <unit bldFile="lafagnosticuifoundation/uigraphicsutils/group" mrp="lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-   </component>
-   <component id="clockanim" name="Clock" purpose="optional" class="plugin">
-    <unit bldFile="lafagnosticuifoundation/clockanim/group" mrp="lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-   </component>
-   <component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
-    <unit bldFile="lafagnosticuifoundation/bmpanimation/group" mrp="lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-   </component>
-   <component id="animation" name="Animation" introduced="9.1" purpose="optional">
-    <unit bldFile="lafagnosticuifoundation/animation/group" mrp="lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-   </component>
-  </collection>
-  <collection id="classicui_info" name="Classic UI Info" level="specific">
-   <!-- the multiple units in the API test components need to be resolved -->
-   <component id="classicui_plat_api_test" filter="s60,test,api_test" name="Classic UI Platform API Tests" purpose="development">
-    <!-- can only have one unit. Need to #include from a single bld.inf -->
-    <unit bldFile="tsrc/group"/>
-   </component>
-   <component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/dlnasrv/package_definition.xml
--- a/symbian4/mw/dlnasrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/dlnasrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,276 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
-        <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-        <collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-          <component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-          </component>
-          <component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-          </component>
-          <component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-          </component>
-          <component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-          </component>
-          <component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-          </component>
-          <component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-          </component>
-          <component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-          </component>
-          <component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-          </component>
-        </collection>
-        <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-          <component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-          </component>
-          <component name="upnpavcontrolpoint_build" filter="s60" long-name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-            <!-- put exports in other component instead -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/group"/>
-          </component>
-        </collection>
-        <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-          <component name="avobjects" filter="s60" long-name="A/V Objects">
-            <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-          </component>
-          <component name="mediaserverclient" filter="s60" long-name="Media Server Client">
-            <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-          </component>
-          <component name="connectionmanagerservice" filter="s60" long-name="Connection Manager Service">
-            <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-          </component>
-          <component name="contentdirectoryservice" filter="s60" long-name="Content Directory Service">
-            <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-          </component>
-          <component name="mediaserverengine" filter="s60" long-name="Media Server Engine">
-            <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-          </component>
-          <component name="upnpmediaserver_build" filter="s60" long-name="UPnP Media Server Build">
-            <!-- move exports into one of above components -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/group"/>
-          </component>
-        </collection>
-        <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="ctrl">
-          <component name="upnpxmlparser" filter="s60" long-name="UPnP XML Parser" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-          </component>
-          <component name="upnpavcontrollerserver" filter="s60" long-name="UPnP A/V Controller Server" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-          </component>
-          <component name="upnpavcontrollerclient" filter="s60" long-name="UPnP A/V Ccontroller Client" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-          </component>
-          <component name="upnpavcontrollerhelper" filter="s60" long-name="UPnP A/V Controller Helper" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-          </component>
-          <component name="upnpavcontroller_build" filter="s60" long-name="UPnP A/V Controller Build" introduced="^2">
-            <!-- move exports content into one of above components -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/group"/>
-          </component>
-        </collection>
-        <collection name="upnpframework" long-name="UPnP Framework" level="framework">
-          <component name="upnputilities" filter="s60" long-name="UPnP Utilities" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnputilities/group"/>
-          </component>
-          <component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-            <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-          </component>
-          <component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-            <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-          </component>
-          <component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-            <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-          </component>
-          <component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-            <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-          </component>
-          <component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-            <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-          </component>
-          <component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-          </component>
-          <component name="upnpcommand" filter="s60" long-name="UPnP Command" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommand/group"/>
-          </component>
-          <component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-            <!-- move exports content into one of above components -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/group"/>
-          </component>
-        </collection>
-        <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-          <component name="upnpsettingsengine" filter="s60" long-name="UPnP Settings Engine" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-          </component>
-          <component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-            <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-          </component>
-          <component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-            <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-          </component>
-          <component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-            <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-          </component>
-          <component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-          </component>
-          <component name="upnpsettings_build" filter="s60" long-name="UPnP Settings Build" introduced="^2">
-            <!-- move exports content into one of above components -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpsettings/group"/>
-          </component>
-        </collection>
-        <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-          <component name="upnpdlnaprofiler" filter="s60" long-name="UPnP DLNA Profiler" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-          </component>
-          <component name="upnpsecurity" filter="s60" long-name="UPnP Security" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-          </component>
-          <component name="upnpcontentserver" filter="s60" long-name="UPnP Content Server" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-          </component>
-          <component name="applicationengine" filter="s60" long-name="UPnP Application Engine" introduced="^2">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsharing/applicationengine/group"/>
-          </component>
-          <component name="upnpsharing_build" filter="s60" long-name="UPnP Sharing Build" introduced="^2">
-            <!-- move exports content into one of above components -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpsharing/group"/>
-          </component>
-        </collection>
-        <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-          <component name="upnpplaybackplugins" filter="s60" long-name="UPnP Playback Plugins" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-          </component>
-          <component name="upnpmpxplugins_build" filter="s60" long-name="UPnP MPX Plugins Build" introduced="^2">
-            <!-- move exports content into other component? -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/group"/>
-          </component>
-        </collection>
-        <collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-          <component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
-            <!-- need to merge or #include these to a single bld.inf -->
-            <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<SystemDefinition schema="3.0.0">
+ <package id="dlnasrv" name="DLNA Services" levels="stack server ctrl framework plugin">
+  <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+  <collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+   <component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_media_server_settings_api/group"/>
+   </component>
+   <component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_av_objects_api/group"/>
+   </component>
+   <component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_media_server_api/group"/>
+   </component>
+   <component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_security_plugin_api/group"/>
+   </component>
+   <component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_avcp_api/upnp_avcp_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_avcp_api/group"/>
+   </component>
+   <component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+   </component>
+   <component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_command_api/group"/>
+   </component>
+   <component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+   <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+    <unit bldFile="upnpavcontrolpoint/avcontrolframework/group"/>
+   </component>
+   <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+    <!-- put exports in other component instead -->
+    <unit bldFile="upnpavcontrolpoint/group"/>
+   </component>
+  </collection>
+  <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+   <component id="avobjects" filter="s60" name="A/V Objects">
+    <unit bldFile="upnpmediaserver/avobjects/group"/>
+   </component>
+   <component id="mediaserverclient" filter="s60" name="Media Server Client">
+    <unit bldFile="upnpmediaserver/mediaserverclient/group"/>
+   </component>
+   <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+    <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
+   </component>
+   <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+    <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
+   </component>
+   <component id="mediaserverengine" filter="s60" name="Media Server Engine">
+    <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
+   </component>
+   <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+    <!-- move exports into one of above components -->
+    <unit bldFile="upnpmediaserver/group"/>
+   </component>
+  </collection>
+  <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+   <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
+   </component>
+   <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
+   </component>
+   <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
+   </component>
+   <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
+   </component>
+   <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpavcontroller/group"/>
+   </component>
+  </collection>
+  <collection id="upnpframework" name="UPnP Framework" level="framework">
+   <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+    <unit bldFile="upnpframework/upnputilities/group"/>
+   </component>
+   <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+   </component>
+   <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+   </component>
+   <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+   </component>
+   <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+   </component>
+   <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+   </component>
+   <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+    <unit bldFile="upnpframework/upnpmusicadapter/group"/>
+   </component>
+   <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+    <unit bldFile="upnpframework/upnpcommand/group"/>
+   </component>
+   <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpframework/group"/>
+   </component>
+  </collection>
+  <collection id="upnpsettings" name="UPnP Settings" level="framework">
+   <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+    <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
+   </component>
+   <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+   </component>
+   <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+   </component>
+   <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+   </component>
+   <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+    <unit bldFile="upnpsettings/upnpgsplugin/group"/>
+   </component>
+   <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpsettings/group"/>
+   </component>
+  </collection>
+  <collection id="upnpsharing" name="UPnP Sharing" level="server">
+   <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+    <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
+   </component>
+   <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+    <unit bldFile="upnpsharing/upnpsecurity/group"/>
+   </component>
+   <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+    <unit bldFile="upnpsharing/upnpcontentserver/group"/>
+   </component>
+   <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+    <unit bldFile="upnpsharing/applicationengine/group"/>
+   </component>
+   <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpsharing/group"/>
+   </component>
+  </collection>
+  <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+   <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+    <unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
+   </component>
+   <component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+    <!-- move exports content into other component? -->
+    <unit bldFile="upnpmpxplugins/group"/>
+   </component>
+  </collection>
+  <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+   <meta rel="config">
+    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+   </meta>
+   <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+    <!-- need to merge or #include these to a single bld.inf -->
+    <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-          </component>
-          <component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-            <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-          </component>
-          <component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-            <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-          </component>
-          <component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
-            <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-            <!--<unit bldFile="upnpharvester/group"/>-->
-          </component>
-        </collection>
-        <collection name="homesync" long-name="Home Sync" level="plugin">
-          <component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-            <!-- <unit bldFile="homesync/group"/>-->
-            <!-- move bld.inf into contentmanager dir -->
-          </component>
-        </collection>
-        <collection name="homemedia" long-name="Home Media" level="framework">
-          <!-- collection is really just a component. Move down a directory -->
-          <component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-            <!-- <unit bldFile="homemedia/group"/> -->
-          </component>
-        </collection>
-        <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-          <component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-            <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
-            <unit bldFile="/sf/mw/dlnasrv/group"/>
-          </component>
-          <component name="dlnasrv_api_test" filter="s60,test,api_test" long-name="DLNA Services API Tests" purpose="development">
-            <unit bldFile="/sf/mw/dlnasrv/tsrc/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+   </component>
+   <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+    <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+   </component>
+   <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+    <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+   </component>
+   <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+    <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+    <!--<unit bldFile="upnpharvester/group"/>-->
+   </component>
+  </collection>
+  <collection id="homesync" name="Home Sync" level="plugin">
+   <meta rel="config">
+    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+   </meta>
+   <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+        <!-- <unit bldFile="homesync/group"/>-->  <!-- move bld.inf into contentmanager dir -->
+   </component>
+  </collection>
+  <collection id="homemedia" name="Home Media" level="framework">
+   <meta rel="config">
+    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+   </meta>
+   <!-- collection is really just a component. Move down a directory -->
+   <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+    <!-- <unit bldFile="homemedia/group"/> -->
+   </component>
+  </collection>
+  <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+   <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+    <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/dlnasrv/package_definition_3.0.xml
--- a/symbian4/mw/dlnasrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="dlnasrv" name="DLNA Services" levels="stack server ctrl framework plugin">
-  <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
-  <collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
-   <component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_media_server_settings_api/group"/>
-   </component>
-   <component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_av_objects_api/group"/>
-   </component>
-   <component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_media_server_api/group"/>
-   </component>
-   <component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_security_plugin_api/group"/>
-   </component>
-   <component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_avcp_api/upnp_avcp_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_avcp_api/group"/>
-   </component>
-   <component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-   </component>
-   <component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_command_api/group"/>
-   </component>
-   <component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_plugin_api/group"/>
-   </component>
-  </collection>
-  <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
-   <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
-    <unit bldFile="upnpavcontrolpoint/avcontrolframework/group"/>
-   </component>
-   <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-    <!-- put exports in other component instead -->
-    <unit bldFile="upnpavcontrolpoint/group"/>
-   </component>
-  </collection>
-  <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
-   <component id="avobjects" filter="s60" name="A/V Objects">
-    <unit bldFile="upnpmediaserver/avobjects/group"/>
-   </component>
-   <component id="mediaserverclient" filter="s60" name="Media Server Client">
-    <unit bldFile="upnpmediaserver/mediaserverclient/group"/>
-   </component>
-   <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
-    <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
-   </component>
-   <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
-    <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
-   </component>
-   <component id="mediaserverengine" filter="s60" name="Media Server Engine">
-    <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
-   </component>
-   <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
-    <!-- move exports into one of above components -->
-    <unit bldFile="upnpmediaserver/group"/>
-   </component>
-  </collection>
-  <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
-   <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
-    <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
-   </component>
-   <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
-    <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
-   </component>
-   <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
-    <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
-   </component>
-   <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
-    <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
-   </component>
-   <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
-    <!-- move exports content into one of above components -->
-    <unit bldFile="upnpavcontroller/group"/>
-   </component>
-  </collection>
-  <collection id="upnpframework" name="UPnP Framework" level="framework">
-   <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
-    <unit bldFile="upnpframework/upnputilities/group"/>
-   </component>
-   <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-   </component>
-   <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-   </component>
-   <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-   </component>
-   <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-   </component>
-   <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-   </component>
-   <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
-    <unit bldFile="upnpframework/upnpmusicadapter/group"/>
-   </component>
-   <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
-    <unit bldFile="upnpframework/upnpcommand/group"/>
-   </component>
-   <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
-    <!-- move exports content into one of above components -->
-    <unit bldFile="upnpframework/group"/>
-   </component>
-  </collection>
-  <collection id="upnpsettings" name="UPnP Settings" level="framework">
-   <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
-    <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
-   </component>
-   <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-   </component>
-   <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-   </component>
-   <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-   </component>
-   <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
-    <unit bldFile="upnpsettings/upnpgsplugin/group"/>
-   </component>
-   <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
-    <!-- move exports content into one of above components -->
-    <unit bldFile="upnpsettings/group"/>
-   </component>
-  </collection>
-  <collection id="upnpsharing" name="UPnP Sharing" level="server">
-   <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
-    <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
-   </component>
-   <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
-    <unit bldFile="upnpsharing/upnpsecurity/group"/>
-   </component>
-   <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
-    <unit bldFile="upnpsharing/upnpcontentserver/group"/>
-   </component>
-   <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
-    <unit bldFile="upnpsharing/applicationengine/group"/>
-   </component>
-   <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
-    <!-- move exports content into one of above components -->
-    <unit bldFile="upnpsharing/group"/>
-   </component>
-  </collection>
-  <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
-   <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
-    <unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
-   </component>
-   <component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
-    <!-- move exports content into other component? -->
-    <unit bldFile="upnpmpxplugins/group"/>
-   </component>
-  </collection>
-  <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
-   <meta rel="config">
-    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-   </meta>
-   <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
-    <!-- need to merge or #include these to a single bld.inf -->
-    <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-        <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-   </component>
-   <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-    <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-   </component>
-   <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-    <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-   </component>
-   <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
-    <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-    <!--<unit bldFile="upnpharvester/group"/>-->
-   </component>
-  </collection>
-  <collection id="homesync" name="Home Sync" level="plugin">
-   <meta rel="config">
-    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-   </meta>
-   <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
-        <!-- <unit bldFile="homesync/group"/>-->  <!-- move bld.inf into contentmanager dir -->
-   </component>
-  </collection>
-  <collection id="homemedia" name="Home Media" level="framework">
-   <meta rel="config">
-    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-   </meta>
-   <!-- collection is really just a component. Move down a directory -->
-   <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
-    <!-- <unit bldFile="homemedia/group"/> -->
-   </component>
-  </collection>
-  <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
-   <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
-    <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
-    <unit bldFile="group"/>
-   </component>
-   <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
-    <unit bldFile="tsrc/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/drm/package_definition.xml
--- a/symbian4/mw/drm/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,186 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-        <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-          <component name="roap_api" long-name="ROAP API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/roap_api/group"/>
-          </component>
-          <component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_common_api/group"/>
-          </component>
-          <component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_rights_api/group"/>
-          </component>
-          <component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_legacy_api/group"/>
-          </component>
-          <component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/dcf_repository_api/group"/>
-          </component>
-          <component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_service_api/group"/>
-          </component>
-          <component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_secondary_display_api/group"/>
-          </component>
-          <component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_license_manager_api/group"/>
-          </component>
-          <component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_utility_api/group"/>
-          </component>
-          <component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/drm_agents_api/group"/>
-          </component>
-          <component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/wmdrm_core_api/group"/>
-          </component>
-          <component name="wmdrm_access_api" long-name="WM DRM Access API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/wmdrm_access_api/group"/>
-          </component>
-          <component name="wmdrm_ota_access_api" long-name="WM DRM OTA Access API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
-          </component>
-          <component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/camese_utility_api/group"/>
-          </component>
-          <component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/camese_framework_api/group"/>
-          </component>
-        </collection>
-        <collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-          <component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_pub/drm_helper_api/group"/>
-          </component>
-          <component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-          </component>
-          <component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/drm/drm_pub/drm_license_checker_api/group"/>
-          </component>
-        </collection>
-        <collection name="commondrm" long-name="Common DRM" level="generic">
-          <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-          <component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-            <!-- this should have its own bld.inf or be removed as a component -->
-          </component>
-          <component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-            <!-- this should have its own bld.inf or be removed as a component -->
-          </component>
-          <component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-            <unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-          </component>
-          <component name="drmutility" filter="s60" long-name="DRM Utility">
-            <unit bldFile="/sf/mw/drm/commondrm/drmutility/group"/>
-          </component>
-          <component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-            <unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
-          </component>
-          <component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-            <unit bldFile="/sf/mw/drm/commondrm/drmrightsstoringlocation/group"/>
-          </component>
-          <component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-            <!-- should be split into the above files, or them collapsed into a single component -->
-            <unit bldFile="/sf/mw/drm/commondrm/group"/>
-          </component>
-        </collection>
-        <collection name="omadrm" long-name="OMA DRM" level="server">
-          <!-- collection is really a component. Move down a directory -->
-          <component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-            <unit bldFile="/sf/mw/drm/omadrm/group"/>
-          </component>
-          <component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-            <unit bldFile="/sf/mw/drm/omadrm/foundationcerts/group"/>
-          </component>
-        </collection>
-        <collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-          <!-- collection is really a component. Move down a directory -->
-          <component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-            <unit bldFile="/sf/mw/drm/wmdrm/group"/>
-          </component>
-        </collection>
-        <collection name="drm_info" long-name="DRM Info" level="specific">
-          <component name="drm_api_test" filter="s60,test,api_test" long-name="DRM Build" purpose="development">
-            <unit bldFile="/sf/mw/drm/tsrc/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="drm" name="DRM" levels="plugin framework server generic specific">
+  <collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+   <component id="roap_api" name="ROAP API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/roap_api/roap_api.metaxml"/>
+    <unit bldFile="drm_plat/roap_api/group"/>
+   </component>
+   <component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_common_api/drm_common_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_common_api/group"/>
+   </component>
+   <component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_rights_api/drm_rights_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_rights_api/group"/>
+   </component>
+   <component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_legacy_api/drm_legacy_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_legacy_api/group"/>
+   </component>
+   <component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/dcf_repository_api/dcf_repository_api.metaxml"/>
+    <unit bldFile="drm_plat/dcf_repository_api/group"/>
+   </component>
+   <component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_service_api/drm_service_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_service_api/group"/>
+   </component>
+   <component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_secondary_display_api/drm_secondary_display_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_secondary_display_api/group"/>
+   </component>
+   <component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_license_manager_api/drm_license_manager_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_license_manager_api/group"/>
+   </component>
+   <component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_utility_api/drm_utility_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_utility_api/group"/>
+   </component>
+   <component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_agents_api/drm_agents_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_agents_api/group"/>
+   </component>
+   <component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/wmdrm_core_api/wmdrm_core_api.metaxml"/>
+    <unit bldFile="drm_plat/wmdrm_core_api/group"/>
+   </component>
+   <component id="wmdrm_access_api" name="WM DRM Access API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/wmdrm_access_api/wmdrm_access_api.metaxml"/>
+    <unit bldFile="drm_plat/wmdrm_access_api/group"/>
+   </component>
+   <component id="wmdrm_ota_access_api" name="WM DRM OTA Access API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/wmdrm_ota_access_api/wmdrm_ota_access_api.metaxml"/>
+    <unit bldFile="drm_plat/wmdrm_ota_access_api/group"/>
+   </component>
+   <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/camese_utility_api/camese_utility_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA_DRM"/>
+    </meta>
+    <unit bldFile="drm_plat/camese_utility_api/group"/>
+   </component>
+   <component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/camese_framework_api/camese_framework_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA_DRM"/>
+    </meta>
+    <unit bldFile="drm_plat/camese_framework_api/group"/>
+   </component>
+  </collection>
+  <collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+   <component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+    <meta rel="Api" href="drm_pub/drm_helper_api/drm_helper_api.metaxml"/>
+    <unit bldFile="drm_pub/drm_helper_api/group"/>
+   </component>
+   <component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+    <meta rel="Api" href="drm_pub/oma_drm_caf_agent_api/oma_drm_caf_agent_api.metaxml"/>
+    <unit bldFile="drm_pub/oma_drm_caf_agent_api/group"/>
+   </component>
+   <component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+    <meta rel="Api" href="drm_pub/drm_license_checker_api/drm_license_checker_api.metaxml"/>
+    <unit bldFile="drm_pub/drm_license_checker_api/group"/>
+   </component>
+  </collection>
+  <collection id="commondrm" name="Common DRM" level="generic">
+   <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+   <component id="drmencryptor" filter="s60" name="DRM Encryptor">
+    <!-- this should have its own bld.inf or be removed as a component -->
+   </component>
+   <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+    <!-- this should have its own bld.inf or be removed as a component -->
+   </component>
+   <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+    <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
+   </component>
+   <component id="drmutility" filter="s60" name="DRM Utility">
+    <unit bldFile="commondrm/drmutility/group"/>
+   </component>
+   <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+    <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
+   </component>
+   <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+    <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
+   </component>
+   <component id="commondrm_build" filter="s60" name="Common DRM Build">
+    <!-- should be split into the above files, or them collapsed into a single component -->
+    <unit bldFile="commondrm/group"/>
+   </component>
+  </collection>
+  <collection id="omadrm" name="OMA DRM" level="server">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="omadrm_build" filter="s60" name="OMA DRM Build">
+    <unit bldFile="omadrm/group"/>
+   </component>
+   <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+    <unit bldFile="omadrm/foundationcerts/group"/>
+   </component>
+  </collection>
+  <collection id="wmdrm" name="Windows Media DRM" level="framework">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="wmdrm_build" filter="s60" name="WM DRM Build">
+    <unit bldFile="wmdrm/group"/>
+   </component>
+  </collection>
+  <collection id="drm_info" name="DRM Info" level="specific">
+   <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/drm/package_definition_3.0.xml
--- a/symbian4/mw/drm/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="drm" name="DRM" levels="plugin framework server generic specific">
-  <collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
-   <component id="roap_api" name="ROAP API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/roap_api/roap_api.metaxml"/>
-    <unit bldFile="drm_plat/roap_api/group"/>
-   </component>
-   <component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_common_api/drm_common_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_common_api/group"/>
-   </component>
-   <component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_rights_api/drm_rights_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_rights_api/group"/>
-   </component>
-   <component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_legacy_api/drm_legacy_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_legacy_api/group"/>
-   </component>
-   <component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/dcf_repository_api/dcf_repository_api.metaxml"/>
-    <unit bldFile="drm_plat/dcf_repository_api/group"/>
-   </component>
-   <component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_service_api/drm_service_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_service_api/group"/>
-   </component>
-   <component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_secondary_display_api/drm_secondary_display_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_secondary_display_api/group"/>
-   </component>
-   <component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_license_manager_api/drm_license_manager_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_license_manager_api/group"/>
-   </component>
-   <component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_utility_api/drm_utility_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_utility_api/group"/>
-   </component>
-   <component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/drm_agents_api/drm_agents_api.metaxml"/>
-    <unit bldFile="drm_plat/drm_agents_api/group"/>
-   </component>
-   <component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/wmdrm_core_api/wmdrm_core_api.metaxml"/>
-    <unit bldFile="drm_plat/wmdrm_core_api/group"/>
-   </component>
-   <component id="wmdrm_access_api" name="WM DRM Access API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/wmdrm_access_api/wmdrm_access_api.metaxml"/>
-    <unit bldFile="drm_plat/wmdrm_access_api/group"/>
-   </component>
-   <component id="wmdrm_ota_access_api" name="WM DRM OTA Access API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/wmdrm_ota_access_api/wmdrm_ota_access_api.metaxml"/>
-    <unit bldFile="drm_plat/wmdrm_ota_access_api/group"/>
-   </component>
-   <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/camese_utility_api/camese_utility_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="__WINDOWS_MEDIA_DRM"/>
-    </meta>
-    <unit bldFile="drm_plat/camese_utility_api/group"/>
-   </component>
-   <component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
-    <meta rel="Api" href="drm_plat/camese_framework_api/camese_framework_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="__WINDOWS_MEDIA_DRM"/>
-    </meta>
-    <unit bldFile="drm_plat/camese_framework_api/group"/>
-   </component>
-  </collection>
-  <collection id="drm_pub" name="DRM Public Interfaces" level="specific">
-   <component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
-    <meta rel="Api" href="drm_pub/drm_helper_api/drm_helper_api.metaxml"/>
-    <unit bldFile="drm_pub/drm_helper_api/group"/>
-   </component>
-   <component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
-    <meta rel="Api" href="drm_pub/oma_drm_caf_agent_api/oma_drm_caf_agent_api.metaxml"/>
-    <unit bldFile="drm_pub/oma_drm_caf_agent_api/group"/>
-   </component>
-   <component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
-    <meta rel="Api" href="drm_pub/drm_license_checker_api/drm_license_checker_api.metaxml"/>
-    <unit bldFile="drm_pub/drm_license_checker_api/group"/>
-   </component>
-  </collection>
-  <collection id="commondrm" name="Common DRM" level="generic">
-   <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-   <component id="drmencryptor" filter="s60" name="DRM Encryptor">
-    <!-- this should have its own bld.inf or be removed as a component -->
-   </component>
-   <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
-    <!-- this should have its own bld.inf or be removed as a component -->
-   </component>
-   <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
-    <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
-   </component>
-   <component id="drmutility" filter="s60" name="DRM Utility">
-    <unit bldFile="commondrm/drmutility/group"/>
-   </component>
-   <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
-    <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
-   </component>
-   <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
-    <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
-   </component>
-   <component id="commondrm_build" filter="s60" name="Common DRM Build">
-    <!-- should be split into the above files, or them collapsed into a single component -->
-    <unit bldFile="commondrm/group"/>
-   </component>
-  </collection>
-  <collection id="omadrm" name="OMA DRM" level="server">
-   <!-- collection is really a component. Move down a directory -->
-   <component id="omadrm_build" filter="s60" name="OMA DRM Build">
-    <unit bldFile="omadrm/group"/>
-   </component>
-   <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
-    <unit bldFile="omadrm/foundationcerts/group"/>
-   </component>
-  </collection>
-  <collection id="wmdrm" name="Windows Media DRM" level="framework">
-   <!-- collection is really a component. Move down a directory -->
-   <component id="wmdrm_build" filter="s60" name="WM DRM Build">
-    <unit bldFile="wmdrm/group"/>
-   </component>
-  </collection>
-  <collection id="drm_info" name="DRM Info" level="specific">
-   <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
-    <unit bldFile="tsrc/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/gsprofilesrv/package_definition.xml
--- a/symbian4/mw/gsprofilesrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,143 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-        <collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
-          <component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-          </component>
-          <component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-          </component>
-        </collection>
-        <collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
-          <component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
-          </component>
-          <component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
-          </component>
-          <component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-          </component>
-          <component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-          </component>
-          <component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-          </component>
-          <component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-          </component>
-          <component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-          </component>
-          <component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-          </component>
-        </collection>
-        <collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-          <component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-            <unit bldFile="/sf/mw/gsprofilesrv/gssettingsuis/gs/group"/>
-          </component>
-        </collection>
-        <collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
-          <component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-            <unit bldFile="/sf/mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
-          </component>
-        </collection>
-        <collection name="controlpanel" long-name="Control Panel" level="generic">
-          <component name="controlpanel_test" long-name="Control Panel Test" filter="s60,test,qt_unit_test">
-            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/tsrc" proFile="tsrc.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60">
-            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/rom" proFile="cp_rom.pri" qmakeArgs="-r -config rom"/>
-          </component>
-          <component name="controlpanel_source" long-name="Control Panel Source" filter="s60">
-            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/src" qmakeArgs="-r -config rom" proFile="src.pro"/>
-          </component>
-        </collection>
-        <collection name="profilesservices" long-name="Profiles Services" level="server">
-          <component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
-            <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/profileengine/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="gsprofilesrv" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+  <collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
+   <component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_pub/profiles_engine_active_profile_settings_api/profiles_engine_active_profile_settings_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+   </component>
+   <component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_pub/profiles_engine_wrapper_api/profiles_engine_wrapper_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+   </component>
+  </collection>
+  <collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
+   <component id="ftuwizardmodel_api" name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
+      <unit bldFile="gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>
+   <component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/profiles_engine_api/profiles_engine_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/profiles_engine_api/group"/>
+   </component>
+   <component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_backgroundimage_api/settings_backgroundimage_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+   </component>
+   <component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_framework_api/settings_framework_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_framework_api/group"/>
+   </component>
+   <component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_launch_api/settings_launch_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_launch_api/group"/>
+   </component>
+   <component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_listbox_api/settings_listbox_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_listbox_api/group"/>
+   </component>
+   <component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_plugin_api/settings_plugin_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_plugin_api/group"/>
+   </component>
+   <component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_uis_cenrep_collection_api/settings_uis_cenrep_collection_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+   </component>
+  </collection>
+  <collection id="gssettingsuis" name="General Settings UIs" level="framework">
+   <component id="gs" filter="s60" name="General Settings" introduced="9.2">
+    <unit bldFile="gssettingsuis/gs/group"/>
+   </component>
+  </collection>
+  <collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
+    <component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
+     <unit bldFile="ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
+    </component>
+  </collection>
+  <collection id="controlpanel" name="Control Panel" level="generic">
+   <component id="controlpanel_test" name="Control Panel Test" filter="s60,test,qt_unit_test">
+      <meta rel="testbuild">
+       <group name="controlpanel_tests"/>
+      </meta>
+      <unit bldFile="controlpanel/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r"/>
+   </component> 
+   <component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
+      <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
+   </component>
+   <component id="controlpanel_source" name="Control Panel Source" filter="s60">
+      <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
+   </component>
+  </collection>
+  <collection id="profilesservices" name="Profiles Services" level="server">
+   <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+    <unit bldFile="profilesservices/profileengine/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/gsprofilesrv/package_definition_3.0.xml
--- a/symbian4/mw/gsprofilesrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="gsprofilesrv" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-  <collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
-   <component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_pub/profiles_engine_active_profile_settings_api/profiles_engine_active_profile_settings_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
-   </component>
-   <component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_pub/profiles_engine_wrapper_api/profiles_engine_wrapper_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
-   </component>
-  </collection>
-  <collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
-   <component id="ftuwizardmodel_api" name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-      <unit bldFile="gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
-   </component>
-   <component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/profiles_engine_api/profiles_engine_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/profiles_engine_api/group"/>
-   </component>
-   <component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_backgroundimage_api/settings_backgroundimage_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-   </component>
-   <component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_framework_api/settings_framework_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_framework_api/group"/>
-   </component>
-   <component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_launch_api/settings_launch_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_launch_api/group"/>
-   </component>
-   <component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_listbox_api/settings_listbox_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_listbox_api/group"/>
-   </component>
-   <component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_plugin_api/settings_plugin_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_plugin_api/group"/>
-   </component>
-   <component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_uis_cenrep_collection_api/settings_uis_cenrep_collection_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
-   </component>
-  </collection>
-  <collection id="gssettingsuis" name="General Settings UIs" level="framework">
-   <component id="gs" filter="s60" name="General Settings" introduced="9.2">
-    <unit bldFile="gssettingsuis/gs/group"/>
-   </component>
-  </collection>
-  <collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
-    <component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
-     <unit bldFile="ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
-    </component>
-  </collection>
-  <collection id="controlpanel" name="Control Panel" level="generic">
-   <component id="controlpanel_test" name="Control Panel Test" filter="s60,test,qt_unit_test">
-      <meta rel="testbuild">
-       <group name="controlpanel_tests"/>
-      </meta>
-      <unit bldFile="controlpanel/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r"/>
-   </component> 
-   <component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
-      <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
-   </component>
-   <component id="controlpanel_source" name="Control Panel Source" filter="s60">
-      <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
-   </component>
-  </collection>
-  <collection id="profilesservices" name="Profiles Services" level="server">
-   <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
-    <unit bldFile="profilesservices/profileengine/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/gstreamer/package_definition.xml
--- a/symbian4/mw/gstreamer/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/gstreamer/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,119 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="gstreamer" level="generic" long-name="GStreamer" levels="plugin core api">
-        <!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
-        <!-- structure matches planned directory layout -->
-        <collection name="gstreamerfw" long-name="GStreamer Framework" level="core">
-          <component name="gstreamer_core" long-name="GStreamer Core" introduced="^3" class="placeholder">
-            <!--<unit bldFile="gstreamer_core/group"/>-->
-          </component>
-        </collection>
-        <collection name="gst_plugins" long-name="GStreamer Plugins" level="plugin">
-          <component name="gst_plugins_base" long-name="GStreamer Base Plugins" introduced="^3" class="placeholder">
-            <!--<unit bldFile="gst_plugins_base/group"/>-->
-          </component>
-          <component name="gst_plugins_good" long-name="GStreamer Good Plugins" introduced="^3" class="placeholder">
-            <!--<unit bldFile="gst_plugins_good/group"/>-->
-          </component>
-          <component name="gst_plugins_symbian" filter="s60" long-name="GStreamer Sybmian Plugins" introduced="^3" class="placeholder">
-            <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
-            <!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
-          </component>
-        </collection>
-        <collection name="gstregistrygenerator" long-name="GStreamer Registry Generator" level="core">
-          <!-- collection is really a component. Move down an directory -->
-          <component name="gstregistrygenerator_build" filter="s60" long-name="GStreamer Registry Generator Build" introduced="^3" class="placeholder">
-            <!-- <unit bldFile="gstregistrygenerator/group"/>-->
-          </component>
-        </collection>
-        <collection name="gst_test_apps" long-name="GStreamer Test Applications" level="api">
-          <component name="gst_player" filter="s60" long-name="GStreamer Player" introduced="^3" purpose="development" class="placeholder">
-            <!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
-          </component>
-        </collection>
-        <collection name="gstreamer_info" long-name="GStreamer Info" level="api">
-          <component name="gstreamer_build" filter="s60" long-name="GStreamer Build" introduced="^3">
-            <!-- make this a ROM component or split up instead? -->
-            <unit bldFile="/sf/mw/gstreamer/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="gstreamer" name="GStreamer" levels="plugin core api">
+      	<meta rel="config">
+      		<defined condition="FF_GSTREAMER"/>
+      	</meta>
+	<!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
+	<!-- structure matches planned directory layout -->
+    <collection id="gstreamerfw" name="GStreamer Framework" level="core">
+      <component id="gstreamer_core" name="GStreamer Core" introduced="^3">
+        <!--<unit bldFile="gstreamer_core/group"/>-->
+      </component>
+    </collection>
+    <collection id="gst_plugins" name="GStreamer Plugins" level="plugin">
+      <component id="gst_plugins_base" name="GStreamer Base Plugins" introduced="^3">
+        <!--<unit bldFile="gst_plugins_base/group"/>-->
+      </component>
+      <component id="gst_plugins_good" name="GStreamer Good Plugins" introduced="^3">
+        <!--<unit bldFile="gst_plugins_good/group"/>-->
+      </component>
+      <component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
+        <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
+        <!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+      </component>
+    </collection>
+    <collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
+    	<!-- collection is really a component. Move down an directory -->
+      <component id="gstregistrygenerator_build" filter="s60" name="GStreamer Registry Generator Build" introduced="^3">
+        <!-- <unit bldFile="gstregistrygenerator/group"/>-->
+      </component>
+    </collection>
+    <collection id="gst_test_apps" name="GStreamer Test Applications" level="api">
+      <component id="gst_player" filter="s60" name="GStreamer Player" introduced="^3" purpose="development">
+        <!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+      </component>
+    </collection>
+    <collection id="gstreamer_info" name="GStreamer Info" level="api">
+      <component id="gstreamer_build" filter="s60" name="GStreamer Build" introduced="^3">
+      	<!-- make this a ROM component or split up instead? -->
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/hapticsservices/package_definition.xml
--- a/symbian4/mw/hapticsservices/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/hapticsservices/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,127 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
-        <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-          <component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
-          </component>
-          <component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
-          </component>
-          <component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
-          </component>
-        </collection>
-        <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-          <component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-          </component>
-        </collection>
-        <collection name="tacticonserver" long-name="Tacticon Server" level="server">
-          <!-- collection is really a component. Move down a directory  -->
-          <component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
-            <unit bldFile="/sf/mw/hapticsservices/tacticonserver/group"/>
-            <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-          </component>
-        </collection>
-        <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-          <component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
-            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-          </component>
-          <component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
-            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
-          </component>
-          <component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
-            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
-          </component>
-          <component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
-            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-          </component>
-          <component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
-            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
-          </component>
-          <component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
-            <!-- consider moving IBY to one fo the above components -->
-            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="hapticsservices" name="Haptics Services" levels="fw server api">
+  <collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+   <component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="hapticsservices_plat/tacticon_api/tacticon_api.metaxml"/>
+    <unit bldFile="hapticsservices_plat/tacticon_api/group"/>
+   </component>
+   <component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="hapticsservices_plat/tactile_feedback_core_api/tactile_feedback_core_api.metaxml"/>
+    <unit bldFile="hapticsservices_plat/tactile_feedback_core_api/group"/>
+   </component>
+   <component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="hapticsservices_plat/tactile_feedback_server_api/tactile_feedback_server_api.metaxml"/>
+    <unit bldFile="hapticsservices_plat/tactile_feedback_server_api/group"/>
+   </component>
+  </collection>
+  <collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+   <component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="hapticsservices_pub/tactile_feedback_client_api/tactile_feedback_client_api.metaxml"/>
+    <unit bldFile="hapticsservices_pub/tactile_feedback_client_api/group"/>
+   </component>
+  </collection>
+  <collection id="tacticonserver" name="Tacticon Server" level="server">
+   <!-- collection is really a component. Move down a directory  -->
+   <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+    <unit bldFile="tacticonserver/group"/>
+    <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+   </component>
+  </collection>
+  <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+   <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+    <unit bldFile="tactilefeedback/tactilearearegistry/group"/>
+   </component>
+   <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+    <unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
+   </component>
+   <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+    <unit bldFile="tactilefeedback/tactileclickplugin/group"/>
+   </component>
+   <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+    <unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
+   </component>
+   <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+    <unit bldFile="tactilefeedback/tactileactionplugin/group"/>
+   </component>
+   <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+    <!-- consider moving IBY to one fo the above components -->
+    <unit bldFile="tactilefeedback/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/hapticsservices/package_definition_3.0.xml
--- a/symbian4/mw/hapticsservices/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="hapticsservices" name="Haptics Services" levels="fw server api">
-  <collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
-   <component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="hapticsservices_plat/tacticon_api/tacticon_api.metaxml"/>
-    <unit bldFile="hapticsservices_plat/tacticon_api/group"/>
-   </component>
-   <component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="hapticsservices_plat/tactile_feedback_core_api/tactile_feedback_core_api.metaxml"/>
-    <unit bldFile="hapticsservices_plat/tactile_feedback_core_api/group"/>
-   </component>
-   <component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="hapticsservices_plat/tactile_feedback_server_api/tactile_feedback_server_api.metaxml"/>
-    <unit bldFile="hapticsservices_plat/tactile_feedback_server_api/group"/>
-   </component>
-  </collection>
-  <collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
-   <component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="hapticsservices_pub/tactile_feedback_client_api/tactile_feedback_client_api.metaxml"/>
-    <unit bldFile="hapticsservices_pub/tactile_feedback_client_api/group"/>
-   </component>
-  </collection>
-  <collection id="tacticonserver" name="Tacticon Server" level="server">
-   <!-- collection is really a component. Move down a directory  -->
-   <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
-    <unit bldFile="tacticonserver/group"/>
-    <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-   </component>
-  </collection>
-  <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
-   <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
-    <unit bldFile="tactilefeedback/tactilearearegistry/group"/>
-   </component>
-   <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
-    <unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
-   </component>
-   <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
-    <unit bldFile="tactilefeedback/tactileclickplugin/group"/>
-   </component>
-   <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
-    <unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
-   </component>
-   <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
-    <unit bldFile="tactilefeedback/tactileactionplugin/group"/>
-   </component>
-   <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
-    <!-- consider moving IBY to one fo the above components -->
-    <unit bldFile="tactilefeedback/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/hb/package_definition.xml
--- a/symbian4/mw/hb/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="hb" level="generic" long-name="Orbit" levels="engine test api">
-        <collection name="hb_info" long-name="Orbit Info" level="api">
-          <component name="hb_build" long-name="Orbit Build" introduced="^4">
-            <!-- should break this down into actual components -->
-            <unit bldFile="/sf/mw/hb/." proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-        </collection>
-        <collection name="hb_test" long-name="Orbit Test" level="test">
-          <component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-          <component name="hb_unit" filter="test,hb_unit_test,unit_test" long-name="HB Unit Tests" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/unit" proFile="unit.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-          <component name="hb_test_resources" filter="test,hb_test_resources" long-name="Orbit Test Resources" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/resources" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" proFile="resources.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+    <package id="hb" name="Orbit" levels="engine test api">
+    <collection id="hb_info" name="Orbit Info" level="api">
+     <component id="hb_build" name="Orbit Build" introduced="^4">
+		<!-- should break this down into actual components -->
+      <unit bldFile="." qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+    </collection>
+    <collection id="hb_test" name="Orbit Test" level="test">
+     <component id="hb_fute" filter="hb_fute_app" name="Fute" introduced="^4">
+      <unit bldFile="tsrc/fute"  qt:proFile="fute.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+     <component id="hb_unit" filter="test,hb_unit_test,unit_test" name="HB Unit Tests" introduced="^4">
+      <unit bldFile="tsrc/unit" qt:proFile="unit.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+     <component id="hb_test_resources" filter="test,hb_test_resources" name="Orbit Test Resources"  introduced="^4">
+      <unit bldFile="tsrc/resources" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="resources.pro"/>
+     </component>
+    </collection>
+   </package>
 </SystemDefinition>
+
+
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/hb/package_definition_3.0.xml
--- a/symbian4/mw/hb/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-    <package id="hb" name="Orbit" levels="engine test api">
-    <collection id="hb_info" name="Orbit Info" level="api">
-     <component id="hb_build" name="Orbit Build" introduced="^4">
-		<!-- should break this down into actual components -->
-      <unit bldFile="." qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-     </component>
-    </collection>
-    <collection id="hb_test" name="Orbit Test" level="test">
-     <component id="hb_fute" filter="hb_fute_app" name="Fute" introduced="^4">
-      <unit bldFile="tsrc/fute"  qt:proFile="fute.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-     </component>
-     <component id="hb_unit" filter="test,hb_unit_test,unit_test" name="HB Unit Tests" introduced="^4">
-      <unit bldFile="tsrc/unit" qt:proFile="unit.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-     </component>
-     <component id="hb_test_resources" filter="test,hb_test_resources" name="Orbit Test Resources"  introduced="^4">
-      <unit bldFile="tsrc/resources" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="resources.pro"/>
-     </component>
-    </collection>
-   </package>
-</SystemDefinition>
-
-
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/helix/package_definition.xml
--- a/symbian4/mw/helix/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/helix/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,89 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
-        <collection name="helix_ren" long-name="Helix Engine" level="framework">
-          <!-- what does "ren" stand for? -->
-          <component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
-            <unit bldFile="/sf/mw/helix/helix_ren/helix_stub/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="helix" name="Helix" levels="plugin framework server generic specific">
+    <collection id="helix_ren" name="Helix Engine" level="framework">
+    	<!-- what does "ren" stand for? -->
+      <component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
+        <unit bldFile="helix_ren/helix_stub/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/helix/package_definition_3.0.xml
--- a/symbian4/mw/helix/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="helix" name="Helix" levels="plugin framework server generic specific">
-    <collection id="helix_ren" name="Helix Engine" level="framework">
-    	<!-- what does "ren" stand for? -->
-      <component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
-        <unit bldFile="helix_ren/helix_stub/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/hgwidgets/package_definition.xml
--- a/symbian4/mw/hgwidgets/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-        <collection name="hgwidgets_plat" long-name="HG Widgets Platform Interfaces" level="api">
-          <component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
-            <!-- should separate out unit -->
-          </component>
-        </collection>
-        <collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
-        <collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
-          <!-- really a component, should move down a dir level and have a unit -->
-          <component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-            <!-- should separate out unit -->
-          </component>
-        </collection>
-        <collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-          <component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-            <unit bldFile="/sf/mw/hgwidgets/." proFile="hgwidgets.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="hgwidgets" name="HG Widgets" levels="framework service api">
+    <collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
+     <component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
+		<!-- should separate out unit -->
+	 </component>
+    </collection>
+    <collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
+    <collection id="ganeswidgets" name="Ganes Widgets" level="service">
+		<!-- really a component, should move down a dir level and have a unit -->
+      <component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
+		<!-- should separate out unit -->
+	 </component>
+    </collection>	 
+    <collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
+     <component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
+      <unit bldFile="." qt:proFile="hgwidgets.pro"/>
+     </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/hgwidgets/package_definition_3.0.xml
--- a/symbian4/mw/hgwidgets/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="hgwidgets" name="HG Widgets" levels="framework service api">
-    <collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
-     <component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
-		<!-- should separate out unit -->
-	 </component>
-    </collection>
-    <collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
-    <collection id="ganeswidgets" name="Ganes Widgets" level="service">
-		<!-- really a component, should move down a dir level and have a unit -->
-      <component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
-		<!-- should separate out unit -->
-	 </component>
-    </collection>	 
-    <collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
-     <component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
-      <unit bldFile="." qt:proFile="hgwidgets.pro"/>
-     </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,163 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
-        <collection name="appfoundation" long-name="App Foundation" level="generic">
-          <component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
-          </component>
-        </collection>
-        <collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
-          <component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
-          </component>
-        </collection>
-        <collection name="contentstorage" long-name="Content Storage" level="framework">
-          <component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/cautils" qmakeArgs="-r" proFile="cautils.pro"/>
-          </component>
-          <component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/group" qmakeArgs="-r" proFile="group.pro"/>
-          </component>
-          <component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qmakeArgs="-r" proFile="calocalizerscanner.pro"/>
-          </component>
-          <component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/cahandler" qmakeArgs="-r" proFile="cahandler.pro"/>
-          </component>
-          <component name="caclient" long-name="Content Arsenal Client" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
-          </component>
-        </collection>
-        <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-          <component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
-            <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-            <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-          </component>
-          <component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
-            <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-          </component>
-          <component name="contentpublishingserver" filter="s60" long-name="Content Publishing Server">
-            <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-          </component>
-          <component name="contentharvester" filter="s60" long-name="Content Harvester">
-            <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-          </component>
-          <component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-            <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
+
+  <collection id="appfoundation" name="App Foundation" level="generic">
+     <component id="appfoundation_build" name="App Foundation Build"  introduced="^4">
+      <unit bldFile="appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+     </component>
+  </collection>
+  <collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
+     <component id="hswidgetmodel_build" name="Home Screen Widget Model Build"  introduced="^4">
+      <unit bldFile="hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+     </component>
+  </collection>
+  <collection id="contentstorage" name="Content Storage" level="framework">
+     <component id="cautils" name="Content Arsenal Utils"  introduced="^4">
+      <unit bldFile="contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+     </component>
+     <component id="contentstorage_build" name="Content Storage Build"  introduced="^4">
+      <unit bldFile="contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+     </component>
+     <component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner"  introduced="^4">
+      <unit bldFile="contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+     </component>
+     <component id="cahandler" name="Content Arsenal Handler"  introduced="^4">
+      <unit bldFile="contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+     </component>
+     <component id="caclient" name="Content Arsenal Client"  introduced="^4">
+      <unit bldFile="contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+     </component>
+  </collection>
+
+  <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
+   <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
+    <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
+    <meta rel="config">
+     <defined condition="CONTENT_PUBLISHER_DEBUG"/>
+    </meta>
+    <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
+   </component>
+   <component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
+    <unit bldFile="contentpublishingsrv/contentpublishingutils/group"/>
+   </component>
+   <component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
+    <unit bldFile="contentpublishingsrv/contentpublishingserver/group"/>
+   </component>
+   <component id="contentharvester" filter="s60" name="Content Harvester">
+    <unit bldFile="contentpublishingsrv/contentharvester/group"/>
+   </component>
+   <component id="contentpublishingsrv_rom" filter="s60" name="Content Publishing Service ROM">
+    <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
-            <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
-          </component>
-        </collection>
-        <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-          <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api"/>
-          <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api"/>
-          <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
-          <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api"/>
-          <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api"/>
-        </collection>
-        <collection name="screensavermodel" long-name="Screensaver Model" level="specific">
-          <component name="screensavermodel_build" long-name="Screensaver Model Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/screensavermodel" qmakeArgs="-r" proFile="screensavermodel.pro"/>
-          </component>
-        </collection>
-        <collection name="hsactivityfw" long-name="Activity Framework" level="activityfw">
-          <component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
-          </component>
-        </collection>
-        <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
-          <component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
-          </component>
-        </collection>
-        <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
-          <component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
-            <unit bldFile="/sf/mw/homescreensrv/." qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
-          </component>
-          <component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/group"/>
-          </component>
-          <component name="homescreensrv_test" long-name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/tsrc" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" proFile="tsrc.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="contentpublishingsrv/group"/>
+   </component>
+  </collection>
+
+  <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+     <component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build"  introduced="^4">
+      <unit bldFile="homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
+     </component>
+   <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
+    <unit base="homescreensrv_plat/action_handler_plugin_api"/>
+   </component>
+   <component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
+    <unit base="homescreensrv_plat/content_harvester_plugin_api"/>
+   </component>
+   <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
+    <unit base="homescreensrv_plat/sapi_contentpublishing"/>
+   </component>
+   <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
+    <unit base="homescreensrv_plat/sapi_actionhandler"/>
+   </component>
+   <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
+    <unit base="homescreensrv_plat/menu_sat_interface_api"/>
+   </component>
+   <component id="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/appruntimemodel_api"/>
+   </component>
+   <component id="contentstorage_api" name="Content Storage API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/contentstorage_api"/>
+   </component>
+   <component id="hswidgetmodel_api" name="HS Widget Model API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/hswidgetmodel_api"/>
+   </component>
+   <component id="statemodel_api" name="State Model API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/statemodel_api"/>
+   </component>
+   <component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
+    <unit base="homescreensrv_plat/homescreen_information_api"/>
+   </component>
+  </collection>
+  <collection id="screensavermodel" name="Screensaver Model" level="specific">
+     <component id="screensavermodel_build" name="Screensaver Model Build"  introduced="^4">
+      <unit bldFile="screensavermodel" qt:qmakeArgs="-r" qt:proFile="screensavermodel.pro"/>
+     </component>
+  </collection>
+  <collection id="hsactivityfw" name="Activity Framework" level="activityfw">
+     <component id="hsactivityfw_build" name="Activity Framework Build"  introduced="^4">
+      <unit bldFile="activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+     </component>
+  </collection>
+  <collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
+     <component id="hsappkeyhandler_build" name="Appplication Key Handler Build"  introduced="^4">
+      <unit bldFile="hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+     </component>
+  </collection>
+    <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
+     <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
+      <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
+     </component>
+     <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
+      <unit bldFile="group"/>
+     </component>
+     <component id="homescreensrv_test" name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
+      <unit bldFile="tsrc" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="tsrc.pro"/>
+     </component>
+    </collection>
+ </package>
 </SystemDefinition>
+
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/homescreensrv/package_definition_3.0.xml
--- a/symbian4/mw/homescreensrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
-
-  <collection id="appfoundation" name="App Foundation" level="generic">
-     <component id="appfoundation_build" name="App Foundation Build"  introduced="^4">
-      <unit bldFile="appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
-     </component>
-  </collection>
-  <collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
-     <component id="hswidgetmodel_build" name="Home Screen Widget Model Build"  introduced="^4">
-      <unit bldFile="hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
-     </component>
-  </collection>
-  <collection id="contentstorage" name="Content Storage" level="framework">
-     <component id="cautils" name="Content Arsenal Utils"  introduced="^4">
-      <unit bldFile="contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
-     </component>
-     <component id="contentstorage_build" name="Content Storage Build"  introduced="^4">
-      <unit bldFile="contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
-     </component>
-     <component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner"  introduced="^4">
-      <unit bldFile="contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
-     </component>
-     <component id="cahandler" name="Content Arsenal Handler"  introduced="^4">
-      <unit bldFile="contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
-     </component>
-     <component id="caclient" name="Content Arsenal Client"  introduced="^4">
-      <unit bldFile="contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
-     </component>
-  </collection>
-
-  <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
-   <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
-    <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-    <meta rel="config">
-     <defined condition="CONTENT_PUBLISHER_DEBUG"/>
-    </meta>
-    <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-   </component>
-   <component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
-    <unit bldFile="contentpublishingsrv/contentpublishingutils/group"/>
-   </component>
-   <component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
-    <unit bldFile="contentpublishingsrv/contentpublishingserver/group"/>
-   </component>
-   <component id="contentharvester" filter="s60" name="Content Harvester">
-    <unit bldFile="contentpublishingsrv/contentharvester/group"/>
-   </component>
-   <component id="contentpublishingsrv_rom" filter="s60" name="Content Publishing Service ROM">
-    <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
-      		If keeping, it need to move down a directory.-->
-    <unit bldFile="contentpublishingsrv/group"/>
-   </component>
-  </collection>
-
-  <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
-     <component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build"  introduced="^4">
-      <unit bldFile="homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
-     </component>
-   <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
-    <unit base="homescreensrv_plat/action_handler_plugin_api"/>
-   </component>
-   <component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
-    <unit base="homescreensrv_plat/content_harvester_plugin_api"/>
-   </component>
-   <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
-    <unit base="homescreensrv_plat/sapi_contentpublishing"/>
-   </component>
-   <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
-    <unit base="homescreensrv_plat/sapi_actionhandler"/>
-   </component>
-   <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
-    <unit base="homescreensrv_plat/menu_sat_interface_api"/>
-   </component>
-   <component id="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/appruntimemodel_api"/>
-   </component>
-   <component id="contentstorage_api" name="Content Storage API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/contentstorage_api"/>
-   </component>
-   <component id="hswidgetmodel_api" name="HS Widget Model API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/hswidgetmodel_api"/>
-   </component>
-   <component id="statemodel_api" name="State Model API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/statemodel_api"/>
-   </component>
-   <component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/homescreen_information_api"/>
-   </component>
-  </collection>
-  <collection id="screensavermodel" name="Screensaver Model" level="specific">
-     <component id="screensavermodel_build" name="Screensaver Model Build"  introduced="^4">
-      <unit bldFile="screensavermodel" qt:qmakeArgs="-r" qt:proFile="screensavermodel.pro"/>
-     </component>
-  </collection>
-  <collection id="hsactivityfw" name="Activity Framework" level="activityfw">
-     <component id="hsactivityfw_build" name="Activity Framework Build"  introduced="^4">
-      <unit bldFile="activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
-     </component>
-  </collection>
-  <collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
-     <component id="hsappkeyhandler_build" name="Appplication Key Handler Build"  introduced="^4">
-      <unit bldFile="hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
-     </component>
-  </collection>
-    <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
-     <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
-      <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
-     </component>
-     <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
-      <unit bldFile="group"/>
-     </component>
-     <component id="homescreensrv_test" name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
-      <unit bldFile="tsrc" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="tsrc.pro"/>
-     </component>
-    </collection>
- </package>
-</SystemDefinition>
-
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/homescreensrvlegacy/package_definition.xml
--- a/symbian4/mw/homescreensrvlegacy/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/homescreensrvlegacy/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,91 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-        <collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
-          <component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
-          </component>
-          <component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="homescreensrvlegacy" name="Legacy Home Screen Services" levels="plugin framework server generic specific">
+  <collection id="homescreensrvlegacy_plat" name="Legacy Home Screen Services Platform Interfaces" level="specific">
+   <component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
+    <meta rel="Api" href="ai_content_model_api/ai_content_model_api.metaxml"/>
+    <unit bldFile="ai_content_model_api/group" qt:proFile="group.pro"/>
+   </component>
+   <component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
+    <meta rel="Api" href="ai_plugin_information_api/ai_plugin_information_api.metaxml"/>
+    <unit bldFile="ai_plugin_information_api/group" qt:proFile="group.pro"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/homescreensrvlegacy/package_definition_3.0.xml
--- a/symbian4/mw/homescreensrvlegacy/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="homescreensrvlegacy" name="Legacy Home Screen Services" levels="plugin framework server generic specific">
-  <collection id="homescreensrvlegacy_plat" name="Legacy Home Screen Services Platform Interfaces" level="specific">
-   <component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
-    <meta rel="Api" href="ai_content_model_api/ai_content_model_api.metaxml"/>
-    <unit bldFile="ai_content_model_api/group" qt:proFile="group.pro"/>
-   </component>
-   <component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
-    <meta rel="Api" href="ai_plugin_information_api/ai_plugin_information_api.metaxml"/>
-    <unit bldFile="ai_plugin_information_api/group" qt:proFile="group.pro"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/imghandling/package_definition.xml
--- a/symbian4/mw/imghandling/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,113 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
-        <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-          <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-          </component>
-          <component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
-          </component>
-          <component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
-          <!-- collection is really a component, need to move down a directory -->
-          <component name="ihl" filter="s60" long-name="IHL">
-            <unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
-          </component>
-          <component name="imagehandlinglib_api" filter="s60,test,api_test" long-name="Image Handling Library API Test" purpose="development">
-            <unit bldFile="/sf/mw/imghandling/imagehandlinglib/tsrc/public/basic/group"/>
-          </component>
-        </collection>
-        <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-          <component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-          </component>
-          <component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
-            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" filter="test,unit_test" proFile="test_qtnmwrapper.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="imghandling" name="Image Handling" levels="lib util if">
+  <collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+   <component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/image_handling_library_api/image_handling_library_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/image_handling_library_api/group"/>
+   </component>
+   <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/3gp_library_api/3gp_library_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/3gp_library_api/group"/>
+   </component>
+   <component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/thumbnailmanager_api/thumbnailmanager_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+    <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+   <!-- collection is really a component, need to move down a directory -->
+   <component id="ihl" filter="s60" name="IHL">
+    <unit bldFile="imagehandlinglib/group"/>
+   </component>
+   <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
+    <unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+   <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
+   </component>
+   <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" qt:proFile="test_qtnmwrapper.pro" filter="test,unit_test"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/imghandling/package_definition_3.0.xml
--- a/symbian4/mw/imghandling/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="imghandling" name="Image Handling" levels="lib util if">
-  <collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
-   <component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
-    <meta rel="Api" href="imagehandling_plat/image_handling_library_api/image_handling_library_api.metaxml"/>
-    <unit bldFile="imagehandling_plat/image_handling_library_api/group"/>
-   </component>
-   <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
-    <meta rel="Api" href="imagehandling_plat/3gp_library_api/3gp_library_api.metaxml"/>
-    <unit bldFile="imagehandling_plat/3gp_library_api/group"/>
-   </component>
-   <component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
-    <meta rel="Api" href="imagehandling_plat/thumbnailmanager_api/thumbnailmanager_api.metaxml"/>
-    <unit bldFile="imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
-    <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
-   </component>
-  </collection>
-  <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
-   <!-- collection is really a component, need to move down a directory -->
-   <component id="ihl" filter="s60" name="IHL">
-    <unit bldFile="imagehandlinglib/group"/>
-   </component>
-   <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
-    <unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
-   </component>
-  </collection>
-  <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
-   <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
-    <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
-   </component>
-   <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
-    <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
-    <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" qt:proFile="test_qtnmwrapper.pro" filter="test,unit_test"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/imsrv/package_definition.xml
--- a/symbian4/mw/imsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/imsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,192 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-        <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-          <component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-          </component>
-          <component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-          </component>
-          <component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-          </component>
-          <component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-          </component>
-          <component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-          </component>
-          <component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-          </component>
-          <component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-          </component>
-          <component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-          </component>
-          <component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-          </component>
-          <component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-          </component>
-          <component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-          </component>
-          <component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-          </component>
-          <component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-          </component>
-          <component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-          </component>
-          <component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-          </component>
-          <component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-          </component>
-          <component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-          </component>
-          <component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-          </component>
-          <component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-          </component>
-          <component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-          </component>
-          <component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-          </component>
-          <component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-          </component>
-          <component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-          </component>
-          <component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-          </component>
-          <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
-          </component>
-          <component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
-            <unit bldFile="/sf/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-          </component>
-        </collection>
-        <collection name="ximpfw" long-name="XIMP Framework" level="framework">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
-            <unit bldFile="/sf/mw/imsrv/ximpfw/group"/>
-          </component>
-        </collection>
-        <collection name="imservices" long-name="IM Services" level="generic">
-          <component name="imfeatureplugin" filter="s60" long-name="IM Feature Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/group"/>
-          </component>
-          <component name="searchfeatureplugin" filter="s60" long-name="Search Feature Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/group"/>
-          </component>
-          <component name="xmppsettingsapi" filter="s60" long-name="XMPP Settings API" introduced="^2">
-            <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/group"/>
-          </component>
-          <component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
-            <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-          </component>
-          <component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
-            <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
-          </component>
-        </collection>
-        <collection name="brandingserver" long-name="Branding Server" level="specific">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <component name="brandingserver_build" filter="s60" long-name="Branding Server Build">
-            <unit bldFile="/sf/mw/imsrv/brandingserver/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="imsrv" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+  <collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+   <component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_core_data_model_api/ximp_core_data_model_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_core_data_model_api/group"/>
+   </component>
+   <component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_presence_protocol_plugin_host_api/ximp_presence_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+   </component>
+   <component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_presence_data_model_api/ximp_presence_data_model_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_presence_data_model_api/group"/>
+   </component>
+   <component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_presence_protocol_plugin_api/ximp_presence_protocol_plugin_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+   </component>
+   <component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_presence_management_api/ximp_presence_management_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_presence_management_api/group"/>
+   </component>
+   <component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_core_protocol_plugin_host_api/ximp_core_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+   </component>
+   <component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_core_management_api/ximp_core_management_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_core_management_api/group"/>
+   </component>
+   <component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_presence_base_api/ximp_presence_base_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_presence_base_api/group"/>
+   </component>
+   <component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_core_protocol_plugin_api/ximp_core_protocol_plugin_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+   </component>
+   <component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_core_base_api/ximp_core_base_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_core_base_api/group"/>
+   </component>
+   <component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_presence_cache_api/ximp_presence_cache_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_presence_cache_api/group"/>
+   </component>
+   <component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_core_feature_plugin_api/ximp_core_feature_plugin_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/group"/>
+   </component>
+   <component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_im_protocol_plugin_host_api/ximp_im_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+   </component>
+   <component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_im_data_model_api/ximp_im_data_model_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_im_data_model_api/group"/>
+   </component>
+   <component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_im_protocol_plugin_api/ximp_im_protocol_plugin_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+   </component>
+   <component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_im_management_api/ximp_im_management_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_im_management_api/group"/>
+   </component>
+   <component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_im_base_api/ximp_im_base_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_im_base_api/group"/>
+   </component>
+   <component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_search_protocol_plugin_host_api/ximp_search_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+   </component>
+   <component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_search_data_model_api/ximp_search_data_model_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_search_data_model_api/group"/>
+   </component>
+   <component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_search_protocol_plugin_api/ximp_search_protocol_plugin_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+   </component>
+   <component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_search_management_api/ximp_search_management_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_search_management_api/group"/>
+   </component>
+   <component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/ximp_search_base_api/ximp_search_base_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_search_base_api/group"/>
+   </component>
+   <component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/xmpp_settings_api/xmpp_settings_api.metaxml"/>
+    <unit bldFile="imsrv_plat/xmpp_settings_api/group"/>
+   </component>
+   <component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/im_cache_client_api/im_cache_client_api.metaxml"/>
+    <unit bldFile="imsrv_plat/im_cache_client_api/group"/>
+   </component>
+   <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/im_cache_server_api/im_cache_server_api.metaxml"/>
+    <unit bldFile="imsrv_plat/im_cache_server_api/group"/>
+   </component>
+   <component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+    <unit bldFile="imsrv_plat/presence_avabilitytext/group"/>
+   </component>
+  </collection>
+  <collection id="ximpfw" name="XIMP Framework" level="framework">
+   <!-- collection is really a component. Needs to be moved down a directory -->
+   <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+    <unit bldFile="ximpfw/group"/>
+   </component>
+  </collection>
+  <collection id="imservices" name="IM Services" level="generic">
+   <component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
+    <unit bldFile="imservices/imfeatureplugin/group"/>
+   </component>
+   <component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
+    <unit bldFile="imservices/searchfeatureplugin/group"/>
+   </component>
+   <component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
+    <unit bldFile="imservices/xmppsettingsapi/group"/>
+   </component>
+   <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
+    <unit bldFile="imservices/xmppsettingsfetcher/group"/>
+   </component>
+   <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
+    <unit bldFile="imservices/instantmessagingcache/group"/>
+   </component>
+  </collection>
+  <collection id="brandingserver" name="Branding Server" level="specific">
+   <!-- collection is really a component. Needs to be moved down a directory -->
+   <component id="brandingserver_build" filter="s60" name="Branding Server Build">
+    <unit bldFile="brandingserver/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/imsrv/package_definition_3.0.xml
--- a/symbian4/mw/imsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="imsrv" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-  <collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-   <component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_core_data_model_api/ximp_core_data_model_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_core_data_model_api/group"/>
-   </component>
-   <component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_presence_protocol_plugin_host_api/ximp_presence_protocol_plugin_host_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-   </component>
-   <component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_presence_data_model_api/ximp_presence_data_model_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_presence_data_model_api/group"/>
-   </component>
-   <component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_presence_protocol_plugin_api/ximp_presence_protocol_plugin_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-   </component>
-   <component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_presence_management_api/ximp_presence_management_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_presence_management_api/group"/>
-   </component>
-   <component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_core_protocol_plugin_host_api/ximp_core_protocol_plugin_host_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-   </component>
-   <component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_core_management_api/ximp_core_management_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_core_management_api/group"/>
-   </component>
-   <component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_presence_base_api/ximp_presence_base_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_presence_base_api/group"/>
-   </component>
-   <component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_core_protocol_plugin_api/ximp_core_protocol_plugin_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-   </component>
-   <component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_core_base_api/ximp_core_base_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_core_base_api/group"/>
-   </component>
-   <component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_presence_cache_api/ximp_presence_cache_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_presence_cache_api/group"/>
-   </component>
-   <component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_core_feature_plugin_api/ximp_core_feature_plugin_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/group"/>
-   </component>
-   <component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_im_protocol_plugin_host_api/ximp_im_protocol_plugin_host_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-   </component>
-   <component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_im_data_model_api/ximp_im_data_model_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_im_data_model_api/group"/>
-   </component>
-   <component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_im_protocol_plugin_api/ximp_im_protocol_plugin_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-   </component>
-   <component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_im_management_api/ximp_im_management_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_im_management_api/group"/>
-   </component>
-   <component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_im_base_api/ximp_im_base_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_im_base_api/group"/>
-   </component>
-   <component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_search_protocol_plugin_host_api/ximp_search_protocol_plugin_host_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-   </component>
-   <component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_search_data_model_api/ximp_search_data_model_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_search_data_model_api/group"/>
-   </component>
-   <component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_search_protocol_plugin_api/ximp_search_protocol_plugin_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-   </component>
-   <component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_search_management_api/ximp_search_management_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_search_management_api/group"/>
-   </component>
-   <component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/ximp_search_base_api/ximp_search_base_api.metaxml"/>
-    <unit bldFile="imsrv_plat/ximp_search_base_api/group"/>
-   </component>
-   <component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/xmpp_settings_api/xmpp_settings_api.metaxml"/>
-    <unit bldFile="imsrv_plat/xmpp_settings_api/group"/>
-   </component>
-   <component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/im_cache_client_api/im_cache_client_api.metaxml"/>
-    <unit bldFile="imsrv_plat/im_cache_client_api/group"/>
-   </component>
-   <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
-    <meta rel="Api" href="imsrv_plat/im_cache_server_api/im_cache_server_api.metaxml"/>
-    <unit bldFile="imsrv_plat/im_cache_server_api/group"/>
-   </component>
-   <component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
-    <unit bldFile="imsrv_plat/presence_avabilitytext/group"/>
-   </component>
-  </collection>
-  <collection id="ximpfw" name="XIMP Framework" level="framework">
-   <!-- collection is really a component. Needs to be moved down a directory -->
-   <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
-    <unit bldFile="ximpfw/group"/>
-   </component>
-  </collection>
-  <collection id="imservices" name="IM Services" level="generic">
-   <component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
-    <unit bldFile="imservices/imfeatureplugin/group"/>
-   </component>
-   <component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
-    <unit bldFile="imservices/searchfeatureplugin/group"/>
-   </component>
-   <component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
-    <unit bldFile="imservices/xmppsettingsapi/group"/>
-   </component>
-   <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
-    <unit bldFile="imservices/xmppsettingsfetcher/group"/>
-   </component>
-   <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
-    <unit bldFile="imservices/instantmessagingcache/group"/>
-   </component>
-  </collection>
-  <collection id="brandingserver" name="Branding Server" level="specific">
-   <!-- collection is really a component. Needs to be moved down a directory -->
-   <component id="brandingserver_build" filter="s60" name="Branding Server Build">
-    <unit bldFile="brandingserver/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/inputmethods/package_definition.xml
--- a/symbian4/mw/inputmethods/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,164 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
-        <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-          <component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-          </component>
-          <component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-          </component>
-          <component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-          </component>
-        </collection>
-        <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
-          <component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
-          </component>
-          <component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
-          </component>
-          <component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-          </component>
-          <component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-          </component>
-          <component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-          </component>
-          <component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-          </component>
-          <component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-          </component>
-          <component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-          </component>
-          <component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
-          </component>
-        </collection>
-        <collection name="textinput" long-name="Text Input" level="framework">
-          <component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-            <!--uncomment when configuration is turned on and textinput_build is removed-->
-            <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
-          </component>
-          <component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
-            <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
-          </component>
-          <component name="peninputarc" filter="s60" long-name="Pen Input Arc">
-            <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
-          </component>
-          <component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-            <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrls/group"/>
-          </component>
-          <component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-            <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonlayout/group"/>
-          </component>
-          <component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrtrui/group"/>
-          </component>
-          <component name="textinput_build" filter="s60" long-name="Text Input Build">
-            <!--needed for #ifdef, can be removed when configuration is implemented -->
-            <unit bldFile="/sf/mw/inputmethods/textinput/group"/>
-          </component>
-        </collection>
-        <collection name="fep" long-name="FEP" level="engine">
-          <component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-            <unit bldFile="/sf/mw/inputmethods/fep/aknfep/group"/>
-          </component>
-          <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-            <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-          </component>
-        </collection>
-        <collection name="inputmethods_info" long-name="Input Methods Info" level="api">
-          <component name="inputmethods_api_tests" filter="s60,test,api_test" long-name="Input Methods API Tests" introduced="^2" purpose="development">
-            <unit bldFile="/sf/mw/inputmethods/tsrc/group"/>
-          </component>
-          <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="inputmethods" name="Input Methods" levels="plugin engine framework api">
+  <collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
+   <component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_pub/ptiengine_iti_api/ptiengine_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <unit bldFile="inputmethods_pub/ptiengine_iti_api/group"/>
+   </component>
+   <component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_pub/optical_character_recognition_api/optical_character_recognition_api.metaxml"/>
+    <unit bldFile="inputmethods_pub/optical_character_recognition_api/group"/>
+   </component>
+   <component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_pub/input_language_info_api/input_language_info_api.metaxml"/>
+    <unit bldFile="inputmethods_pub/input_language_info_api/group"/>
+   </component>
+  </collection>
+  <collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
+   <component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/pen_input_server_api/pen_input_server_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/pen_input_server_api/group"/>
+   </component>
+   <component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/ptiengine_hwr_api/ptiengine_hwr_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/ptiengine_hwr_api/group"/>
+   </component>
+   <component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/aknfep_settings_api/aknfep_settings_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/aknfep_settings_api/group"/>
+   </component>
+   <component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/aknfep_status_api/aknfep_status_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <unit bldFile="inputmethods_plat/aknfep_status_api/group"/>
+   </component>
+   <component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/ptiengine_key_definations_api/ptiengine_key_definations_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <unit bldFile="inputmethods_plat/ptiengine_key_definations_api/group"/>
+   </component>
+   <component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/aknfep_definitions_api/aknfep_definitions_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/aknfep_definitions_api/group"/>
+   </component>
+   <component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/aknfep_pen_support_api/aknfep_pen_support_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/aknfep_pen_support_api/group"/>
+   </component>
+   <component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/ptiengine_indic_definitions_api/ptiengine_indic_definitions_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+   </component>
+   <component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/aknfep_uiinterface_api/aknfep_uiinterface_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/group"/>
+   </component>
+  </collection>
+  <collection id="textinput" name="Text Input" level="framework">
+   <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <!--uncomment when configuration is turned on and textinput_build is removed-->
+    <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+   </component>
+   <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
+    <unit bldFile="textinput/akninputlanguage/group"/>
+   </component>
+   <component id="peninputarc" filter="s60" name="Pen Input Arc">
+    <unit bldFile="textinput/peninputarc/group"/>
+   </component>
+   <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+    <unit bldFile="textinput/peninputcommonctrls/group"/>
+   </component>
+   <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+    <unit bldFile="textinput/peninputcommonlayout/group"/>
+   </component>
+   <component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputhwrtrui/group"/>
+   </component>
+   <component id="textinput_build" filter="s60" name="Text Input Build">
+    <!--needed for #ifdef, can be removed when configuration is implemented -->
+    <unit bldFile="textinput/group"/>
+   </component>
+  </collection>
+  <collection id="fep" name="FEP" level="engine">
+   <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
+    <unit bldFile="fep/aknfep/group"/>
+   </component>
+   <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
+    <unit bldFile="fep/frontendprocessor/group" mrp="fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+   </component>
+  </collection>
+  <collection id="inputmethods_info" name="Input Methods Info" level="api">
+   <component id="inputmethods_api_tests" filter="s60,test,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/inputmethods/package_definition_3.0.xml
--- a/symbian4/mw/inputmethods/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="inputmethods" name="Input Methods" levels="plugin engine framework api">
-  <collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
-   <component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_pub/ptiengine_iti_api/ptiengine_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-    </meta>
-    <unit bldFile="inputmethods_pub/ptiengine_iti_api/group"/>
-   </component>
-   <component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_pub/optical_character_recognition_api/optical_character_recognition_api.metaxml"/>
-    <unit bldFile="inputmethods_pub/optical_character_recognition_api/group"/>
-   </component>
-   <component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_pub/input_language_info_api/input_language_info_api.metaxml"/>
-    <unit bldFile="inputmethods_pub/input_language_info_api/group"/>
-   </component>
-  </collection>
-  <collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
-   <component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/pen_input_server_api/pen_input_server_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/pen_input_server_api/group"/>
-   </component>
-   <component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/ptiengine_hwr_api/ptiengine_hwr_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/ptiengine_hwr_api/group"/>
-   </component>
-   <component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/aknfep_settings_api/aknfep_settings_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/aknfep_settings_api/group"/>
-   </component>
-   <component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/aknfep_status_api/aknfep_status_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-    </meta>
-    <unit bldFile="inputmethods_plat/aknfep_status_api/group"/>
-   </component>
-   <component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/ptiengine_key_definations_api/ptiengine_key_definations_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-    </meta>
-    <unit bldFile="inputmethods_plat/ptiengine_key_definations_api/group"/>
-   </component>
-   <component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/aknfep_definitions_api/aknfep_definitions_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/aknfep_definitions_api/group"/>
-   </component>
-   <component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/aknfep_pen_support_api/aknfep_pen_support_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/aknfep_pen_support_api/group"/>
-   </component>
-   <component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/ptiengine_indic_definitions_api/ptiengine_indic_definitions_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-   </component>
-   <component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/aknfep_uiinterface_api/aknfep_uiinterface_api.metaxml"/>
-    <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/group"/>
-   </component>
-  </collection>
-  <collection id="textinput" name="Text Input" level="framework">
-   <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
-    <meta rel="config">
-     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-    </meta>
-    <!--uncomment when configuration is turned on and textinput_build is removed-->
-    <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
-   </component>
-   <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
-    <unit bldFile="textinput/akninputlanguage/group"/>
-   </component>
-   <component id="peninputarc" filter="s60" name="Pen Input Arc">
-    <unit bldFile="textinput/peninputarc/group"/>
-   </component>
-   <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
-    <unit bldFile="textinput/peninputcommonctrls/group"/>
-   </component>
-   <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
-    <unit bldFile="textinput/peninputcommonlayout/group"/>
-   </component>
-   <component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
-    <unit bldFile="textinput/peninputhwrtrui/group"/>
-   </component>
-   <component id="textinput_build" filter="s60" name="Text Input Build">
-    <!--needed for #ifdef, can be removed when configuration is implemented -->
-    <unit bldFile="textinput/group"/>
-   </component>
-  </collection>
-  <collection id="fep" name="FEP" level="engine">
-   <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
-    <unit bldFile="fep/aknfep/group"/>
-   </component>
-   <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
-    <unit bldFile="fep/frontendprocessor/group" mrp="fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-   </component>
-  </collection>
-  <collection id="inputmethods_info" name="Input Methods Info" level="api">
-   <component id="inputmethods_api_tests" filter="s60,test,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
-    <unit bldFile="tsrc/group"/>
-   </component>
-   <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/ipappprotocols/package_definition.xml
--- a/symbian4/mw/ipappprotocols/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,135 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-        <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
-          <component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-          </component>
-          <component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-          </component>
-        </collection>
-        <collection name="rtp" long-name="RTP" level="server">
-          <component name="srtpstack" filter="s60" long-name="SRTP Stack">
-            <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/group"/>
-          </component>
-          <component name="rtpstack" filter="s60" long-name="RTP Stack">
-            <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/group"/>
-          </component>
-        </collection>
-        <collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
-          <component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-            <!-- Real Time Data Protocol -->
-            <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-          </component>
-          <component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-          </component>
-        </collection>
-        <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-          <component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-          </component>
-          <component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-            <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-          </component>
-          <component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
-            <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-          </component>
-          <component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
-            <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-          </component>
-          <component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-          </component>
-        </collection>
-        <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-          <component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-          </component>
-        </collection>
-        <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-          <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="ipappprotocols" name="IP App Protocols" levels="plugin conn server if">
+  <collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
+   <component id="srtp_api" name="SRTP API" class="api" filter="s60">
+    <meta rel="Api" href="ipappprotocols_plat/srtp_api/srtp_api.metaxml"/>
+    <unit bldFile="ipappprotocols_plat/srtp_api/group"/>
+   </component>
+   <component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+    <meta rel="Api" href="ipappprotocols_plat/rtprtcp_api/rtprtcp_api.metaxml"/>
+    <unit bldFile="ipappprotocols_plat/rtprtcp_api/group"/>
+   </component>
+  </collection>
+    <collection id="rtp" name="RTP" level="server">
+      <component id="srtpstack" filter="s60" name="SRTP Stack">
+        <unit bldFile="rtp/srtpstack/group"/>
+      </component>
+      <component id="rtpstack" filter="s60" name="RTP Stack">
+        <unit bldFile="rtp/rtpstack/group"/>
+      </component>
+    </collection>
+    <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+      <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+        <!-- Real Time Data Protocol -->
+        <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+      </component>
+      <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+        <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+      </component>
+    </collection>
+    <collection id="sipplugins" name="SIP Plugins" level="plugin">
+      <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+        <unit bldFile="sipplugins/sippwlanplugin/group"/>
+      </component>
+      <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+        <unit bldFile="sipplugins/sippsipsettingsui/group"/>
+      </component>
+      <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+        <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
+      </component>
+      <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+        <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
+      </component>
+      <component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+        <unit bldFile="sipplugins/sippsipadapter/group"/>
+      </component>
+    </collection>
+    <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+      <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+      </component>
+    </collection>
+    <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+      <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/ipappprotocols/package_definition_3.0.xml
--- a/symbian4/mw/ipappprotocols/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="ipappprotocols" name="IP App Protocols" levels="plugin conn server if">
-  <collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
-   <component id="srtp_api" name="SRTP API" class="api" filter="s60">
-    <meta rel="Api" href="ipappprotocols_plat/srtp_api/srtp_api.metaxml"/>
-    <unit bldFile="ipappprotocols_plat/srtp_api/group"/>
-   </component>
-   <component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
-    <meta rel="Api" href="ipappprotocols_plat/rtprtcp_api/rtprtcp_api.metaxml"/>
-    <unit bldFile="ipappprotocols_plat/rtprtcp_api/group"/>
-   </component>
-  </collection>
-    <collection id="rtp" name="RTP" level="server">
-      <component id="srtpstack" filter="s60" name="SRTP Stack">
-        <unit bldFile="rtp/srtpstack/group"/>
-      </component>
-      <component id="rtpstack" filter="s60" name="RTP Stack">
-        <unit bldFile="rtp/rtpstack/group"/>
-      </component>
-    </collection>
-    <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
-      <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
-        <!-- Real Time Data Protocol -->
-        <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-      </component>
-      <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
-        <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
-      </component>
-    </collection>
-    <collection id="sipplugins" name="SIP Plugins" level="plugin">
-      <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
-        <unit bldFile="sipplugins/sippwlanplugin/group"/>
-      </component>
-      <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
-        <unit bldFile="sipplugins/sippsipsettingsui/group"/>
-      </component>
-      <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
-        <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
-      </component>
-      <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
-        <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
-      </component>
-      <component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
-        <unit bldFile="sipplugins/sippsipadapter/group"/>
-      </component>
-    </collection>
-    <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
-      <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-      </component>
-    </collection>
-    <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
-      <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/ipappsrv/package_definition.xml
--- a/symbian4/mw/ipappsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/ipappsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,144 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
-        <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-          <component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-          </component>
-          <component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-          </component>
-          <component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-          </component>
-          <component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-          </component>
-          <component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-          </component>
-          <component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-          </component>
-        </collection>
-        <collection name="natfw" long-name="NAT Framework" level="framework">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
-            <unit bldFile="/sf/mw/ipappsrv/natfw/group"/>
-          </component>
-        </collection>
-        <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="multimediacommscontroller_build" filter="s60" long-name="Multimedia Comms Controller Build">
-            <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/group"/>
-          </component>
-        </collection>
-        <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="multimediacommsengine_build" filter="s60" long-name="Multimedia Comms Engine Build">
-            <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/group"/>
-          </component>
-        </collection>
-        <collection name="natplugins" long-name="NAT Plugins" level="plugin">
-          <component name="natpcliprovisioningnatfwadapter" filter="s60" long-name="Client Provisioning NAT Framework Traversal Adapter" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-          </component>
-          <component name="natpdevmgmtnatfwadapter" filter="s60" long-name="Device Management NAT Framework Traversal Adapter" plugin="Y">
-            <unit bldFile="/sf/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-          </component>
-          <component name="natptraversalcontroller" filter="s60" long-name="NAT Traversal Controller" plugin="Y">
-            <unit bldFile="/sf/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-          </component>
-          <component name="natpnatfwsdpprovider" filter="s60" long-name="NAT Framework SDP Provider" plugin="Y">
-            <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-          </component>
-        </collection>
-        <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-          <component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
-            <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
-            <unit mrp="/sf/mw/ipappsrv/group"/>
-          </component>
-          <component name="ipappsrv_metadata" long-name="IP App Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="ipappsrv" name="IP App Services" levels="framework generic server conn plugin">
+  <collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+   <component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/transcoder_api/transcoder_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/transcoder_api/group"/>
+   </component>
+   <component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/comms_event_api/comms_event_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/comms_event_api/group"/>
+   </component>
+   <component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/floor_control_api/floor_control_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/floor_control_api/group"/>
+   </component>
+   <component id="media_control_api" name="Media Control API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/media_control_api/media_control_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/media_control_api/group"/>
+   </component>
+   <component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/multimedia_comms_api/multimedia_comms_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/multimedia_comms_api/group"/>
+   </component>
+   <component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/nat_settings_api/nat_settings_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/nat_settings_api/group"/>
+   </component>
+  </collection>
+  <collection id="natfw" name="NAT Framework" level="framework">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+    <unit bldFile="natfw/group"/>
+   </component>
+  </collection>
+  <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+    <unit bldFile="multimediacommscontroller/group"/>
+   </component>
+  </collection>
+  <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+    <unit bldFile="multimediacommsengine/group"/>
+   </component>
+  </collection>
+  <collection id="natplugins" name="NAT Plugins" level="plugin">
+   <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+    <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
+   </component>
+   <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+    <unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
+   </component>
+   <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+    <unit bldFile="natplugins/natptraversalcontroller/group"/>
+   </component>
+   <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+    <unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
+   </component>
+  </collection>
+  <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+   <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+    <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
+    <unit mrp="group"/>
+   </component>
+   <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/ipappsrv/package_definition_3.0.xml
--- a/symbian4/mw/ipappsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="ipappsrv" name="IP App Services" levels="framework generic server conn plugin">
-  <collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
-   <component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
-    <meta rel="Api" href="ipappsrv_plat/transcoder_api/transcoder_api.metaxml"/>
-    <unit bldFile="ipappsrv_plat/transcoder_api/group"/>
-   </component>
-   <component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
-    <meta rel="Api" href="ipappsrv_plat/comms_event_api/comms_event_api.metaxml"/>
-    <unit bldFile="ipappsrv_plat/comms_event_api/group"/>
-   </component>
-   <component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
-    <meta rel="Api" href="ipappsrv_plat/floor_control_api/floor_control_api.metaxml"/>
-    <unit bldFile="ipappsrv_plat/floor_control_api/group"/>
-   </component>
-   <component id="media_control_api" name="Media Control API" class="api" filter="s60">
-    <meta rel="Api" href="ipappsrv_plat/media_control_api/media_control_api.metaxml"/>
-    <unit bldFile="ipappsrv_plat/media_control_api/group"/>
-   </component>
-   <component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
-    <meta rel="Api" href="ipappsrv_plat/multimedia_comms_api/multimedia_comms_api.metaxml"/>
-    <unit bldFile="ipappsrv_plat/multimedia_comms_api/group"/>
-   </component>
-   <component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
-    <meta rel="Api" href="ipappsrv_plat/nat_settings_api/nat_settings_api.metaxml"/>
-    <unit bldFile="ipappsrv_plat/nat_settings_api/group"/>
-   </component>
-  </collection>
-  <collection id="natfw" name="NAT Framework" level="framework">
-   <!-- collection is really a component. Need to move down a directory -->
-   <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
-    <unit bldFile="natfw/group"/>
-   </component>
-  </collection>
-  <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
-   <!-- collection is really a component. Need to move down a directory -->
-   <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
-    <unit bldFile="multimediacommscontroller/group"/>
-   </component>
-  </collection>
-  <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
-   <!-- collection is really a component. Need to move down a directory -->
-   <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
-    <unit bldFile="multimediacommsengine/group"/>
-   </component>
-  </collection>
-  <collection id="natplugins" name="NAT Plugins" level="plugin">
-   <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
-    <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
-   </component>
-   <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
-    <unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
-   </component>
-   <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
-    <unit bldFile="natplugins/natptraversalcontroller/group"/>
-   </component>
-   <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
-    <unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
-   </component>
-  </collection>
-  <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
-   <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
-    <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
-    <unit mrp="group"/>
-   </component>
-   <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,236 +1,180 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
-        <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="api">
-          <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
-          </component>
-          <component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-          </component>
-          <component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-          </component>
-          <component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-          </component>
-          <component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-          </component>
-          <component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-          </component>
-          <component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-          </component>
-          <component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-          </component>
-          <component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-          </component>
-          <component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
-          </component>
-          <component name="pdpcontextmanager2_settings_api" long-name="PDP Context Manager 2 Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-          </component>
-          <component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
-          </component>
-        </collection>
-        <collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
-          <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
-          </component>
-          <component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
-          </component>
-          <component name="access_point_settings_handler_api" long-name="Access Point Settings Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
-          </component>
-          <component name="data_connection_log_counters_api" long-name="Data Connection Log Counters API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
-          </component>
-          <component name="connection_monitor_server_api" long-name="Connection Monitor Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-          </component>
-          <component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-          </component>
-          <component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-          </component>
-          <component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
-          </component>
-        </collection>
-        <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-          <component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-          </component>
-        </collection>
-        <collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
-          <component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
-            <unit bldFile="/sf/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-          </component>
-        </collection>
-        <collection name="apengine" long-name="Access Point Engine" level="framework">
-          <component name="apeng" filter="s60" long-name="Access Point Engine">
-            <unit bldFile="/sf/mw/ipconnmgmt/apengine/apeng/group"/>
-          </component>
-          <component name="apsettingshandlerui" filter="s60" long-name="Access Point Settings Handler UI">
-            <unit bldFile="/sf/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-          </component>
-          <component name="apsettingsplugin" filter="s60" long-name="Access Point Settings Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-          </component>
-        </collection>
-        <collection name="bearermanagement" long-name="Bearer Management" level="framework">
-          <component name="mpm" filter="s60" long-name="Mobility Policy Manager">
-            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/mpm/group"/>
-          </component>
-          <component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
-            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
-          </component>
-          <component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
-            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
-          </component>
-        </collection>
-        <collection name="cmmanager" long-name="Connection Method Manager" level="framework">
-          <component name="cmmgr" filter="s60" long-name="CM Manager">
-            <unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-          </component>
-          <component name="gsconnsettingsplugin" filter="s60" long-name="GS Connection Settings Plugin" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
-          </component>
-        </collection>
-        <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-          <component name="connectionmonitorplugin" filter="s60" long-name="Connection Monitor Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-          </component>
-          <component name="connectionmonitorui" filter="s60" long-name="Connection Monitor UI">
-            <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-          </component>
-          <component name="connmon" filter="s60" long-name="Connection Monitor">
-            <!-- either split into two components, or #include from a common bld.inf -->
-            <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-            <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-          </component>
-          <component name="connmonext" filter="s60" long-name="Connection Monitor Extension API">
-            <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-          </component>
-        </collection>
-        <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-          <component name="connectiondialogs" filter="s60" long-name="Connection Dialogs">
-            <unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-          </component>
-        </collection>
-        <collection name="dbcreator" long-name="DB Creator" level="utils">
-          <component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
-            <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-          </component>
-          <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-            <!-- uncomment when config is turned on -->
-            <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-          </component>
-          <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
-            <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-          </component>
-          <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
-            <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-          </component>
-          <component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-            <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-            <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
-          </component>
-        </collection>
-        <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-          <component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
-            <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
-            <unit bldFile="/sf/mw/ipconnmgmt/group"/>
-          </component>
-          <component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-            <unit bldFile="/sf/mw/ipconnmgmt/." proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server utils api">
+  <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
+   <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml"/>
+    <unit bldFile="ipcm_plat/access_point_engine_misc_api/group"/>
+   </component>
+   <component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/bearer_settings_plugin_api/bearer_settings_plugin_api.metaxml"/>
+    <unit bldFile="ipcm_plat/bearer_settings_plugin_api/group"/>
+   </component>
+   <component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/commsdat_wlan_api/commsdat_wlan_api.metaxml"/>
+    <unit bldFile="ipcm_plat/commsdat_wlan_api/group"/>
+   </component>
+   <component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/connection_monitor_extension_api/connection_monitor_extension_api.metaxml"/>
+    <unit bldFile="ipcm_plat/connection_monitor_extension_api/group"/>
+   </component>
+   <component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/connection_ui_utilities_api/connection_ui_utilities_api.metaxml"/>
+    <unit bldFile="ipcm_plat/connection_ui_utilities_api/group"/>
+   </component>
+   <component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/disconnect_dialog_api/disconnect_dialog_api.metaxml"/>
+    <unit bldFile="ipcm_plat/disconnect_dialog_api/group"/>
+   </component>
+   <component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/disconnect_dialog_disable_api/disconnect_dialog_disable_api.metaxml"/>
+    <unit bldFile="ipcm_plat/disconnect_dialog_disable_api/group"/>
+   </component>
+   <component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/extended_connection_settings_api/extended_connection_settings_api.metaxml"/>
+    <unit bldFile="ipcm_plat/extended_connection_settings_api/group"/>
+   </component>
+   <component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/mpm_default_connection_api/mpm_default_connection_api.metaxml"/>
+    <unit bldFile="ipcm_plat/mpm_default_connection_api/group"/>
+   </component>
+   <component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/pdpcontextmanager2_reset_factory_settings_api.metaxml"/>
+    <unit bldFile="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+   </component>
+   <component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/pdpcontextmanager2_settings_api/pdpcontextmanager2_settings_api.metaxml"/>
+    <unit bldFile="ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+   </component>
+   <component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+    <unit bldFile="ipcm_plat/mpm_connect_screen_api/group"/>
+   </component>
+  </collection>
+  <collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="api">
+   <component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/connection_settings_api/connection_settings_api.metaxml"/>
+    <unit bldFile="ipcm_pub/connection_settings_api/group"/>
+   </component>
+   <component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/access_point_engine_api/access_point_engine_api.metaxml"/>
+    <unit bldFile="ipcm_pub/access_point_engine_api/group"/>
+   </component>
+   <component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/access_point_settings_handler_api/access_point_settings_handler_api.metaxml"/>
+    <unit bldFile="ipcm_pub/access_point_settings_handler_api/group"/>
+   </component>
+   <component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/data_connection_log_counters_api/data_connection_log_counters_api.metaxml"/>
+    <unit bldFile="ipcm_pub/data_connection_log_counters_api/group"/>
+   </component>
+   <component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/connection_monitor_server_api/connection_monitor_server_api.metaxml"/>
+    <unit bldFile="ipcm_pub/connection_monitor_server_api/group"/>
+   </component>
+   <component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/connection_settings_ui_api/connection_settings_ui_api.metaxml"/>
+    <unit bldFile="ipcm_pub/connection_settings_ui_api/group"/>
+   </component>
+   <component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/agent_dialog_api/agent_dialog_api.metaxml"/>
+    <unit bldFile="ipcm_pub/agent_dialog_api/group"/>
+   </component>
+   <component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/extendedconnpref_api/extendedconnpref_api.metaxml"/>
+    <unit bldFile="ipcm_pub/extendedconnpref_api/group"/>
+   </component>
+  </collection>
+  <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+   <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+    <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
+   </component>
+  </collection>
+  <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
+   <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
+    <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
+   </component>
+  </collection>
+  <collection id="apengine" name="Access Point Engine" level="framework">
+   <component id="apeng" filter="s60" name="Access Point Engine">
+    <unit bldFile="apengine/apeng/group"/>
+   </component>
+   <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+    <unit bldFile="apengine/apsettingshandlerui/group"/>
+   </component>
+   <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
+    <unit bldFile="apengine/apsettingsplugin/group"/>
+   </component>
+  </collection>
+  <collection id="bearermanagement" name="Bearer Management" level="framework">
+   <component id="mpm" filter="s60" name="Mobility Policy Manager">
+    <unit bldFile="bearermanagement/mpm/group"/>
+   </component>
+   <component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+    <unit bldFile="bearermanagement/extendedconnpref/group"/>
+   </component>
+   <component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+    <unit bldFile="bearermanagement/S60MCPR/group"/>
+   </component>
+  </collection>
+  <collection id="cmmanager" name="Connection Method Manager" level="framework">
+   <component id="cmmgr" filter="s60" name="CM Manager">
+    <unit bldFile="cmmanager/cmmgr/group"/>
+   </component>
+   <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
+    <unit bldFile="cmmanager/gsconnsettingsplugin/group"/>
+   </component>
+  </collection>
+  <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
+   <component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
+    <unit bldFile="connectionmonitoring/connectionmonitorplugin/group"/>
+   </component>
+   <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
+    <unit bldFile="connectionmonitoring/connectionmonitorui/group"/>
+   </component>
+   <component id="connmon" filter="s60" name="Connection Monitor">
+    <!-- either split into two components, or #include from a common bld.inf -->
+    <unit bldFile="connectionmonitoring/connmon/connectionmonitor/group"/>
+    <unit bldFile="connectionmonitoring/connmon/dataconnectionlogger/group"/>
+   </component>
+   <component id="connmonext" filter="s60" name="Connection Monitor Extension API">
+    <unit bldFile="connectionmonitoring/connmonext/group"/>
+   </component>
+  </collection>
+  <collection id="connectionutilities" name="Connection Utilities" level="utils">
+   <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+    <unit bldFile="connectionutilities/connectiondialogs/group"/>
+   </component>
+  </collection>
+  <collection id="dbcreator" name="DB Creator" level="utils">
+   <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
+    <unit bldFile="dbcreator/commsdatcreator/group"/>
+   </component>
+   <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
+    <meta rel="config">
+     <not-defined condition="WINSCW"/>
+    </meta>
+    <!-- uncomment when config is turned on -->
+    <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+   </component>
+   <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
+    <unit bldFile="dbcreator/commsdatstartup/group"/>
+   </component>
+   <component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
+    <unit bldFile="dbcreator/dbcreatorexe/group"/>
+   </component>
+   <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
+    <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+    <unit bldFile="dbcreator/group"/>
+   </component>
+  </collection>
+  <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
+   <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
+    <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
+     <unit bldFile="." qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/ipconnmgmt/package_definition_3.0.xml
--- a/symbian4/mw/ipconnmgmt/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server utils api">
-  <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
-   <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml"/>
-    <unit bldFile="ipcm_plat/access_point_engine_misc_api/group"/>
-   </component>
-   <component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/bearer_settings_plugin_api/bearer_settings_plugin_api.metaxml"/>
-    <unit bldFile="ipcm_plat/bearer_settings_plugin_api/group"/>
-   </component>
-   <component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/commsdat_wlan_api/commsdat_wlan_api.metaxml"/>
-    <unit bldFile="ipcm_plat/commsdat_wlan_api/group"/>
-   </component>
-   <component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/connection_monitor_extension_api/connection_monitor_extension_api.metaxml"/>
-    <unit bldFile="ipcm_plat/connection_monitor_extension_api/group"/>
-   </component>
-   <component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/connection_ui_utilities_api/connection_ui_utilities_api.metaxml"/>
-    <unit bldFile="ipcm_plat/connection_ui_utilities_api/group"/>
-   </component>
-   <component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/disconnect_dialog_api/disconnect_dialog_api.metaxml"/>
-    <unit bldFile="ipcm_plat/disconnect_dialog_api/group"/>
-   </component>
-   <component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/disconnect_dialog_disable_api/disconnect_dialog_disable_api.metaxml"/>
-    <unit bldFile="ipcm_plat/disconnect_dialog_disable_api/group"/>
-   </component>
-   <component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/extended_connection_settings_api/extended_connection_settings_api.metaxml"/>
-    <unit bldFile="ipcm_plat/extended_connection_settings_api/group"/>
-   </component>
-   <component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/mpm_default_connection_api/mpm_default_connection_api.metaxml"/>
-    <unit bldFile="ipcm_plat/mpm_default_connection_api/group"/>
-   </component>
-   <component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/pdpcontextmanager2_reset_factory_settings_api.metaxml"/>
-    <unit bldFile="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
-   </component>
-   <component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/pdpcontextmanager2_settings_api/pdpcontextmanager2_settings_api.metaxml"/>
-    <unit bldFile="ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-   </component>
-   <component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
-    <unit bldFile="ipcm_plat/mpm_connect_screen_api/group"/>
-   </component>
-  </collection>
-  <collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="api">
-   <component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/connection_settings_api/connection_settings_api.metaxml"/>
-    <unit bldFile="ipcm_pub/connection_settings_api/group"/>
-   </component>
-   <component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/access_point_engine_api/access_point_engine_api.metaxml"/>
-    <unit bldFile="ipcm_pub/access_point_engine_api/group"/>
-   </component>
-   <component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/access_point_settings_handler_api/access_point_settings_handler_api.metaxml"/>
-    <unit bldFile="ipcm_pub/access_point_settings_handler_api/group"/>
-   </component>
-   <component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/data_connection_log_counters_api/data_connection_log_counters_api.metaxml"/>
-    <unit bldFile="ipcm_pub/data_connection_log_counters_api/group"/>
-   </component>
-   <component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/connection_monitor_server_api/connection_monitor_server_api.metaxml"/>
-    <unit bldFile="ipcm_pub/connection_monitor_server_api/group"/>
-   </component>
-   <component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/connection_settings_ui_api/connection_settings_ui_api.metaxml"/>
-    <unit bldFile="ipcm_pub/connection_settings_ui_api/group"/>
-   </component>
-   <component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/agent_dialog_api/agent_dialog_api.metaxml"/>
-    <unit bldFile="ipcm_pub/agent_dialog_api/group"/>
-   </component>
-   <component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/extendedconnpref_api/extendedconnpref_api.metaxml"/>
-    <unit bldFile="ipcm_pub/extendedconnpref_api/group"/>
-   </component>
-  </collection>
-  <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
-   <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
-    <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
-   </component>
-  </collection>
-  <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
-   <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
-    <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
-   </component>
-  </collection>
-  <collection id="apengine" name="Access Point Engine" level="framework">
-   <component id="apeng" filter="s60" name="Access Point Engine">
-    <unit bldFile="apengine/apeng/group"/>
-   </component>
-   <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
-    <unit bldFile="apengine/apsettingshandlerui/group"/>
-   </component>
-   <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
-    <unit bldFile="apengine/apsettingsplugin/group"/>
-   </component>
-  </collection>
-  <collection id="bearermanagement" name="Bearer Management" level="framework">
-   <component id="mpm" filter="s60" name="Mobility Policy Manager">
-    <unit bldFile="bearermanagement/mpm/group"/>
-   </component>
-   <component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
-    <unit bldFile="bearermanagement/extendedconnpref/group"/>
-   </component>
-   <component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
-    <unit bldFile="bearermanagement/S60MCPR/group"/>
-   </component>
-  </collection>
-  <collection id="cmmanager" name="Connection Method Manager" level="framework">
-   <component id="cmmgr" filter="s60" name="CM Manager">
-    <unit bldFile="cmmanager/cmmgr/group"/>
-   </component>
-   <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
-    <unit bldFile="cmmanager/gsconnsettingsplugin/group"/>
-   </component>
-  </collection>
-  <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
-   <component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
-    <unit bldFile="connectionmonitoring/connectionmonitorplugin/group"/>
-   </component>
-   <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
-    <unit bldFile="connectionmonitoring/connectionmonitorui/group"/>
-   </component>
-   <component id="connmon" filter="s60" name="Connection Monitor">
-    <!-- either split into two components, or #include from a common bld.inf -->
-    <unit bldFile="connectionmonitoring/connmon/connectionmonitor/group"/>
-    <unit bldFile="connectionmonitoring/connmon/dataconnectionlogger/group"/>
-   </component>
-   <component id="connmonext" filter="s60" name="Connection Monitor Extension API">
-    <unit bldFile="connectionmonitoring/connmonext/group"/>
-   </component>
-  </collection>
-  <collection id="connectionutilities" name="Connection Utilities" level="utils">
-   <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
-    <unit bldFile="connectionutilities/connectiondialogs/group"/>
-   </component>
-  </collection>
-  <collection id="dbcreator" name="DB Creator" level="utils">
-   <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
-    <unit bldFile="dbcreator/commsdatcreator/group"/>
-   </component>
-   <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
-    <meta rel="config">
-     <not-defined condition="WINSCW"/>
-    </meta>
-    <!-- uncomment when config is turned on -->
-    <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-   </component>
-   <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
-    <unit bldFile="dbcreator/commsdatstartup/group"/>
-   </component>
-   <component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
-    <unit bldFile="dbcreator/dbcreatorexe/group"/>
-   </component>
-   <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
-    <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-    <unit bldFile="dbcreator/group"/>
-   </component>
-  </collection>
-  <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
-   <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
-    <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
-    <unit bldFile="group"/>
-   </component>
-   <component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
-     <unit bldFile="." qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/legacypresence/package_definition.xml
--- a/symbian4/mw/legacypresence/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,171 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
-        <collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
-          <component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-          </component>
-          <component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-          </component>
-          <component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-          </component>
-          <component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/authorization_api/group"/>
-          </component>
-          <component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-          </component>
-          <component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/watcher_api/group"/>
-          </component>
-          <component name="xdm_api" long-name="XDM API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_api/group"/>
-          </component>
-          <component name="registration_api" long-name="Registration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/registration_api/group"/>
-          </component>
-          <component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/publisher_api/group"/>
-          </component>
-          <component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-          </component>
-          <component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-          </component>
-          <component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-          </component>
-          <component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-          </component>
-        </collection>
-        <collection name="xdmengine" long-name="XDM Engine" level="engine">
-          <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-          <component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
-            <unit bldFile="/sf/mw/legacypresence/xdmengine/group"/>
-          </component>
-        </collection>
-        <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-          <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-          <component name="xdmsettingsui_build" filter="s60" long-name="XDM Settings UI Build">
-            <unit bldFile="/sf/mw/legacypresence/xdmsettingsui/group"/>
-          </component>
-        </collection>
-        <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-          <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
-          <component name="xdmprotocols_build" filter="s60" long-name="XDM Protocols Build">
-            <unit bldFile="/sf/mw/legacypresence/xdmprotocols/group"/>
-          </component>
-        </collection>
-        <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="msgconnmanager_build" filter="s60" long-name="Messaging Connection Manager Build">
-            <unit bldFile="/sf/mw/legacypresence/msgconnmanager/group"/>
-          </component>
-        </collection>
-        <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="presencesettingsui_build" filter="s60" long-name="Presence Settings UI Build">
-            <unit bldFile="/sf/mw/legacypresence/presencesettingsui/group"/>
-          </component>
-        </collection>
-        <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="simpleengine_build" filter="s60" long-name="SIMPLE Engine Build">
-            <unit bldFile="/sf/mw/legacypresence/simpleengine/group"/>
-          </component>
-        </collection>
-        <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptation" level="fw">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="simpleplugin" filter="s60" long-name="SIMPLE Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/legacypresence/presencefwsimpleadpt/group"/>
-          </component>
-        </collection>
-        <collection name="simpledatamodeladapter" long-name="SIMPLE Data Model Adapter" level="fw">
-          <component name="presenceplugin" filter="s60" long-name="Presence Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/legacypresence/simpledatamodeladapter/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="legacypresence" name="Legacy Presence Services" levels="engine fw ui">
+  <collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
+   <component id="presence_list_api" name="Presence List API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/presence_list_api/presence_list_api.metaxml"/>
+    <unit bldFile="pressrv_plat/presence_list_api/group"/>
+   </component>
+   <component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/watcher_info_api/watcher_info_api.metaxml"/>
+    <unit bldFile="pressrv_plat/watcher_info_api/group"/>
+   </component>
+   <component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/simple_documents_api/simple_documents_api.metaxml"/>
+    <unit bldFile="pressrv_plat/simple_documents_api/group"/>
+   </component>
+   <component id="authorization_api" name="Authorization API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/authorization_api/authorization_api.metaxml"/>
+    <unit bldFile="pressrv_plat/authorization_api/group"/>
+   </component>
+   <component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/xdm_protocol_plugin_api/xdm_protocol_plugin_api.metaxml"/>
+    <unit bldFile="pressrv_plat/xdm_protocol_plugin_api/group"/>
+   </component>
+   <component id="watcher_api" name="Watcher API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/watcher_api/watcher_api.metaxml"/>
+    <unit bldFile="pressrv_plat/watcher_api/group"/>
+   </component>
+   <component id="xdm_api" name="XDM API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/xdm_api/xdm_api.metaxml"/>
+    <unit bldFile="pressrv_plat/xdm_api/group"/>
+   </component>
+   <component id="registration_api" name="Registration API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/registration_api/registration_api.metaxml"/>
+    <unit bldFile="pressrv_plat/registration_api/group"/>
+   </component>
+   <component id="publisher_api" name="Publisher API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/publisher_api/publisher_api.metaxml"/>
+    <unit bldFile="pressrv_plat/publisher_api/group"/>
+   </component>
+   <component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/messaging_connection_manager_api/messaging_connection_manager_api.metaxml"/>
+    <unit bldFile="pressrv_plat/messaging_connection_manager_api/group"/>
+   </component>
+   <component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/xdm_settings_api/xdm_settings_api.metaxml"/>
+    <unit bldFile="pressrv_plat/xdm_settings_api/group"/>
+   </component>
+   <component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/simple_settings_api/simple_settings_api.metaxml"/>
+    <unit bldFile="pressrv_plat/simple_settings_api/group"/>
+   </component>
+   <component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+    <unit bldFile="pressrv_plat/simple_instant_msg_api/group"/>
+   </component>
+  </collection>
+  <collection id="xdmengine" name="XDM Engine" level="engine">
+   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+   <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+    <unit bldFile="xdmengine/group"/>
+   </component>
+  </collection>
+  <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+   <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+    <unit bldFile="xdmsettingsui/group"/>
+   </component>
+  </collection>
+  <collection id="xdmprotocols" name="XDM Protocols" level="fw">
+   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+   <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+    <unit bldFile="xdmprotocols/group"/>
+   </component>
+  </collection>
+  <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
+    <unit bldFile="msgconnmanager/group"/>
+   </component>
+  </collection>
+  <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+    <unit bldFile="presencesettingsui/group"/>
+   </component>
+  </collection>
+  <collection id="simpleengine" name="SIMPLE Engine" level="engine">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+    <unit bldFile="simpleengine/group"/>
+   </component>
+  </collection>
+  <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+    <unit bldFile="presencefwsimpleadpt/group"/>
+   </component>
+  </collection>
+  <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
+   <component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
+    <unit bldFile="simpledatamodeladapter/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/legacypresence/package_definition_3.0.xml
--- a/symbian4/mw/legacypresence/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="legacypresence" name="Legacy Presence Services" levels="engine fw ui">
-  <collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
-   <component id="presence_list_api" name="Presence List API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/presence_list_api/presence_list_api.metaxml"/>
-    <unit bldFile="pressrv_plat/presence_list_api/group"/>
-   </component>
-   <component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/watcher_info_api/watcher_info_api.metaxml"/>
-    <unit bldFile="pressrv_plat/watcher_info_api/group"/>
-   </component>
-   <component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/simple_documents_api/simple_documents_api.metaxml"/>
-    <unit bldFile="pressrv_plat/simple_documents_api/group"/>
-   </component>
-   <component id="authorization_api" name="Authorization API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/authorization_api/authorization_api.metaxml"/>
-    <unit bldFile="pressrv_plat/authorization_api/group"/>
-   </component>
-   <component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/xdm_protocol_plugin_api/xdm_protocol_plugin_api.metaxml"/>
-    <unit bldFile="pressrv_plat/xdm_protocol_plugin_api/group"/>
-   </component>
-   <component id="watcher_api" name="Watcher API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/watcher_api/watcher_api.metaxml"/>
-    <unit bldFile="pressrv_plat/watcher_api/group"/>
-   </component>
-   <component id="xdm_api" name="XDM API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/xdm_api/xdm_api.metaxml"/>
-    <unit bldFile="pressrv_plat/xdm_api/group"/>
-   </component>
-   <component id="registration_api" name="Registration API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/registration_api/registration_api.metaxml"/>
-    <unit bldFile="pressrv_plat/registration_api/group"/>
-   </component>
-   <component id="publisher_api" name="Publisher API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/publisher_api/publisher_api.metaxml"/>
-    <unit bldFile="pressrv_plat/publisher_api/group"/>
-   </component>
-   <component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/messaging_connection_manager_api/messaging_connection_manager_api.metaxml"/>
-    <unit bldFile="pressrv_plat/messaging_connection_manager_api/group"/>
-   </component>
-   <component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/xdm_settings_api/xdm_settings_api.metaxml"/>
-    <unit bldFile="pressrv_plat/xdm_settings_api/group"/>
-   </component>
-   <component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
-    <meta rel="Api" href="pressrv_plat/simple_settings_api/simple_settings_api.metaxml"/>
-    <unit bldFile="pressrv_plat/simple_settings_api/group"/>
-   </component>
-   <component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
-    <unit bldFile="pressrv_plat/simple_instant_msg_api/group"/>
-   </component>
-  </collection>
-  <collection id="xdmengine" name="XDM Engine" level="engine">
-   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-   <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
-    <unit bldFile="xdmengine/group"/>
-   </component>
-  </collection>
-  <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
-   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-   <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
-    <unit bldFile="xdmsettingsui/group"/>
-   </component>
-  </collection>
-  <collection id="xdmprotocols" name="XDM Protocols" level="fw">
-   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
-   <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
-    <unit bldFile="xdmprotocols/group"/>
-   </component>
-  </collection>
-  <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
-    <unit bldFile="msgconnmanager/group"/>
-   </component>
-  </collection>
-  <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
-    <unit bldFile="presencesettingsui/group"/>
-   </component>
-  </collection>
-  <collection id="simpleengine" name="SIMPLE Engine" level="engine">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
-    <unit bldFile="simpleengine/group"/>
-   </component>
-  </collection>
-  <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
-    <unit bldFile="presencefwsimpleadpt/group"/>
-   </component>
-  </collection>
-  <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
-   <component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
-    <unit bldFile="simpledatamodeladapter/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/locationsrv/package_definition.xml
--- a/symbian4/mw/locationsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,258 +1,207 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-        <collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
-          <component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-          </component>
-          <component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-          </component>
-          <component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-          </component>
-          <component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-          </component>
-          <component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-          </component>
-        </collection>
-        <collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-          <component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-          </component>
-          <component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-          </component>
-          <component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-          </component>
-          <component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_api/group"/>
-          </component>
-          <component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-          </component>
-          <component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-          </component>
-          <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-          </component>
-          <component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-          </component>
-          <component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-          </component>
-          <component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-          </component>
-          <component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-          </component>
-          <component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-          </component>
-          <component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-          </component>
-          <component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-          </component>
-          <component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-          </component>
-          <component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
-          </component>
-          <component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-          </component>
-          <component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-          </component>
-          <component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-          </component>
-          <component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-          </component>
-          <component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-          </component>
-          <component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-          </component>
-          <component name="query_and_notification_api" long-name="Query and Notification API" filter="s60" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/query_and_notification_api/group"/>
-          </component>
-          <component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-          </component>
-        </collection>
-        <collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
-          <component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
-            <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-          </component>
-          <component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-          </component>
-          <component name="genericpositioningplugins_build" filter="s60" long-name="Generic Positioning Plugins Build">
-            <!-- need to break this up into the other components -->
-            <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/group"/>
-          </component>
-        </collection>
-        <collection name="landmarks" long-name="Landmarks" level="server">
-          <component name="locationlandmarks" filter="s60" long-name="Location Landmarks">
-            <unit bldFile="/sf/mw/locationsrv/landmarks/locationlandmarks/group"/>
-          </component>
-        </collection>
-        <collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-          <component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-            <unit bldFile="/sf/mw/locationsrv/locationmapnavfw/library/group"/>
-          </component>
-          <component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-            <unit bldFile="/sf/mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-          </component>
-          <component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-            <!-- need to break this up into the other components -->
-            <unit bldFile="/sf/mw/locationsrv/locationmapnavfw/group"/>
-          </component>
-        </collection>
-        <collection name="locationsystemui" long-name="Location System UI" level="if">
-          <component name="locationsysui" filter="s60" long-name="Location System UI">
-            <unit bldFile="/sf/mw/locationsrv/locationsystemui/locationsysui/group"/>
-          </component>
-        </collection>
-        <collection name="supl" long-name="SUPL" level="fw">
-          <component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
-            <unit bldFile="/sf/mw/locationsrv/supl/locationsuplfw/group"/>
-          </component>
-          <component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-            <unit bldFile="/sf/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-          </component>
-          <component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-            <unit bldFile="/sf/mw/locationsrv/supl/supltiapiimplementation/group"/>
-          </component>
-        </collection>
-        <collection name="locationtriggering" long-name="Location Triggering" level="server">
-          <component name="ltlogger" filter="s60" long-name="LT Logger">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltlogger/group"/>
-          </component>
-          <component name="ltclientlib" filter="s60" long-name="LT Client Library">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltclientlib/group"/>
-          </component>
-          <component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-          </component>
-          <component name="ltcontainer" filter="s60" long-name="LT Container">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcontainer/group"/>
-          </component>
-          <component name="ltserver" filter="s60" long-name="LT Server">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltserver/group"/>
-          </component>
-          <component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-          </component>
-          <component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-          </component>
-          <component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-          </component>
-          <component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-          </component>
-          <component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-          </component>
-          <component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
-          </component>
-          <component name="locationtriggering_build" filter="s60" long-name="Location Triggering Build">
-            <!--  should remove #include from this and maybe put exports in the above components -->
-            <unit bldFile="/sf/mw/locationsrv/locationtriggering/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="locationsrv" name="Location Services" levels="plugin fw server if">
+  <collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+   <component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_search_api/landmarks_search_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_search_api/group"/>
+   </component>
+   <component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_api/landmarks_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_api/group"/>
+   </component>
+   <component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_database_management_api/landmarks_database_management_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_database_management_api/group"/>
+   </component>
+   <component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/location_triggering_api/location_triggering_api.metaxml"/>
+    <unit bldFile="locsrv_pub/location_triggering_api/group"/>
+   </component>
+   <component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/blid_application_satellite_info_api/blid_application_satellite_info_api.metaxml"/>
+    <unit bldFile="locsrv_pub/blid_application_satellite_info_api/group"/>
+   </component>
+  </collection>
+  <collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+   <component id="map_and_navigation_api" name="Map and Navigation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_and_navigation_api/map_and_navigation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_and_navigation_api/group"/>
+   </component>
+   <component id="map_and_navigation_provider_discovery_api" name="Map and Navigation Provider Discovery API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_and_navigation_provider_discovery_api/map_and_navigation_provider_discovery_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+   </component>
+   <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/geocoding_api/geocoding_api.metaxml"/>
+    <unit bldFile="locsrv_plat/geocoding_api/group"/>
+   </component>
+   <component id="map_image_api" name="Map Image API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_image_api/map_image_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_image_api/group"/>
+   </component>
+   <component id="map_and_navigation_aiw_api" name="Map and Navigation AIW API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_and_navigation_aiw_api/map_and_navigation_aiw_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_and_navigation_aiw_api/group"/>
+   </component>
+   <component id="map_and_navigation_provider_api" name="Map and Navigation Provider API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_and_navigation_provider_api/map_and_navigation_provider_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_and_navigation_provider_api/group"/>
+   </component>
+   <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/landmarks_category_definition_api/landmarks_category_definition_api.metaxml"/>
+    <unit bldFile="locsrv_plat/landmarks_category_definition_api/group"/>
+   </component>
+   <component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_settings_api/supl_settings_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_settings_api/group"/>
+   </component>
+   <component id="location_settings_launch_api" name="Location Settings Launch API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_settings_launch_api/location_settings_launch_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_settings_launch_api/group"/>
+   </component>
+   <component id="map_image_conversion_plugin_api" name="Map Image Conversion Plug-In API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_image_conversion_plugin_api/map_image_conversion_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_image_conversion_plugin_api/group"/>
+   </component>
+   <component id="psy_configuration_ui_plugin_api" name="PSY Configuration UI Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/psy_configuration_ui_plugin_api/psy_configuration_ui_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+   </component>
+   <component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/np_proxy_configuration_api/np_proxy_configuration_api.metaxml"/>
+    <unit bldFile="locsrv_plat/np_proxy_configuration_api/group"/>
+   </component>
+   <component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_terminal_initiation_api/supl_terminal_initiation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_terminal_initiation_api/group"/>
+   </component>
+   <component id="location_notation_preferences_settings_api" name="Location Notation Preferences Settings API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_notation_preferences_settings_api/location_notation_preferences_settings_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_notation_preferences_settings_api/group"/>
+   </component>
+   <component id="supl_settings_notifier_secondary_display_api" name="SUPL Settings Notifier Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_settings_notifier_secondary_display_api/supl_settings_notifier_secondary_display_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+   </component>
+   <component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_network_initiation_api/supl_network_initiation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_network_initiation_api/group"/>
+   </component>
+   <component id="privacy_notifiers_secondary_display_api" name="Privacy Notifiers Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/privacy_notifiers_secondary_display_api/privacy_notifiers_secondary_display_api.metaxml"/>
+    <unit bldFile="locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+   </component>
+   <component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/oma_supl_configuration_parameter_api/oma_supl_configuration_parameter_api.metaxml"/>
+    <unit bldFile="locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+   </component>
+   <component id="supl_query_secondary_display_api" name="SUPL Query Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_query_secondary_display_api/supl_query_secondary_display_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_query_secondary_display_api/group"/>
+   </component>
+   <component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_triggering_management_api/location_triggering_management_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_triggering_management_api/group"/>
+   </component>
+   <component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_triggering_status_information_api/location_triggering_status_information_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_triggering_status_information_api/group"/>
+   </component>
+   <component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+    <unit bldFile="locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+   </component>
+  <component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
+      <unit bldFile="locsrv_plat/query_and_notification_api/group"/>
+   </component>
+   <component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_local_variation_api/location_local_variation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_local_variation_api/group"/>
+   </component>
+  </collection>
+  <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+   <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+    <unit bldFile="genericpositioningplugins/locationnpppsy/group"/>
+   </component>
+   <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+    <unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
+   </component>
+   <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+    <!-- need to break this up into the other components -->
+    <unit bldFile="genericpositioningplugins/group"/>
+   </component>
+  </collection>
+  <collection id="landmarks" name="Landmarks" level="server">
+   <component id="locationlandmarks" filter="s60" name="Location Landmarks">
+    <unit bldFile="landmarks/locationlandmarks/group"/>
+   </component>
+  </collection>
+  <collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
+   <component id="mnlibrary" filter="s60" name="Map and Navigation Library">
+    <unit bldFile="locationmapnavfw/library/group"/>
+   </component>
+   <component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
+    <unit bldFile="locationmapnavfw/aiwprovider/group"/>
+   </component>
+   <component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
+    <!-- need to break this up into the other components -->
+    <unit bldFile="locationmapnavfw/group"/>
+   </component>
+  </collection>
+  <collection id="locationsystemui" name="Location System UI" level="if">
+   <component id="locationsysui" filter="s60" name="Location System UI">
+    <unit bldFile="locationsystemui/locationsysui/group"/>
+   </component>
+  </collection>
+  <collection id="supl" name="SUPL" level="fw">
+   <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+    <unit bldFile="supl/locationsuplfw/group"/>
+   </component>
+   <component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+    <unit bldFile="supl/locationomasuplprotocolhandler/group"/>
+   </component>
+   <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+    <unit bldFile="supl/supltiapiimplementation/group"/>
+   </component>
+  </collection>
+  <collection id="locationtriggering" name="Location Triggering" level="server">
+   <component id="ltlogger" filter="s60" name="LT Logger">
+    <unit bldFile="locationtriggering/ltlogger/group"/>
+   </component>
+   <component id="ltclientlib" filter="s60" name="LT Client Library">
+    <unit bldFile="locationtriggering/ltclientlib/group"/>
+   </component>
+   <component id="ltmanagementlib" filter="s60" name="LT Management Library">
+    <unit bldFile="locationtriggering/ltmanagementlib/group"/>
+   </component>
+   <component id="ltcontainer" filter="s60" name="LT Container">
+    <unit bldFile="locationtriggering/ltcontainer/group"/>
+   </component>
+   <component id="ltserver" filter="s60" name="LT Server">
+    <unit bldFile="locationtriggering/ltserver/group"/>
+   </component>
+   <component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+    <unit bldFile="locationtriggering/ltstrategypluginapi/group"/>
+   </component>
+   <component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+    <unit bldFile="locationtriggering/ltstrategyengine/group"/>
+   </component>
+   <component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+    <unit bldFile="locationtriggering/ltmovementdetectionpluginapi/group"/>
+   </component>
+   <component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+    <unit bldFile="locationtriggering/ltcellidmovementdetector/group"/>
+   </component>
+   <component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
+    <unit bldFile="locationtriggering/lbtmgmtui/group"/>
+   </component>
+   <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+    <unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
+   </component>
+   <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
+    <!--  should remove #include from this and maybe put exports in the above components -->
+    <unit bldFile="locationtriggering/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/locationsrv/package_definition_3.0.xml
--- a/symbian4/mw/locationsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="locationsrv" name="Location Services" levels="plugin fw server if">
-  <collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
-   <component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_pub/landmarks_search_api/landmarks_search_api.metaxml"/>
-    <unit bldFile="locsrv_pub/landmarks_search_api/group"/>
-   </component>
-   <component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_pub/landmarks_api/landmarks_api.metaxml"/>
-    <unit bldFile="locsrv_pub/landmarks_api/group"/>
-   </component>
-   <component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_pub/landmarks_database_management_api/landmarks_database_management_api.metaxml"/>
-    <unit bldFile="locsrv_pub/landmarks_database_management_api/group"/>
-   </component>
-   <component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_pub/location_triggering_api/location_triggering_api.metaxml"/>
-    <unit bldFile="locsrv_pub/location_triggering_api/group"/>
-   </component>
-   <component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_pub/blid_application_satellite_info_api/blid_application_satellite_info_api.metaxml"/>
-    <unit bldFile="locsrv_pub/blid_application_satellite_info_api/group"/>
-   </component>
-  </collection>
-  <collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
-   <component id="map_and_navigation_api" name="Map and Navigation API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/map_and_navigation_api/map_and_navigation_api.metaxml"/>
-    <unit bldFile="locsrv_plat/map_and_navigation_api/group"/>
-   </component>
-   <component id="map_and_navigation_provider_discovery_api" name="Map and Navigation Provider Discovery API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/map_and_navigation_provider_discovery_api/map_and_navigation_provider_discovery_api.metaxml"/>
-    <unit bldFile="locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-   </component>
-   <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/geocoding_api/geocoding_api.metaxml"/>
-    <unit bldFile="locsrv_plat/geocoding_api/group"/>
-   </component>
-   <component id="map_image_api" name="Map Image API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/map_image_api/map_image_api.metaxml"/>
-    <unit bldFile="locsrv_plat/map_image_api/group"/>
-   </component>
-   <component id="map_and_navigation_aiw_api" name="Map and Navigation AIW API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/map_and_navigation_aiw_api/map_and_navigation_aiw_api.metaxml"/>
-    <unit bldFile="locsrv_plat/map_and_navigation_aiw_api/group"/>
-   </component>
-   <component id="map_and_navigation_provider_api" name="Map and Navigation Provider API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/map_and_navigation_provider_api/map_and_navigation_provider_api.metaxml"/>
-    <unit bldFile="locsrv_plat/map_and_navigation_provider_api/group"/>
-   </component>
-   <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/landmarks_category_definition_api/landmarks_category_definition_api.metaxml"/>
-    <unit bldFile="locsrv_plat/landmarks_category_definition_api/group"/>
-   </component>
-   <component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/supl_settings_api/supl_settings_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_settings_api/group"/>
-   </component>
-   <component id="location_settings_launch_api" name="Location Settings Launch API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/location_settings_launch_api/location_settings_launch_api.metaxml"/>
-    <unit bldFile="locsrv_plat/location_settings_launch_api/group"/>
-   </component>
-   <component id="map_image_conversion_plugin_api" name="Map Image Conversion Plug-In API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/map_image_conversion_plugin_api/map_image_conversion_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/map_image_conversion_plugin_api/group"/>
-   </component>
-   <component id="psy_configuration_ui_plugin_api" name="PSY Configuration UI Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/psy_configuration_ui_plugin_api/psy_configuration_ui_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-   </component>
-   <component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/np_proxy_configuration_api/np_proxy_configuration_api.metaxml"/>
-    <unit bldFile="locsrv_plat/np_proxy_configuration_api/group"/>
-   </component>
-   <component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/supl_terminal_initiation_api/supl_terminal_initiation_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_terminal_initiation_api/group"/>
-   </component>
-   <component id="location_notation_preferences_settings_api" name="Location Notation Preferences Settings API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/location_notation_preferences_settings_api/location_notation_preferences_settings_api.metaxml"/>
-    <unit bldFile="locsrv_plat/location_notation_preferences_settings_api/group"/>
-   </component>
-   <component id="supl_settings_notifier_secondary_display_api" name="SUPL Settings Notifier Secondary Display API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/supl_settings_notifier_secondary_display_api/supl_settings_notifier_secondary_display_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-   </component>
-   <component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/supl_network_initiation_api/supl_network_initiation_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_network_initiation_api/group"/>
-   </component>
-   <component id="privacy_notifiers_secondary_display_api" name="Privacy Notifiers Secondary Display API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/privacy_notifiers_secondary_display_api/privacy_notifiers_secondary_display_api.metaxml"/>
-    <unit bldFile="locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-   </component>
-   <component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/oma_supl_configuration_parameter_api/oma_supl_configuration_parameter_api.metaxml"/>
-    <unit bldFile="locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-   </component>
-   <component id="supl_query_secondary_display_api" name="SUPL Query Secondary Display API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/supl_query_secondary_display_api/supl_query_secondary_display_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_query_secondary_display_api/group"/>
-   </component>
-   <component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/location_triggering_management_api/location_triggering_management_api.metaxml"/>
-    <unit bldFile="locsrv_plat/location_triggering_management_api/group"/>
-   </component>
-   <component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/location_triggering_status_information_api/location_triggering_status_information_api.metaxml"/>
-    <unit bldFile="locsrv_plat/location_triggering_status_information_api/group"/>
-   </component>
-   <component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
-    <unit bldFile="locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-   </component>
-  <component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
-      <unit bldFile="locsrv_plat/query_and_notification_api/group"/>
-   </component>
-   <component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
-    <meta rel="Api" href="locsrv_plat/location_local_variation_api/location_local_variation_api.metaxml"/>
-    <unit bldFile="locsrv_plat/location_local_variation_api/group"/>
-   </component>
-  </collection>
-  <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
-   <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
-    <unit bldFile="genericpositioningplugins/locationnpppsy/group"/>
-   </component>
-   <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
-    <unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
-   </component>
-   <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
-    <!-- need to break this up into the other components -->
-    <unit bldFile="genericpositioningplugins/group"/>
-   </component>
-  </collection>
-  <collection id="landmarks" name="Landmarks" level="server">
-   <component id="locationlandmarks" filter="s60" name="Location Landmarks">
-    <unit bldFile="landmarks/locationlandmarks/group"/>
-   </component>
-  </collection>
-  <collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
-   <component id="mnlibrary" filter="s60" name="Map and Navigation Library">
-    <unit bldFile="locationmapnavfw/library/group"/>
-   </component>
-   <component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
-    <unit bldFile="locationmapnavfw/aiwprovider/group"/>
-   </component>
-   <component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
-    <!-- need to break this up into the other components -->
-    <unit bldFile="locationmapnavfw/group"/>
-   </component>
-  </collection>
-  <collection id="locationsystemui" name="Location System UI" level="if">
-   <component id="locationsysui" filter="s60" name="Location System UI">
-    <unit bldFile="locationsystemui/locationsysui/group"/>
-   </component>
-  </collection>
-  <collection id="supl" name="SUPL" level="fw">
-   <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
-    <unit bldFile="supl/locationsuplfw/group"/>
-   </component>
-   <component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
-    <unit bldFile="supl/locationomasuplprotocolhandler/group"/>
-   </component>
-   <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
-    <unit bldFile="supl/supltiapiimplementation/group"/>
-   </component>
-  </collection>
-  <collection id="locationtriggering" name="Location Triggering" level="server">
-   <component id="ltlogger" filter="s60" name="LT Logger">
-    <unit bldFile="locationtriggering/ltlogger/group"/>
-   </component>
-   <component id="ltclientlib" filter="s60" name="LT Client Library">
-    <unit bldFile="locationtriggering/ltclientlib/group"/>
-   </component>
-   <component id="ltmanagementlib" filter="s60" name="LT Management Library">
-    <unit bldFile="locationtriggering/ltmanagementlib/group"/>
-   </component>
-   <component id="ltcontainer" filter="s60" name="LT Container">
-    <unit bldFile="locationtriggering/ltcontainer/group"/>
-   </component>
-   <component id="ltserver" filter="s60" name="LT Server">
-    <unit bldFile="locationtriggering/ltserver/group"/>
-   </component>
-   <component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
-    <unit bldFile="locationtriggering/ltstrategypluginapi/group"/>
-   </component>
-   <component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
-    <unit bldFile="locationtriggering/ltstrategyengine/group"/>
-   </component>
-   <component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
-    <unit bldFile="locationtriggering/ltmovementdetectionpluginapi/group"/>
-   </component>
-   <component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
-    <unit bldFile="locationtriggering/ltcellidmovementdetector/group"/>
-   </component>
-   <component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
-    <unit bldFile="locationtriggering/lbtmgmtui/group"/>
-   </component>
-   <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
-    <unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
-   </component>
-   <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
-    <!--  should remove #include from this and maybe put exports in the above components -->
-    <unit bldFile="locationtriggering/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/mds/package_definition.xml
--- a/symbian4/mw/mds/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,208 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
-        <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-          <component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/group" filter="test,api_test"/>
-            <!-- can only have one unit with the same filter, #include the following from the previous unit -->
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group" filter="test,api_test"/>
-          </component>
-          <component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-          </component>
-        </collection>
-        <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-          <component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mds/mds_pub/content_listing_framework_api/tsrc/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <collection name="metadataengine" long-name="Metadata Engine" level="eng">
-          <component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
-            <unit bldFile="/sf/mw/mds/metadataengine/common/group"/>
-          </component>
-          <component name="metadataengine_server" filter="s60" long-name="Metadata Engine Server" introduced="^2">
-            <unit bldFile="/sf/mw/mds/metadataengine/server/group"/>
-          </component>
-          <component name="metadataengine_client" filter="s60" long-name="Metadata Engine Client" introduced="^2">
-            <unit bldFile="/sf/mw/mds/metadataengine/client/group"/>
-          </component>
-          <component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
-            <!--make this collection a single component, or split this bld.inf into the other units  -->
-            <unit bldFile="/sf/mw/mds/metadataengine/group"/>
-          </component>
-        </collection>
-        <collection name="locationmanager" long-name="Location Manager" level="mgr">
-          <component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
-            <unit bldFile="/sf/mw/mds/locationmanager/locationtrail/group"/>
-          </component>
-          <component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
-            <unit bldFile="/sf/mw/mds/locationmanager/server/group"/>
-          </component>
-          <component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
-            <unit bldFile="/sf/mw/mds/locationmanager/client/group"/>
-          </component>
-          <component name="locationmanager_build" filter="s60" long-name="Location Manager Build" introduced="^2">
-            <!--make this collection a single component, or split this bld.inf into the other units  -->
-            <unit bldFile="/sf/mw/mds/locationmanager/group"/>
-          </component>
-        </collection>
-        <collection name="contextengine" long-name="Context Engine" level="eng">
-          <component name="contextengine_plugins" filter="s60" long-name="Context Engine Plugins" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/mds/contextengine/plugins/group"/>
-          </component>
-          <component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
-            <!--make this collection a single component, or make this unit self-contained  -->
-            <unit bldFile="/sf/mw/mds/contextengine/group"/>
-          </component>
-        </collection>
-        <collection name="harvester" long-name="Harvester" level="eng">
-          <component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
-            <unit bldFile="/sf/mw/mds/harvester/blacklistclient/group"/>
-          </component>
-          <component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
-            <unit bldFile="/sf/mw/mds/harvester/blacklistserver/group"/>
-          </component>
-          <component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
-            <unit bldFile="/sf/mw/mds/harvester/common/group"/>
-          </component>
-          <component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/mds/harvester/composerplugins/group"/>
-          </component>
-          <component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/group"/>
-          </component>
-          <component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/mds/harvester/monitorplugins/group"/>
-          </component>
-          <component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
-            <unit bldFile="/sf/mw/mds/harvester/server/group"/>
-          </component>
-          <component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
-            <unit bldFile="/sf/mw/mds/harvester/client/group"/>
-          </component>
-          <component name="harvester_build" filter="s60" long-name="Harvester Build" introduced="^2">
-            <!-- split these exports into the other components -->
-            <unit bldFile="/sf/mw/mds/harvester/group"/>
-          </component>
-        </collection>
-        <collection name="watchdog" long-name="Watchdog" level="server">
-          <!-- collection is really a component. Move down a directory -->
-          <component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
-            <unit bldFile="/sf/mw/mds/watchdog/group"/>
-          </component>
-        </collection>
-        <collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
-          <!-- collection is really a component. Move down a directory -->
-          <component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-            <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-            <!--<unit bldFile="clfwrapper/group"/>-->
-          </component>
-        </collection>
-        <collection name="mds_info" long-name="Metadata Services Info" level="int">
-          <component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
-            <!-- consider distributiing this into the rest of the components in the package -->
-            <unit bldFile="/sf/mw/mds/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="mds" name="Metadata Services" levels="mgr eng server int">
+  <collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
+   <component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_plat/context_engine_plugin_api/context_engine_plugin_api.metaxml"/>
+    <unit bldFile="mds_plat/context_engine_plugin_api/group" filter="!test"/>
+    <unit bldFile="mds_plat/context_engine_plugin_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_plat/harvester_framework_api/harvester_framework_api.metaxml"/>
+    <unit bldFile="mds_plat/harvester_framework_api/group" filter="!test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/group" filter="test,api_test"/>
+		<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/monitorplugintest/group" filter="test,api_test"/>
+   </component>
+   <component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_plat/location_manager_api/location_manager_api.metaxml"/>
+    <unit bldFile="mds_plat/location_manager_api/group" filter="!test"/>
+    <unit bldFile="mds_plat/location_manager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_plat/metadata_engine_api/metadata_engine_api.metaxml"/>
+    <unit bldFile="mds_plat/metadata_engine_api/group" filter="!test"/>
+    <unit bldFile="mds_plat/metadata_engine_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_plat/content_listing_framework_collection_manager_api/content_listing_framework_collection_manager_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+    <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_plat/content_listing_framework_extended_api/content_listing_framework_extended_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="mds_plat/content_listing_framework_extended_api/group"/>
+   </component>
+  </collection>
+  <collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
+   <component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
+    <meta rel="Api" href="mds_pub/content_listing_framework_api/content_listing_framework_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="mds_pub/content_listing_framework_api/group" filter="!test"/>
+    <unit bldFile="mds_pub/content_listing_framework_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="metadataengine" name="Metadata Engine" level="eng">
+   <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
+    <unit bldFile="metadataengine/common/group"/>
+   </component>
+   <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+    <unit bldFile="metadataengine/server/group"/>
+   </component>
+   <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+    <unit bldFile="metadataengine/client/group"/>
+   </component>
+   <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+    <!--make this collection a single component, or split this bld.inf into the other units  -->
+    <unit bldFile="metadataengine/group"/>
+   </component>
+  </collection>
+  <collection id="locationmanager" name="Location Manager" level="mgr">
+   <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+    <unit bldFile="locationmanager/locationtrail/group"/>
+   </component>
+   <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+    <unit bldFile="locationmanager/server/group"/>
+   </component>
+   <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+    <unit bldFile="locationmanager/client/group"/>
+   </component>
+   <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+    <!--make this collection a single component, or split this bld.inf into the other units  -->
+    <unit bldFile="locationmanager/group"/>
+   </component>
+  </collection>
+  <collection id="contextengine" name="Context Engine" level="eng">
+   <component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
+    <unit bldFile="contextengine/plugins/group"/>
+   </component>
+   <component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+    <!--make this collection a single component, or make this unit self-contained  -->
+    <unit bldFile="contextengine/group"/>
+   </component>
+  </collection>
+  <collection id="harvester" name="Harvester" level="eng">
+   <component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
+    <unit bldFile="harvester/blacklistclient/group"/>
+   </component>
+   <component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
+    <unit bldFile="harvester/blacklistserver/group"/>
+   </component>
+   <component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
+    <unit bldFile="harvester/common/group"/>
+   </component>
+   <component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
+    <unit bldFile="harvester/composerplugins/group"/>
+   </component>
+   <component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
+    <unit bldFile="harvester/harvesterplugins/group"/>
+   </component>
+   <component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
+    <unit bldFile="harvester/monitorplugins/group"/>
+   </component>
+   <component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
+    <unit bldFile="harvester/server/group"/>
+   </component>
+   <component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
+    <unit bldFile="harvester/client/group"/>
+   </component>
+   <component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+    <!-- split these exports into the other components -->
+    <unit bldFile="harvester/group"/>
+   </component>
+  </collection>
+  <collection id="watchdog" name="Watchdog" level="server">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
+    <unit bldFile="watchdog/group"/>
+   </component>
+  </collection>
+  <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+   <!-- collection is really a component. Move down a directory -->
+   <meta rel="config">
+    <defined condition="RD_MDS_2_5"/>
+   </meta>
+   <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+    <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+    <!--<unit bldFile="clfwrapper/group"/>-->
+   </component>
+  </collection>
+  <collection id="mds_info" name="Metadata Services Info" level="int">
+   <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
+    <!-- consider distributiing this into the rest of the components in the package -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/mds/package_definition_3.0.xml
--- a/symbian4/mw/mds/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="mds" name="Metadata Services" levels="mgr eng server int">
-  <collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
-   <component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_plat/context_engine_plugin_api/context_engine_plugin_api.metaxml"/>
-    <unit bldFile="mds_plat/context_engine_plugin_api/group" filter="!test"/>
-    <unit bldFile="mds_plat/context_engine_plugin_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_plat/harvester_framework_api/harvester_framework_api.metaxml"/>
-    <unit bldFile="mds_plat/harvester_framework_api/group" filter="!test"/>
-    <unit bldFile="mds_plat/harvester_framework_api/tsrc/group" filter="test,api_test"/>
-		<!-- can only have one unit with the same filter, #include the following from the previous unit -->
-    <unit bldFile="mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
-    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
-    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
-    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
-    <unit bldFile="mds_plat/harvester_framework_api/tsrc/monitorplugintest/group" filter="test,api_test"/>
-   </component>
-   <component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_plat/location_manager_api/location_manager_api.metaxml"/>
-    <unit bldFile="mds_plat/location_manager_api/group" filter="!test"/>
-    <unit bldFile="mds_plat/location_manager_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_plat/metadata_engine_api/metadata_engine_api.metaxml"/>
-    <unit bldFile="mds_plat/metadata_engine_api/group" filter="!test"/>
-    <unit bldFile="mds_plat/metadata_engine_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_plat/content_listing_framework_collection_manager_api/content_listing_framework_collection_manager_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_MDS_2_5"/>
-    </meta>
-    <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
-    <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_plat/content_listing_framework_extended_api/content_listing_framework_extended_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_MDS_2_5"/>
-    </meta>
-    <unit bldFile="mds_plat/content_listing_framework_extended_api/group"/>
-   </component>
-  </collection>
-  <collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
-   <component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
-    <meta rel="Api" href="mds_pub/content_listing_framework_api/content_listing_framework_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_MDS_2_5"/>
-    </meta>
-    <unit bldFile="mds_pub/content_listing_framework_api/group" filter="!test"/>
-    <unit bldFile="mds_pub/content_listing_framework_api/tsrc/group" filter="test,api_test"/>
-   </component>
-  </collection>
-  <collection id="metadataengine" name="Metadata Engine" level="eng">
-   <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
-    <unit bldFile="metadataengine/common/group"/>
-   </component>
-   <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
-    <unit bldFile="metadataengine/server/group"/>
-   </component>
-   <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
-    <unit bldFile="metadataengine/client/group"/>
-   </component>
-   <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
-    <!--make this collection a single component, or split this bld.inf into the other units  -->
-    <unit bldFile="metadataengine/group"/>
-   </component>
-  </collection>
-  <collection id="locationmanager" name="Location Manager" level="mgr">
-   <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
-    <unit bldFile="locationmanager/locationtrail/group"/>
-   </component>
-   <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
-    <unit bldFile="locationmanager/server/group"/>
-   </component>
-   <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
-    <unit bldFile="locationmanager/client/group"/>
-   </component>
-   <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
-    <!--make this collection a single component, or split this bld.inf into the other units  -->
-    <unit bldFile="locationmanager/group"/>
-   </component>
-  </collection>
-  <collection id="contextengine" name="Context Engine" level="eng">
-   <component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
-    <unit bldFile="contextengine/plugins/group"/>
-   </component>
-   <component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
-    <!--make this collection a single component, or make this unit self-contained  -->
-    <unit bldFile="contextengine/group"/>
-   </component>
-  </collection>
-  <collection id="harvester" name="Harvester" level="eng">
-   <component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
-    <unit bldFile="harvester/blacklistclient/group"/>
-   </component>
-   <component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
-    <unit bldFile="harvester/blacklistserver/group"/>
-   </component>
-   <component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
-    <unit bldFile="harvester/common/group"/>
-   </component>
-   <component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
-    <unit bldFile="harvester/composerplugins/group"/>
-   </component>
-   <component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
-    <unit bldFile="harvester/harvesterplugins/group"/>
-   </component>
-   <component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
-    <unit bldFile="harvester/monitorplugins/group"/>
-   </component>
-   <component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
-    <unit bldFile="harvester/server/group"/>
-   </component>
-   <component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
-    <unit bldFile="harvester/client/group"/>
-   </component>
-   <component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
-    <!-- split these exports into the other components -->
-    <unit bldFile="harvester/group"/>
-   </component>
-  </collection>
-  <collection id="watchdog" name="Watchdog" level="server">
-   <!-- collection is really a component. Move down a directory -->
-   <component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
-    <unit bldFile="watchdog/group"/>
-   </component>
-  </collection>
-  <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
-   <!-- collection is really a component. Move down a directory -->
-   <meta rel="config">
-    <defined condition="RD_MDS_2_5"/>
-   </meta>
-   <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-    <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-    <!--<unit bldFile="clfwrapper/group"/>-->
-   </component>
-  </collection>
-  <collection id="mds_info" name="Metadata Services Info" level="int">
-   <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
-    <!-- consider distributiing this into the rest of the components in the package -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/messagingmw/package_definition.xml
--- a/symbian4/mw/messagingmw/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/messagingmw/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,174 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
-        <collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
-          <component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-          </component>
-          <component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-          </component>
-          <component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-          </component>
-          <component name="muiu_utils_api" long-name="Messaging Center UI Utilities API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_plat/muiu_utils_api/group"/>
-          </component>
-        </collection>
-        <collection name="msgbranched" long-name="Messaging Branched" level="support">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build" class="config">
-            <unit bldFile="/sf/mw/messagingmw/msgbranched/group"/>
-          </component>
-        </collection>
-        <collection name="messagingfw" long-name="Messaging Framework" level="fw">
-          <!-- should break this collection up into smaller related collections -->
-          <component name="send_ui_api" long-name="Send UI API" filter="s60" deprecated="^4" class="api">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/send_ui_api/group"/>
-          </component>
-          <component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" deprecated="^4" class="api">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/send_ui_plugin_api/group"/>
-          </component>
-          <component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" deprecated="^4" class="api">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/send_ui_datautils_api/group"/>
-          </component>
-          <component name="alwaysonline" filter="s60" long-name="Always Online Server" introduced="^2">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/group"/>
-          </component>
-          <component name="msgcommonutils" filter="s60" long-name="Messaging Common Utils" introduced="^2">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/msgcommonutils/group"/>
-          </component>
-          <component name="senduiservices" filter="s60" long-name="Send UI Services" introduced="^2" deprecated="^4">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/deprecate/senduiservices/group"/>
-          </component>
-          <component name="muiuutils" long-name="Messaging Center UI Utilities" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/muiuutils/group"/>
-          </component>
-          <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-          </component>
-          <component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="/sf/mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-          </component>
-          <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/group" mrp="/sf/mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-          </component>
-          <component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/msgconf/group" mrp="/sf/mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-          </component>
-          <component name="watcherfw" long-name="Watcher Framework" purpose="optional">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/watcherfw/group" mrp="/sf/mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-          </component>
-          <component name="msgtest" long-name="Messaging Test" purpose="development">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/group" mrp="/sf/mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-          </component>
-          <component name="msgtests" long-name="Messaging Tests" purpose="development" filter="test">
-            <unit mrp="/sf/mw/messagingmw/messagingfw/msgtests/group/messaging.mrp" bldFile="/sf/mw/messagingmw/messagingfw/msgtests/group"/>
-          </component>
-          <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
-            <unit mrp="/sf/mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="/sf/mw/messagingmw/messagingfw/msgtestfw/group"/>
-          </component>
-          <component name="msgtestproduct" long-name="Messaging Test Product" purpose="development" filter="test">
-            <unit mrp="/sf/mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="/sf/mw/messagingmw/messagingfw/msgtestproduct/group"/>
-          </component>
-          <component name="sendas" long-name="Send As" purpose="optional">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/group" mrp="/sf/mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-          </component>
-          <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/msgurlhandler/group" mrp="/sf/mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-          </component>
-          <component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/group" mrp="/sf/mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-          </component>
-          <component name="suplsmshandler" long-name="SUPL SMS Handler" introduced="^2" purpose="development" plugin="Y">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="/sf/mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-          </component>
-          <component name="suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-          </component>
-        </collection>
-        <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-          <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="messagingmw" name="Messaging Middleware" levels="stack support fw api">
+  <collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+   <component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="msgfw_plat/always_online_plugin_api/always_online_plugin_api.metaxml"/>
+    <unit bldFile="msgfw_plat/always_online_plugin_api/group"/>
+   </component>
+   <component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+    <meta rel="Api" href="msgfw_plat/always_online_client_api/always_online_client_api.metaxml"/>
+    <unit bldFile="msgfw_plat/always_online_client_api/group"/>
+   </component>
+   <component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+    <meta rel="Api" href="msgfw_plat/msg_common_utils_api/msg_common_utils_api.metaxml"/>
+    <unit bldFile="msgfw_plat/msg_common_utils_api/group"/>
+   </component>
+   <component id="muiu_utils_api" name="Messaging Center UI Utilities API" class="api" filter="s60" introduced="^4">
+      <unit bldFile="msgfw_plat/muiu_utils_api/group"/>
+   </component>
+  </collection>
+  <collection id="msgbranched" name="Messaging Branched" level="support">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="msgbranched_build" filter="s60" name="Messaging Branched Build" class="config">
+    <unit bldFile="msgbranched/group"/>
+   </component>
+  </collection>
+  <collection id="messagingfw" name="Messaging Framework" level="fw">
+   <!-- should break this collection up into smaller related collections -->
+   <component id="send_ui_api" name="Send UI API" class="api" filter="s60" deprecated="^4">
+    <meta rel="Api" href="messagingfw/deprecate/send_ui_api/send_ui_api.metaxml"/>
+    <unit bldFile="messagingfw/deprecate/send_ui_api/group"/>
+   </component>
+   <component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60" deprecated="^4">
+    <meta rel="Api" href="messagingfw/deprecate/send_ui_plugin_api/send_ui_plugin_api.metaxml"/>
+    <unit bldFile="messagingfw/deprecate/send_ui_plugin_api/group"/>
+   </component>
+   <component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60" deprecated="^4">
+    <meta rel="Api" href="messagingfw/deprecate/send_ui_datautils_api/send_ui_datautils_api.metaxml"/>
+    <unit bldFile="messagingfw/deprecate/send_ui_datautils_api/group"/>
+   </component>
+   <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+    <unit bldFile="messagingfw/alwaysonline/group"/>
+   </component>
+   <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+    <unit bldFile="messagingfw/msgcommonutils/group"/>
+   </component>
+   <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2" deprecated="^4">
+    <unit bldFile="messagingfw/deprecate/senduiservices/group"/>
+   </component>
+   <component id="muiuutils" name="Messaging Center UI Utilities" class="api" filter="s60" introduced="^4">
+      <unit bldFile="messagingfw/muiuutils/group"/>
+   </component>
+   <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+    <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+   </component>
+   <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+    <unit bldFile="messagingfw/msgsrvnstore/group" mrp="messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+   </component>
+   <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+    <unit bldFile="messagingfw/biomsgfw/group" mrp="messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+   </component>
+   <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+    <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
+   </component>
+   <component id="watcherfw" name="Watcher Framework" purpose="optional">
+    <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+   </component>
+   <component id="msgtest" name="Messaging Test" purpose="development">
+    <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
+   </component>
+   <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtests/group/messaging.mrp" bldFile="messagingfw/msgtests/group"/>
+   </component>
+   <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
+   </component>
+   <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
+   </component>
+   <component id="sendas" name="Send As" purpose="optional">
+    <unit bldFile="messagingfw/sendas/group" mrp="messagingfw/sendas/group/messaging_sendas2.mrp"/>
+   </component>
+   <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+    <unit bldFile="messagingfw/msgurlhandler/group" mrp="messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+   </component>
+   <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+    <unit bldFile="messagingfw/wappushfw/group" mrp="messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+   </component>
+   <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+    <unit bldFile="messagingfw/suplsmshandler/group" mrp="messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+   </component>
+   <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+   </component>
+  </collection>
+  <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+   <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/messagingmw/package_definition_3.0.xml
--- a/symbian4/mw/messagingmw/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="messagingmw" name="Messaging Middleware" levels="stack support fw api">
-  <collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
-   <component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="msgfw_plat/always_online_plugin_api/always_online_plugin_api.metaxml"/>
-    <unit bldFile="msgfw_plat/always_online_plugin_api/group"/>
-   </component>
-   <component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
-    <meta rel="Api" href="msgfw_plat/always_online_client_api/always_online_client_api.metaxml"/>
-    <unit bldFile="msgfw_plat/always_online_client_api/group"/>
-   </component>
-   <component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
-    <meta rel="Api" href="msgfw_plat/msg_common_utils_api/msg_common_utils_api.metaxml"/>
-    <unit bldFile="msgfw_plat/msg_common_utils_api/group"/>
-   </component>
-   <component id="muiu_utils_api" name="Messaging Center UI Utilities API" class="api" filter="s60" introduced="^4">
-      <unit bldFile="msgfw_plat/muiu_utils_api/group"/>
-   </component>
-  </collection>
-  <collection id="msgbranched" name="Messaging Branched" level="support">
-   <!-- collection is really a component. Need to move down a directory -->
-   <component id="msgbranched_build" filter="s60" name="Messaging Branched Build" class="config">
-    <unit bldFile="msgbranched/group"/>
-   </component>
-  </collection>
-  <collection id="messagingfw" name="Messaging Framework" level="fw">
-   <!-- should break this collection up into smaller related collections -->
-   <component id="send_ui_api" name="Send UI API" class="api" filter="s60" deprecated="^4">
-    <meta rel="Api" href="messagingfw/deprecate/send_ui_api/send_ui_api.metaxml"/>
-    <unit bldFile="messagingfw/deprecate/send_ui_api/group"/>
-   </component>
-   <component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60" deprecated="^4">
-    <meta rel="Api" href="messagingfw/deprecate/send_ui_plugin_api/send_ui_plugin_api.metaxml"/>
-    <unit bldFile="messagingfw/deprecate/send_ui_plugin_api/group"/>
-   </component>
-   <component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60" deprecated="^4">
-    <meta rel="Api" href="messagingfw/deprecate/send_ui_datautils_api/send_ui_datautils_api.metaxml"/>
-    <unit bldFile="messagingfw/deprecate/send_ui_datautils_api/group"/>
-   </component>
-   <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
-    <unit bldFile="messagingfw/alwaysonline/group"/>
-   </component>
-   <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
-    <unit bldFile="messagingfw/msgcommonutils/group"/>
-   </component>
-   <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2" deprecated="^4">
-    <unit bldFile="messagingfw/deprecate/senduiservices/group"/>
-   </component>
-   <component id="muiuutils" name="Messaging Center UI Utilities" class="api" filter="s60" introduced="^4">
-      <unit bldFile="messagingfw/muiuutils/group"/>
-   </component>
-   <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
-    <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-   </component>
-   <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
-    <unit bldFile="messagingfw/msgsrvnstore/group" mrp="messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-   </component>
-   <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-    <unit bldFile="messagingfw/biomsgfw/group" mrp="messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-   </component>
-   <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
-    <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
-   </component>
-   <component id="watcherfw" name="Watcher Framework" purpose="optional">
-    <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-   </component>
-   <component id="msgtest" name="Messaging Test" purpose="development">
-    <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
-   </component>
-   <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
-    <unit mrp="messagingfw/msgtests/group/messaging.mrp" bldFile="messagingfw/msgtests/group"/>
-   </component>
-   <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
-    <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
-   </component>
-   <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
-    <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
-   </component>
-   <component id="sendas" name="Send As" purpose="optional">
-    <unit bldFile="messagingfw/sendas/group" mrp="messagingfw/sendas/group/messaging_sendas2.mrp"/>
-   </component>
-   <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
-    <unit bldFile="messagingfw/msgurlhandler/group" mrp="messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-   </component>
-   <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
-    <unit bldFile="messagingfw/wappushfw/group" mrp="messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-   </component>
-   <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
-    <unit bldFile="messagingfw/suplsmshandler/group" mrp="messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-   </component>
-   <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
-    <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-   </component>
-  </collection>
-  <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
-   <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/metadatasrv/package_definition.xml
--- a/symbian4/mw/metadatasrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/metadatasrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,98 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
-        <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
-          <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
-          </component>
-        </collection>
-        <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
-          <component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
-          </component>
-        </collection>
-        <collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
-          <component name="mediafetch" filter="s60" long-name="Media Fetch">
-            <unit bldFile="/sf/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+  <collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+   <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+    <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
+    <unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
+   </component>
+  </collection>
+  <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+   <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+    <meta rel="Api" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
+    <unit bldFile="metadatasrv_plat/media_fetch_implementation_api/group"/>
+   </component>
+  </collection>
+  <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
+   <component id="mediafetch" filter="s60" name="Media Fetch">
+    <unit bldFile="mediamanagementutilities/mediafetch/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/metadatasrv/package_definition_3.0.xml
--- a/symbian4/mw/metadatasrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
-  <collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
-   <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
-    <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
-    <unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
-   </component>
-  </collection>
-  <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
-   <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
-    <meta rel="Api" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
-    <unit bldFile="metadatasrv_plat/media_fetch_implementation_api/group"/>
-   </component>
-  </collection>
-  <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
-   <component id="mediafetch" filter="s60" name="Media Fetch">
-    <unit bldFile="mediamanagementutilities/mediafetch/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/mmappfw/package_definition.xml
--- a/symbian4/mw/mmappfw/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,217 +1,170 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
-        <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-          <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-          </component>
-          <component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-          </component>
-          <component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-          </component>
-          <component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-          </component>
-          <component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-          </component>
-          <component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-          </component>
-          <component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
-          </component>
-          <component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-          </component>
-          <component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
-          </component>
-          <component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-          </component>
-          <component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-          </component>
-          <component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-          </component>
-          <component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-          </component>
-          <component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-          </component>
-          <component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-          </component>
-          <component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-          </component>
-          <component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-          </component>
-          <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-          </component>
-          <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-          </component>
-          <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
-          </component>
-          <component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
-          </component>
-        </collection>
-        <collection name="mpx" long-name="Multimedia Player" level="fw">
-          <component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mpx/commonframework/group"/>
-          </component>
-          <component name="playbackframework" filter="s60" long-name="MPX Playback Framework" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mpx/playbackframework/group"/>
-          </component>
-          <component name="mpxcollectionfw" filter="s60" long-name="MPX Collection Framework" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mpx/collectionframework/group"/>
-          </component>
-          <component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mpx/viewframework/group"/>
-          </component>
-          <component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-            <unit bldFile="/sf/mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
-          </component>
-          <component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
-            <!--  Move the export to another component or remove the #includes from this one -->
-            <unit bldFile="/sf/mw/mmappfw/mpx/group"/>
-          </component>
-        </collection>
-        <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
-          <component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-            <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="mmappfw" name="Multimedia App Framework" levels="fw utils if">
+  <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
+   <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/collection_helper_api/collection_helper_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/collection_helper_api/group"/>
+   </component>
+   <component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/harvester_collection_mediator_api/harvester_collection_mediator_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/harvester_collection_mediator_api/group"/>
+   </component>
+   <component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/harvester_metadata_extractor_api/harvester_metadata_extractor_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/harvester_metadata_extractor_api/group"/>
+   </component>
+   <component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/harvester_server_api/harvester_server_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/harvester_server_api/group"/>
+   </component>
+   <component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/harvester_utility_api/harvester_utility_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/harvester_utility_api/group"/>
+   </component>
+   <component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/playlist_engine_api/playlist_engine_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/playlist_engine_api/group"/>
+   </component>
+   <component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mtp_keys_api/mtp_keys_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mtp_keys_api/group"/>
+   </component>
+   <component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_collection_common_definition_api/mpx_collection_common_definition_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_collection_common_definition_api/group"/>
+   </component>
+   <component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_collection_utility_api/mpx_collection_utility_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_collection_utility_api/group"/>
+   </component>
+   <component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_common_api/mpx_common_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_common_api/group"/>
+   </component>
+   <component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_common_definition_api/mpx_common_definition_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_common_definition_api/group"/>
+   </component>
+   <component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_playback_common_definition_api/mpx_playback_common_definition_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_playback_common_definition_api/group"/>
+   </component>
+   <component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_playback_utility_api/mpx_playback_utility_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_playback_utility_api/group"/>
+   </component>
+   <component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_base_view_plugins_api/mpx_base_view_plugins_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_base_view_plugins_api/group"/>
+   </component>
+   <component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_view_utility_api/mpx_view_utility_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_view_utility_api/group"/>
+   </component>
+   <component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_albumart_utility_api/mpx_albumart_utility_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/mpx_albumart_utility_api/group"/>
+   </component>
+   <component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/media_player_settings_engine_api/media_player_settings_engine_api.metaxml"/>
+    <unit bldFile="mmappfw_plat/media_player_settings_engine_api/group"/>
+   </component>
+   <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/mpx_backstepping_utility_api/mpx_backstepping_utility_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+    </meta>
+    <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/>
+   </component>
+   <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/asx_parser_api/asx_parser_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA"/>
+    </meta>
+    <unit bldFile="mmappfw_plat/asx_parser_api/group"/>
+   </component>
+   <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+    <unit bldFile="mmappfw_plat/playback_helper_api/group"/>
+   </component>
+   <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
+    <unit bldFile="mmappfw_plat/videoplaylist_utility_api/group"/>
+   </component>
+  </collection>
+  <collection id="mpx" name="Multimedia Player" level="fw">
+   <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
+    <unit bldFile="mpx/commonframework/group"/>
+   </component>
+   <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+    <unit bldFile="mpx/playbackframework/group"/>
+   </component>
+   <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+    <unit bldFile="mpx/collectionframework/group"/>
+   </component>
+   <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+    <unit bldFile="mpx/viewframework/group"/>
+   </component>
+   <component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
+      <unit bldFile="mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>
+   <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+    <!--  Move the export to another component or remove the #includes from this one -->
+    <unit bldFile="mpx/group"/>
+   </component>
+  </collection>
+  <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+   <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/group"/>
-          </component>
-          <component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-          </component>
-          <component name="playlistengine" filter="s60" long-name="Playlist Engine" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/playlistengine/group"/>
-          </component>
-          <component name="mpxharvester" filter="s60" long-name="Media Player Harvester" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/harvester/group"/>
-          </component>
-          <component name="mmappcommonui" filter="s60" long-name="Multimedia App Common UI" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-          </component>
-          <component name="mediaplayersettingsengine" filter="s60" long-name="Media Player Settings Engine" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-          </component>
-          <component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-            <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-            <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-          </component>
-          <component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-            <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-            <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-          </component>
-          <component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
-          </component>
-          <component name="videoplaylistutility" filter="s60" long-name="Video Playlist Utility" introduced="^3">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
-          </component>
-          <component name="mmmtpdataprovider" filter="s60" long-name="Multimedia MTP Data Provider" introduced="^3">
-            <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
-          </component>
-        </collection>
-        <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
-          <component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
-            <!--  Move the export to another component or remove the #includes from this one -->
-            <unit bldFile="/sf/mw/mmappfw/group"/>
-          </component>
-          <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1">
-            <unit bldFile="/sf/mw/mmappfw/tsrc/group" filter="TA_MMAPPFW"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="mmappcomponents/group"/>
+   </component>
+   <component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
+    <unit bldFile="mmappcomponents/collectionhelper/group"/>
+   </component>
+   <component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
+    <unit bldFile="mmappcomponents/playlistengine/group"/>
+   </component>
+   <component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
+    <unit bldFile="mmappcomponents/harvester/group"/>
+   </component>
+   <component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
+    <unit bldFile="mmappcomponents/mmappcommonui/group"/>
+   </component>
+   <component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
+    <unit bldFile="mmappcomponents/mediaplayersettingsengine/group"/>
+   </component>
+   <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
+    <meta rel="config">
+     <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+    </meta>
+    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+    <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+   </component>
+   <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA"/>
+    </meta>
+    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+    <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+   </component>
+   <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+    <unit bldFile="mmappcomponents/playbackhelper/group"/>
+   </component>
+   <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+    <unit bldFile="mmappcomponents/videoplaylistutility/group"/>
+   </component>
+   <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+    <unit bldFile="mmappcomponents/mmmtpdataprovider/group"/>
+   </component>
+  </collection>
+  <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
+   <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
+    <!--  Move the export to another component or remove the #includes from this one -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+    <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/mmappfw/package_definition_3.0.xml
--- a/symbian4/mw/mmappfw/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="mmappfw" name="Multimedia App Framework" levels="fw utils if">
-  <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
-   <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/collection_helper_api/collection_helper_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/collection_helper_api/group"/>
-   </component>
-   <component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/harvester_collection_mediator_api/harvester_collection_mediator_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/harvester_collection_mediator_api/group"/>
-   </component>
-   <component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/harvester_metadata_extractor_api/harvester_metadata_extractor_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/harvester_metadata_extractor_api/group"/>
-   </component>
-   <component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/harvester_server_api/harvester_server_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/harvester_server_api/group"/>
-   </component>
-   <component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/harvester_utility_api/harvester_utility_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/harvester_utility_api/group"/>
-   </component>
-   <component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/playlist_engine_api/playlist_engine_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/playlist_engine_api/group"/>
-   </component>
-   <component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mtp_keys_api/mtp_keys_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mtp_keys_api/group"/>
-   </component>
-   <component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_collection_common_definition_api/mpx_collection_common_definition_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_collection_common_definition_api/group"/>
-   </component>
-   <component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_collection_utility_api/mpx_collection_utility_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_collection_utility_api/group"/>
-   </component>
-   <component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_common_api/mpx_common_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_common_api/group"/>
-   </component>
-   <component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_common_definition_api/mpx_common_definition_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_common_definition_api/group"/>
-   </component>
-   <component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_playback_common_definition_api/mpx_playback_common_definition_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_playback_common_definition_api/group"/>
-   </component>
-   <component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_playback_utility_api/mpx_playback_utility_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_playback_utility_api/group"/>
-   </component>
-   <component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_base_view_plugins_api/mpx_base_view_plugins_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_base_view_plugins_api/group"/>
-   </component>
-   <component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_view_utility_api/mpx_view_utility_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_view_utility_api/group"/>
-   </component>
-   <component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_albumart_utility_api/mpx_albumart_utility_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/mpx_albumart_utility_api/group"/>
-   </component>
-   <component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/media_player_settings_engine_api/media_player_settings_engine_api.metaxml"/>
-    <unit bldFile="mmappfw_plat/media_player_settings_engine_api/group"/>
-   </component>
-   <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/mpx_backstepping_utility_api/mpx_backstepping_utility_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
-    </meta>
-    <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/>
-   </component>
-   <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
-    <meta rel="Api" href="mmappfw_plat/asx_parser_api/asx_parser_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="__WINDOWS_MEDIA"/>
-    </meta>
-    <unit bldFile="mmappfw_plat/asx_parser_api/group"/>
-   </component>
-   <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
-    <unit bldFile="mmappfw_plat/playback_helper_api/group"/>
-   </component>
-   <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
-    <unit bldFile="mmappfw_plat/videoplaylist_utility_api/group"/>
-   </component>
-  </collection>
-  <collection id="mpx" name="Multimedia Player" level="fw">
-   <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
-    <unit bldFile="mpx/commonframework/group"/>
-   </component>
-   <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
-    <unit bldFile="mpx/playbackframework/group"/>
-   </component>
-   <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
-    <unit bldFile="mpx/collectionframework/group"/>
-   </component>
-   <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
-    <unit bldFile="mpx/viewframework/group"/>
-   </component>
-   <component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
-      <unit bldFile="mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
-   </component>
-   <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
-    <!--  Move the export to another component or remove the #includes from this one -->
-    <unit bldFile="mpx/group"/>
-   </component>
-  </collection>
-  <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
-   <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
-      		Can remove this once configuration is in place-->
-    <unit bldFile="mmappcomponents/group"/>
-   </component>
-   <component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
-    <unit bldFile="mmappcomponents/collectionhelper/group"/>
-   </component>
-   <component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
-    <unit bldFile="mmappcomponents/playlistengine/group"/>
-   </component>
-   <component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
-    <unit bldFile="mmappcomponents/harvester/group"/>
-   </component>
-   <component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
-    <unit bldFile="mmappcomponents/mmappcommonui/group"/>
-   </component>
-   <component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
-    <unit bldFile="mmappcomponents/mediaplayersettingsengine/group"/>
-   </component>
-   <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
-    <meta rel="config">
-     <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
-    </meta>
-    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-    <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-   </component>
-   <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
-    <meta rel="config">
-     <defined condition="__WINDOWS_MEDIA"/>
-    </meta>
-    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-    <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-   </component>
-   <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
-    <unit bldFile="mmappcomponents/playbackhelper/group"/>
-   </component>
-   <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
-    <unit bldFile="mmappcomponents/videoplaylistutility/group"/>
-   </component>
-   <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
-    <unit bldFile="mmappcomponents/mmmtpdataprovider/group"/>
-   </component>
-  </collection>
-  <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
-   <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
-    <!--  Move the export to another component or remove the #includes from this one -->
-    <unit bldFile="group"/>
-   </component>
-   <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
-    <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/mmmw/package_definition.xml
--- a/symbian4/mw/mmmw/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,231 +1,176 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-        <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-          <component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-          </component>
-          <component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-          </component>
-          <component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-          </component>
-          <component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-          </component>
-          <component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-          </component>
-          <component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-          </component>
-          <component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-          </component>
-          <component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-          </component>
-          <component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-          </component>
-          <component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-          </component>
-          <component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-          </component>
-          <component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-          </component>
-          <component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-          </component>
-          <component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-          </component>
-          <component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-          </component>
-          <component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-          </component>
-          <component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-          </component>
-          <component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-          </component>
-          <component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-          </component>
-          <component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-          </component>
-          <component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-          </component>
-          <component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-          </component>
-          <component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-          </component>
-          <component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/openmax_al_api/group"/>
-          </component>
-          <component name="system_tone_service_api" long-name="System Tone Service API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
-          </component>
-        </collection>
-        <collection name="mmfenh" long-name="MMF Enhancements" level="generic">
-          <component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
-          </component>
-          <component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
-          </component>
-          <component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
-          </component>
-          <component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
-          </component>
-          <component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
-          </component>
-          <component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
-          </component>
-          <component name="progressivedownload" filter="s60" long-name="Progressive Download">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/progressivedownload/group"/>
-          </component>
-          <component name="mmfenh_test" filter="s60,test,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development">
-            <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
-          </component>
-        </collection>
-        <collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-          <!-- Id needs to be unique, mmfw already in use -->
-          <!-- Placeholder for OpenAX AL and other stuff -->
-        </collection>
-        <collection name="mmserv" long-name="Multimedia Services" level="specific">
-          <component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-            <unit bldFile="/sf/mw/mmmw/mmserv/audioeffectsui/group"/>
-          </component>
-          <component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
-            <unit bldFile="/sf/mw/mmmw/mmserv/callaudiocontrol/group"/>
-          </component>
-          <component name="metadatautility" filter="s60" long-name="Metadata Utility">
-            <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/group"/>
-          </component>
-          <component name="radioutility" filter="s60" long-name="Radio Utility">
-            <unit bldFile="/sf/mw/mmmw/mmserv/radioutility/group"/>
-          </component>
-          <component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
-            <unit bldFile="/sf/mw/mmmw/mmserv/thumbnailengine/group"/>
-          </component>
-          <component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
-            <unit bldFile="/sf/mw/mmmw/mmserv/tms/group"/>
-          </component>
-          <component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
-            <unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
-          </component>
-          <component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
-            <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
-          </component>
-          <component name="sts" long-name="System Tone Service" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/mmmw/mmserv/sts/group"/>
-          </component>
-        </collection>
-        <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-          <component name="mmmw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia Middleware Tests" purpose="development">
-            <unit bldFile="/sf/mw/mmmw/tsrc/group"/>
-          </component>
-          <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
+  <collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
+   <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/multimedia_data_source_api/multimedia_data_source_api.metaxml"/>
+    <unit bldFile="mmmw_plat/multimedia_data_source_api/group"/>
+   </component>
+   <component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/progressive_download_api/progressive_download_api.metaxml"/>
+    <unit bldFile="mmmw_plat/progressive_download_api/group"/>
+   </component>
+   <component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/equalizer_ui_api/equalizer_ui_api.metaxml"/>
+    <unit bldFile="mmmw_plat/equalizer_ui_api/group"/>
+   </component>
+   <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/enhanced_media_client_api/enhanced_media_client_api.metaxml"/>
+    <unit bldFile="mmmw_plat/enhanced_media_client_api/group"/>
+   </component>
+   <component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/stream_control_custom_command_api/stream_control_custom_command_api.metaxml"/>
+    <unit bldFile="mmmw_plat/stream_control_custom_command_api/group"/>
+   </component>
+   <component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_buffer_source_api/emc_buffer_source_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_buffer_source_api/group"/>
+   </component>
+   <component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_file_source_api/emc_file_source_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_file_source_api/group"/>
+   </component>
+   <component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/audio_metadata_reader_api/audio_metadata_reader_api.metaxml"/>
+    <unit bldFile="mmmw_plat/audio_metadata_reader_api/group"/>
+   </component>
+   <component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_progressive_download_source_api/emc_progressive_download_source_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_progressive_download_source_api/group"/>
+   </component>
+   <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_volume_effect_api/emc_volume_effect_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_volume_effect_api/group"/>
+   </component>
+   <component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
+    <unit bldFile="mmmw_plat/emc_balance_effect_api/group"/>
+   </component>
+   <component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_descriptor_source_api/emc_descriptor_source_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_descriptor_source_api/group"/>
+   </component>
+   <component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_drm_config_intfc_api/emc_drm_config_intfc_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_drm_config_intfc_api/group"/>
+   </component>
+   <component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/voip_audio_services_api/voip_audio_services_api.metaxml"/>
+    <unit bldFile="mmmw_plat/voip_audio_services_api/group"/>
+   </component>
+   <component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/configuration_components_factory_api/configuration_components_factory_api.metaxml"/>
+    <unit bldFile="mmmw_plat/configuration_components_factory_api/group"/>
+   </component>
+   <component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/audio_output_control_utility_api/audio_output_control_utility_api.metaxml"/>
+    <unit bldFile="mmmw_plat/audio_output_control_utility_api/group"/>
+   </component>
+   <component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/audio_output_control_utility_proxy_api/audio_output_control_utility_proxy_api.metaxml"/>
+    <unit bldFile="mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+   </component>
+   <component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/emc_audio_effects_api/emc_audio_effects_api.metaxml"/>
+    <unit bldFile="mmmw_plat/emc_audio_effects_api/group"/>
+   </component>
+   <component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/call_audio_control_api/call_audiocontrol_api.metaxml"/>
+    <unit bldFile="mmmw_plat/call_audio_control_api/group"/>
+   </component>
+   <component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/radio_utilities_api/radio_utilities_api.metaxml"/>
+    <unit bldFile="mmmw_plat/radio_utilities_api/group"/>
+   </component>
+   <component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/radio_preset_utilities_api/radio_preset_utilities_api.metaxml"/>
+    <unit bldFile="mmmw_plat/radio_preset_utilities_api/group"/>
+   </component>
+   <component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/radio_monitor_api/radio_monitor_api.metaxml"/>
+    <unit bldFile="mmmw_plat/radio_monitor_api/group"/>
+   </component>
+   <component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/thumbnail_engine_api/thumbnail_engine_api.metaxml"/>
+    <unit bldFile="mmmw_plat/thumbnail_engine_api/group"/>
+   </component>
+   <component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
+      <meta rel="Api" href="mmmw_plat/openmax_al_api/openmax_al_api.metaxml"/>
+      <unit bldFile="mmmw_plat/openmax_al_api/group"/>
+   </component>
+   <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
+      <unit bldFile="mmmw_plat/system_tone_service_api/group"/>
+   </component>
+  </collection>
+  <collection id="mmfenh" name="MMF Enhancements" level="generic">
+   <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+    <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
+   </component>
+   <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+    <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
+   </component>
+   <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+    <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
+   </component>
+   <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+    <unit bldFile="mmfenh/enhancedaudioplayerutility/group"/>
+   </component>
+   <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+    <unit bldFile="mmfenh/enhancedmediaclient/group"/>
+   </component>
+   <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+    <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
+   </component>
+   <component id="progressivedownload" filter="s60" name="Progressive Download">
+    <unit bldFile="mmfenh/progressivedownload/group"/>
+   </component>
+   <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+    <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+   </component>
+  </collection>
+  <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+   <!-- Id needs to be unique, mmfw already in use -->
+   <!-- Placeholder for OpenAX AL and other stuff -->
+  </collection>
+  <collection id="mmserv" name="Multimedia Services" level="specific">
+   <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+    <unit bldFile="mmserv/audioeffectsui/group"/>
+   </component>
+   <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+    <unit bldFile="mmserv/callaudiocontrol/group"/>
+   </component>
+   <component id="metadatautility" filter="s60" name="Metadata Utility">
+    <unit bldFile="mmserv/metadatautility/group"/>
+   </component>
+   <component id="radioutility" filter="s60" name="Radio Utility">
+    <unit bldFile="mmserv/radioutility/group"/>
+   </component>
+   <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+    <unit bldFile="mmserv/thumbnailengine/group"/>
+   </component>
+   <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+    <unit bldFile="mmserv/tms/group"/>
+   </component>
+   <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+    <unit bldFile="mmserv/voipaudioservices/group"/>
+   </component>
+   <component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+    <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+   </component>
+   <component id="sts" name="System Tone Service" filter="s60" introduced="^4">
+      <unit bldFile="mmserv/sts/group"/>
+   </component>
+  </collection>
+  <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+   <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/mmmw/package_definition_3.0.xml
--- a/symbian4/mw/mmmw/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
-  <collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
-   <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/multimedia_data_source_api/multimedia_data_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/multimedia_data_source_api/group"/>
-   </component>
-   <component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/progressive_download_api/progressive_download_api.metaxml"/>
-    <unit bldFile="mmmw_plat/progressive_download_api/group"/>
-   </component>
-   <component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/equalizer_ui_api/equalizer_ui_api.metaxml"/>
-    <unit bldFile="mmmw_plat/equalizer_ui_api/group"/>
-   </component>
-   <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/enhanced_media_client_api/enhanced_media_client_api.metaxml"/>
-    <unit bldFile="mmmw_plat/enhanced_media_client_api/group"/>
-   </component>
-   <component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/stream_control_custom_command_api/stream_control_custom_command_api.metaxml"/>
-    <unit bldFile="mmmw_plat/stream_control_custom_command_api/group"/>
-   </component>
-   <component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_buffer_source_api/emc_buffer_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_buffer_source_api/group"/>
-   </component>
-   <component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_file_source_api/emc_file_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_file_source_api/group"/>
-   </component>
-   <component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/audio_metadata_reader_api/audio_metadata_reader_api.metaxml"/>
-    <unit bldFile="mmmw_plat/audio_metadata_reader_api/group"/>
-   </component>
-   <component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_progressive_download_source_api/emc_progressive_download_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_progressive_download_source_api/group"/>
-   </component>
-   <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_volume_effect_api/emc_volume_effect_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_volume_effect_api/group"/>
-   </component>
-   <component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
-    <unit bldFile="mmmw_plat/emc_balance_effect_api/group"/>
-   </component>
-   <component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_descriptor_source_api/emc_descriptor_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_descriptor_source_api/group"/>
-   </component>
-   <component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_drm_config_intfc_api/emc_drm_config_intfc_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_drm_config_intfc_api/group"/>
-   </component>
-   <component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/voip_audio_services_api/voip_audio_services_api.metaxml"/>
-    <unit bldFile="mmmw_plat/voip_audio_services_api/group"/>
-   </component>
-   <component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/configuration_components_factory_api/configuration_components_factory_api.metaxml"/>
-    <unit bldFile="mmmw_plat/configuration_components_factory_api/group"/>
-   </component>
-   <component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/audio_output_control_utility_api/audio_output_control_utility_api.metaxml"/>
-    <unit bldFile="mmmw_plat/audio_output_control_utility_api/group"/>
-   </component>
-   <component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/audio_output_control_utility_proxy_api/audio_output_control_utility_proxy_api.metaxml"/>
-    <unit bldFile="mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-   </component>
-   <component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_audio_effects_api/emc_audio_effects_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_audio_effects_api/group"/>
-   </component>
-   <component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/call_audio_control_api/call_audiocontrol_api.metaxml"/>
-    <unit bldFile="mmmw_plat/call_audio_control_api/group"/>
-   </component>
-   <component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/radio_utilities_api/radio_utilities_api.metaxml"/>
-    <unit bldFile="mmmw_plat/radio_utilities_api/group"/>
-   </component>
-   <component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/radio_preset_utilities_api/radio_preset_utilities_api.metaxml"/>
-    <unit bldFile="mmmw_plat/radio_preset_utilities_api/group"/>
-   </component>
-   <component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/radio_monitor_api/radio_monitor_api.metaxml"/>
-    <unit bldFile="mmmw_plat/radio_monitor_api/group"/>
-   </component>
-   <component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/thumbnail_engine_api/thumbnail_engine_api.metaxml"/>
-    <unit bldFile="mmmw_plat/thumbnail_engine_api/group"/>
-   </component>
-   <component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
-    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
-      <meta rel="Api" href="mmmw_plat/openmax_al_api/openmax_al_api.metaxml"/>
-      <unit bldFile="mmmw_plat/openmax_al_api/group"/>
-   </component>
-   <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
-      <unit bldFile="mmmw_plat/system_tone_service_api/group"/>
-   </component>
-  </collection>
-  <collection id="mmfenh" name="MMF Enhancements" level="generic">
-   <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
-    <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
-   </component>
-   <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
-    <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
-   </component>
-   <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
-    <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
-   </component>
-   <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
-    <unit bldFile="mmfenh/enhancedaudioplayerutility/group"/>
-   </component>
-   <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
-    <unit bldFile="mmfenh/enhancedmediaclient/group"/>
-   </component>
-   <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
-    <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
-   </component>
-   <component id="progressivedownload" filter="s60" name="Progressive Download">
-    <unit bldFile="mmfenh/progressivedownload/group"/>
-   </component>
-   <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
-    <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
-   </component>
-  </collection>
-  <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
-   <!-- Id needs to be unique, mmfw already in use -->
-   <!-- Placeholder for OpenAX AL and other stuff -->
-  </collection>
-  <collection id="mmserv" name="Multimedia Services" level="specific">
-   <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
-    <unit bldFile="mmserv/audioeffectsui/group"/>
-   </component>
-   <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
-    <unit bldFile="mmserv/callaudiocontrol/group"/>
-   </component>
-   <component id="metadatautility" filter="s60" name="Metadata Utility">
-    <unit bldFile="mmserv/metadatautility/group"/>
-   </component>
-   <component id="radioutility" filter="s60" name="Radio Utility">
-    <unit bldFile="mmserv/radioutility/group"/>
-   </component>
-   <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
-    <unit bldFile="mmserv/thumbnailengine/group"/>
-   </component>
-   <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
-    <unit bldFile="mmserv/tms/group"/>
-   </component>
-   <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
-    <unit bldFile="mmserv/voipaudioservices/group"/>
-   </component>
-   <component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
-    <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
-   </component>
-   <component id="sts" name="System Tone Service" filter="s60" introduced="^4">
-      <unit bldFile="mmserv/sts/group"/>
-   </component>
-  </collection>
-  <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
-   <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
-    <unit bldFile="tsrc/group"/>
-   </component>
-   <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/netprotocols/package_definition.xml
--- a/symbian4/mw/netprotocols/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/netprotocols/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,165 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-        <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-          <component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-          </component>
-          <component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-          </component>
-          <component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-          </component>
-        </collection>
-        <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-          <component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-          </component>
-          <component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/cookie/group"/>
-          </component>
-          <component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/deflatefilter/group"/>
-          </component>
-          <component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-          </component>
-          <component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-          </component>
-          <component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-          </component>
-          <component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteriop/group"/>
-          </component>
-          <component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-          </component>
-          <component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/httpfilters/uaproffilter/group"/>
-          </component>
-        </collection>
-        <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-          <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-          </component>
-          <component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-          </component>
-          <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-          </component>
-          <component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-          </component>
-          <component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-          </component>
-          <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-          </component>
-          <component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
-          </component>
-        </collection>
-        <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-          <component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-          </component>
-          <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-          </component>
-          <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-          </component>
-          <component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-          </component>
-        </collection>
-        <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-          <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="netprotocols" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+  <collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
+   <component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
+    <meta rel="Api" href="netprotocols_plat/cookie_manager_api/cookie_manager_api.metaxml"/>
+    <unit bldFile="netprotocols_plat/cookie_manager_api/group"/>
+   </component>
+   <component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
+    <meta rel="Api" href="netprotocols_plat/http_cache_mgr_api/http_cache_mgr_api.metaxml"/>
+    <unit bldFile="netprotocols_plat/http_cache_mgr_api/group"/>
+   </component>
+   <component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+    <meta rel="Api" href="netprotocols_plat/http_filters_api/http_filters_api.metaxml"/>
+    <unit bldFile="netprotocols_plat/http_filters_api/group"/>
+   </component>
+  </collection>
+  <collection id="httpfilters" name="HTTP Filters" level="plugin">
+   <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+    <unit bldFile="httpfilters/httpfiltercommon/group"/>
+   </component>
+   <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+    <unit bldFile="httpfilters/cookie/group"/>
+   </component>
+   <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+    <unit bldFile="httpfilters/deflatefilter/group"/>
+   </component>
+   <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
+   </component>
+   <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilterauthentication/group"/>
+   </component>
+   <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+    <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
+   </component>
+   <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilteriop/group"/>
+   </component>
+   <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilterproxy/group"/>
+   </component>
+   <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+    <unit bldFile="httpfilters/uaproffilter/group"/>
+   </component>
+  </collection>
+  <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+   <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+    <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+   </component>
+   <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+    <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
+   </component>
+   <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+    <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+   </component>
+   <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+    <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+   </component>
+   <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+    <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+   </component>
+   <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+    <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+   </component>
+   <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+    <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
+   </component>
+  </collection>
+  <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+   <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+    <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+   </component>
+   <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+    <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+   </component>
+   <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+    <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+   </component>
+   <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+    <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+   </component>
+  </collection>
+  <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+   <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/netprotocols/package_definition_3.0.xml
--- a/symbian4/mw/netprotocols/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="netprotocols" name="High-level Internet Protocols" levels="plugin framework server generic specific">
-  <collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
-   <component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
-    <meta rel="Api" href="netprotocols_plat/cookie_manager_api/cookie_manager_api.metaxml"/>
-    <unit bldFile="netprotocols_plat/cookie_manager_api/group"/>
-   </component>
-   <component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
-    <meta rel="Api" href="netprotocols_plat/http_cache_mgr_api/http_cache_mgr_api.metaxml"/>
-    <unit bldFile="netprotocols_plat/http_cache_mgr_api/group"/>
-   </component>
-   <component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
-    <meta rel="Api" href="netprotocols_plat/http_filters_api/http_filters_api.metaxml"/>
-    <unit bldFile="netprotocols_plat/http_filters_api/group"/>
-   </component>
-  </collection>
-  <collection id="httpfilters" name="HTTP Filters" level="plugin">
-   <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
-    <unit bldFile="httpfilters/httpfiltercommon/group"/>
-   </component>
-   <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
-    <unit bldFile="httpfilters/cookie/group"/>
-   </component>
-   <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
-    <unit bldFile="httpfilters/deflatefilter/group"/>
-   </component>
-   <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
-    <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
-   </component>
-   <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
-    <unit bldFile="httpfilters/httpfilterauthentication/group"/>
-   </component>
-   <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
-    <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
-   </component>
-   <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
-    <unit bldFile="httpfilters/httpfilteriop/group"/>
-   </component>
-   <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
-    <unit bldFile="httpfilters/httpfilterproxy/group"/>
-   </component>
-   <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
-    <unit bldFile="httpfilters/uaproffilter/group"/>
-   </component>
-  </collection>
-  <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
-   <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-    <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-   </component>
-   <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
-    <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
-   </component>
-   <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
-    <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-   </component>
-   <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
-    <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-   </component>
-   <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
-    <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-   </component>
-   <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
-    <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-   </component>
-   <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
-    <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
-   </component>
-  </collection>
-  <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
-   <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
-    <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-   </component>
-   <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
-    <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-   </component>
-   <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
-    <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-   </component>
-   <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
-    <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-   </component>
-  </collection>
-  <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
-   <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/opensrv/package_definition.xml
--- a/symbian4/mw/opensrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/opensrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,118 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-        <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-          <component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-          </component>
-        </collection>
-        <collection name="loudmouth" long-name="Loudmouth" level="prt">
-          <!-- collection is really a component so it needs to be moved down a directory -->
-          <component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
-          </component>
-        </collection>
-        <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-          <!-- collection is really a component so it needs to be moved down a directory -->
-          <component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
-          </component>
-        </collection>
-        <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-          <!-- collection is really a component so it needs to be moved down a directory -->
-          <component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
-          </component>
-        </collection>
-        <collection name="isolationserver" long-name="Isolation Server" level="server">
-          <component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
-          </component>
-          <component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
-          </component>
-          <component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-            <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-            <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="opensrv" name="Open Services" levels="prt lib server eng">
+  <collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
+   <component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="opensrv_plat/messagequeue_api/group"/>
+   </component>
+  </collection>
+  <collection id="loudmouth" name="Loudmouth" level="prt">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
+    <unit bldFile="loudmouth/group"/>
+   </component>
+  </collection>
+  <collection id="libtelepathy" name="Telepathy Library" level="lib">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
+    <unit bldFile="libtelepathy/group"/>
+   </component>
+  </collection>
+  <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
+    <unit bldFile="telepathygabble/group"/>
+   </component>
+  </collection>
+  <collection id="isolationserver" name="Isolation Server" level="server">
+   <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
+    <unit bldFile="isolationserver/messagequeue/group"/>
+   </component>
+   <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
+    <unit bldFile="isolationserver/isoserver/group"/>
+   </component>
+   <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+    <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
+    <unit bldFile="isolationserver/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/opensrv/package_definition_3.0.xml
--- a/symbian4/mw/opensrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="opensrv" name="Open Services" levels="prt lib server eng">
-  <collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
-   <component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
-    <unit bldFile="opensrv_plat/messagequeue_api/group"/>
-   </component>
-  </collection>
-  <collection id="loudmouth" name="Loudmouth" level="prt">
-   <!-- collection is really a component so it needs to be moved down a directory -->
-   <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
-    <unit bldFile="loudmouth/group"/>
-   </component>
-  </collection>
-  <collection id="libtelepathy" name="Telepathy Library" level="lib">
-   <!-- collection is really a component so it needs to be moved down a directory -->
-   <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
-    <unit bldFile="libtelepathy/group"/>
-   </component>
-  </collection>
-  <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
-   <!-- collection is really a component so it needs to be moved down a directory -->
-   <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
-    <unit bldFile="telepathygabble/group"/>
-   </component>
-  </collection>
-  <collection id="isolationserver" name="Isolation Server" level="server">
-   <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
-    <unit bldFile="isolationserver/messagequeue/group"/>
-   </component>
-   <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
-    <unit bldFile="isolationserver/isoserver/group"/>
-   </component>
-   <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
-    <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-    <unit bldFile="isolationserver/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,243 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
-        <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-          <component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-          </component>
-          <component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-          </component>
-          <component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-          </component>
-          <component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-          </component>
-          <component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-          </component>
-          <component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-          </component>
-          <component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-          </component>
-          <component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-          </component>
-          <component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-          </component>
-          <component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-          </component>
-          <component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-          </component>
-          <component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-          </component>
-          <component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-          </component>
-          <component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-          </component>
-          <component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-          </component>
-          <component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-          </component>
-          <component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-          </component>
-          <component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-          </component>
-          <component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-          </component>
-          <component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-          </component>
-          <component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-          </component>
-          <component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-          </component>
-          <component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-          </component>
-          <component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-          </component>
-          <component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-          </component>
-          <component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-          </component>
-          <component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-          </component>
-          <component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-          </component>
-          <component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-          </component>
-          <component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-          </component>
-          <component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-          </component>
-          <component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-          </component>
-          <component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
-          </component>
-          <component name="dialpad_api" long-name="Dialpad API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
-          </component>
-        </collection>
-        <collection name="cellular" long-name="Cellular" level="server">
-          <component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-          <component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-          <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-          <component name="cce" filter="s60" long-name="CCE" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-          <component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-          <component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-          <component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-          <component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development">
-            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-          <component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-            <unit bldFile="/sf/mw/phonesrv/." proFile="phonesrv.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+  <collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+   <component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/string_parser_api/string_parser_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/string_parser_api/group"/>
+   </component>
+   <component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cbs_mcn_client_api/cbs_mcn_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cbs_mcn_client_api/group"/>
+   </component>
+   <component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/converged_call_engine_api/converged_call_engine_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/converged_call_engine_api/group"/>
+   </component>
+   <component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/aiw_dial_data_consumer_api/aiw_dial_data_consumer_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+   </component>
+   <component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_api/phone_client_ussd_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_api/group"/>
+   </component>
+   <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_refresh_api/sat_refresh_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/network_handling_engine_api/network_handling_engine_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/network_handling_engine_api/group"/>
+   </component>
+   <component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_emergency_call_api/phone_client_emergency_call_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/group"/>
+   </component>
+   <component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_configuration_api/sat_configuration_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_configuration_api/group"/>
+   </component>
+   <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/dial_utils_api/dial_utils_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/dial_utils_api/group"/>
+   </component>
+   <component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_image_handler_api/phone_client_image_handler_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_image_handler_api/group"/>
+   </component>
+   <component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_messenger_api/phone_client_messenger_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_messenger_api/group"/>
+   </component>
+   <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_client_api/sat_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_api/phone_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_api/group"/>
+   </component>
+   <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_service_api/sat_service_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cbs_message_api/cbs_message_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cbs_message_api/group"/>
+   </component>
+   <component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_server_information_api/phone_client_server_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_server_information_api/group"/>
+   </component>
+   <component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_internal_api/phone_client_ussd_internal_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_internal_api/group"/>
+   </component>
+   <component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_command_handler_api/phone_client_command_handler_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_command_handler_api/group"/>
+   </component>
+   <component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_notify_api/phone_client_notify_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_notify_api/group"/>
+   </component>
+   <component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_utility_api/phone_client_utility_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_utility_api/group"/>
+   </component>
+   <component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/telephony_network_information_api/telephony_network_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/telephony_network_information_api/group"/>
+   </component>
+   <component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/secondary_display_sat_api/secondary_display_sat_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/secondary_display_sat_api/group"/>
+   </component>
+   <component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/callui_reconnect_query_api/group"/>
+   </component>
+   <component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/service_provider_settings_api/service_provider_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/service_provider_settings_api/group"/>
+   </component>
+   <component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/converged_call_provider_api/converged_call_provider_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/converged_call_provider_api/group"/>
+   </component>
+   <component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/incoming_call_monitor_api/incoming_call_monitor_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/incoming_call_monitor_api/group"/>
+   </component>
+   <component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/default_emergency_numbers_api/group"/>
+   </component>
+   <component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cenrep_database_api/cenrep_database_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cenrep_database_api/group"/>
+   </component>
+   <component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/ss_settings_api/ss_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/ss_settings_api/group"/>
+   </component>
+   <component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_observer_api/phone_settings_observer_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_observer_api/group"/>
+   </component>
+   <component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_notes_ui_api/group"/>
+   </component>
+   <component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_api/phone_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_api/group"/>
+   </component>
+   <component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/voice_mailbox_number_api/group"/>
+   </component>
+   <component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/voice_mailbox_settings_api/voice_mailbox_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/voice_mailbox_settings_api/group"/>
+   </component>
+   <component id="call_information_api" name="Call Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/call_information_api/call_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/call_information_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/telephony_mediator_api/telephony_mediator_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
+   </component>
+   <component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="phonesrv_plat/dialpad_api/group"/>
+   </component>
+  </collection>
+  <collection id="cellular" name="Cellular" level="server">
+   <component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">
+    <unit bldFile="cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
+   </component>
+   <component id="sssettings" filter="s60" name="Supplementary Service Settings" purpose="development">
+    <unit bldFile="cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
+   </component>
+   <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI" purpose="development">
+    <unit bldFile="cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+   <component id="cce" filter="s60" name="CCE"  purpose="development">
+    <unit filter="test,api_test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
+   </component>
+   <component id="spsettings" filter="s60" name="Service Provider Settings"  purpose="development">
+    <unit filter="test,api_test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="phoneclientserver" name="Phone Client/Server" level="server">
+   <component id="aiwdialdata" filter="s60" name="AIW Dial Data"  purpose="development">
+    <unit filter="test,api_test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
+   </component>
+   <component id="dialutils" filter="s60" name="Dial Utils"  purpose="development">
+    <unit filter="test,api_test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
+   </component>
+   <component id="phoneclient" filter="s60" name="Phone Client"  purpose="development">
+    <unit filter="test,api_test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="phonesrv_info" name="Phone Server Info" level="generic">
+    <component id="phonesrv_build" name="Phone Server Build" filter="s60">
+      <unit bldFile="."  qt:proFile="phonesrv.pro"/>
+     </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/phonesrv/package_definition_3.0.xml
--- a/symbian4/mw/phonesrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
-  <collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
-   <component id="string_parser_api" name="String Parser API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/string_parser_api/string_parser_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/string_parser_api/group"/>
-   </component>
-   <component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/cbs_mcn_client_api/cbs_mcn_client_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/cbs_mcn_client_api/group"/>
-   </component>
-   <component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/converged_call_engine_api/converged_call_engine_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/converged_call_engine_api/group"/>
-   </component>
-   <component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/aiw_dial_data_consumer_api/aiw_dial_data_consumer_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-   </component>
-   <component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_api/phone_client_ussd_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_ussd_api/group"/>
-   </component>
-   <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/sat_refresh_api/sat_refresh_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-    <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/network_handling_engine_api/network_handling_engine_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/network_handling_engine_api/group"/>
-   </component>
-   <component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_emergency_call_api/phone_client_emergency_call_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/group"/>
-   </component>
-   <component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/sat_configuration_api/sat_configuration_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/sat_configuration_api/group"/>
-   </component>
-   <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/dial_utils_api/dial_utils_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/dial_utils_api/group"/>
-   </component>
-   <component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_image_handler_api/phone_client_image_handler_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_image_handler_api/group"/>
-   </component>
-   <component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_messenger_api/phone_client_messenger_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_messenger_api/group"/>
-   </component>
-   <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/sat_client_api/sat_client_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/sat_client_api/group" filter="!test"/>
-    <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_api/phone_client_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_api/group"/>
-   </component>
-   <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/sat_service_api/sat_service_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/sat_service_api/group" filter="!test"/>
-    <unit bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/cbs_message_api/cbs_message_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/cbs_message_api/group"/>
-   </component>
-   <component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_server_information_api/phone_client_server_information_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_server_information_api/group"/>
-   </component>
-   <component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_internal_api/phone_client_ussd_internal_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_ussd_internal_api/group"/>
-   </component>
-   <component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_command_handler_api/phone_client_command_handler_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_command_handler_api/group"/>
-   </component>
-   <component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_notify_api/phone_client_notify_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_notify_api/group"/>
-   </component>
-   <component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_client_utility_api/phone_client_utility_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_client_utility_api/group"/>
-   </component>
-   <component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/telephony_network_information_api/telephony_network_information_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/telephony_network_information_api/group"/>
-   </component>
-   <component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/secondary_display_sat_api/secondary_display_sat_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/secondary_display_sat_api/group"/>
-   </component>
-   <component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/callui_reconnect_query_api/group"/>
-   </component>
-   <component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/service_provider_settings_api/service_provider_settings_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/service_provider_settings_api/group"/>
-   </component>
-   <component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/converged_call_provider_api/converged_call_provider_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/converged_call_provider_api/group"/>
-   </component>
-   <component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/incoming_call_monitor_api/incoming_call_monitor_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/incoming_call_monitor_api/group"/>
-   </component>
-   <component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
-    <unit bldFile="phonesrv_plat/default_emergency_numbers_api/group"/>
-   </component>
-   <component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/cenrep_database_api/cenrep_database_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/cenrep_database_api/group"/>
-   </component>
-   <component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/ss_settings_api/ss_settings_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/ss_settings_api/group"/>
-   </component>
-   <component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_settings_observer_api/phone_settings_observer_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_settings_observer_api/group"/>
-   </component>
-   <component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_settings_notes_ui_api/group"/>
-   </component>
-   <component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/phone_settings_api/phone_settings_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/phone_settings_api/group"/>
-   </component>
-   <component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
-    <unit bldFile="phonesrv_plat/voice_mailbox_number_api/group"/>
-   </component>
-   <component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/voice_mailbox_settings_api/voice_mailbox_settings_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/voice_mailbox_settings_api/group"/>
-   </component>
-   <component id="call_information_api" name="Call Information API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/call_information_api/call_information_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/call_information_api/group" filter="!test"/>
-    <unit bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
-    <unit bldFile="phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-    <unit bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
-    <meta rel="Api" href="phonesrv_plat/telephony_mediator_api/telephony_mediator_api.metaxml"/>
-    <unit bldFile="phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
-    <unit bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
-   </component>
-   <component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
-    <unit bldFile="phonesrv_plat/dialpad_api/group"/>
-   </component>
-  </collection>
-  <collection id="cellular" name="Cellular" level="server">
-   <component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">
-    <unit bldFile="cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
-   </component>
-   <component id="sssettings" filter="s60" name="Supplementary Service Settings" purpose="development">
-    <unit bldFile="cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
-   </component>
-   <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI" purpose="development">
-    <unit bldFile="cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
-   </component>
-  </collection>
-  <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
-   <component id="cce" filter="s60" name="CCE"  purpose="development">
-    <unit filter="test,api_test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
-   </component>
-   <component id="spsettings" filter="s60" name="Service Provider Settings"  purpose="development">
-    <unit filter="test,api_test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
-   </component>
-  </collection>
-  <collection id="phoneclientserver" name="Phone Client/Server" level="server">
-   <component id="aiwdialdata" filter="s60" name="AIW Dial Data"  purpose="development">
-    <unit filter="test,api_test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
-   </component>
-   <component id="dialutils" filter="s60" name="Dial Utils"  purpose="development">
-    <unit filter="test,api_test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
-   </component>
-   <component id="phoneclient" filter="s60" name="Phone Client"  purpose="development">
-    <unit filter="test,api_test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
-   </component>
-  </collection>
-  <collection id="phonesrv_info" name="Phone Server Info" level="generic">
-    <component id="phonesrv_build" name="Phone Server Build" filter="s60">
-      <unit bldFile="."  qt:proFile="phonesrv.pro"/>
-     </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/platformthemes/package_definition.xml
--- a/symbian4/mw/platformthemes/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/platformthemes/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,89 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
-        <collection name="platformthemes_info" long-name="Platform Themes Info">
-          <component name="platformthemes_build" long-name="Platform Themes Build">
-            <!-- no real structure in this package. Should break into collections / components -->
-            <unit bldFile="/sf/mw/platformthemes/." proFile="platformthemes.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="platformthemes" name="Platform Themes" levels="framework generic ui">
+   <collection id="platformthemes_info" name="Platform Themes Info">
+    <component id="platformthemes_build" name="Platform Themes Build">
+		<!-- no real structure in this package. Should break into collections / components -->
+      <unit bldFile="." qt:proFile="platformthemes.pro"/>
+     </component>
+   </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/platformthemes/package_definition_3.0.xml
--- a/symbian4/mw/platformthemes/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="platformthemes" name="Platform Themes" levels="framework generic ui">
-   <collection id="platformthemes_info" name="Platform Themes Info">
-    <component id="platformthemes_build" name="Platform Themes Build">
-		<!-- no real structure in this package. Should break into collections / components -->
-      <unit bldFile="." qt:proFile="platformthemes.pro"/>
-     </component>
-   </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/platformtools/package_definition.xml
--- a/symbian4/mw/platformtools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/platformtools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,91 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="platformtools" level="generic" long-name="Platform Tools">
-        <collection name="gfxconversion" long-name="Graphics Conversion">
-          <component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-            <unit bldFile="/sf/mw/platformtools/gfxconversion/bmconv_s60/group"/>
-          </component>
-          <component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
-            <unit bldFile="/sf/mw/platformtools/gfxconversion/mifconv/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="platformtools" name="Platform Tools">
+    <collection id="gfxconversion" name="Graphics Conversion">
+      <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
+        <unit bldFile="gfxconversion/bmconv_s60/group"/>
+      </component>
+      <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+        <unit bldFile="gfxconversion/mifconv/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/platformtools/package_definition_3.0.xml
--- a/symbian4/mw/platformtools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="platformtools" name="Platform Tools">
-    <collection id="gfxconversion" name="Graphics Conversion">
-      <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
-        <unit bldFile="gfxconversion/bmconv_s60/group"/>
-      </component>
-      <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
-        <unit bldFile="gfxconversion/mifconv/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,111 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-        <collection name="qtconf" long-name="Qt Config" level="tool">
-          <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
-            <unit bldFile="/sf/mw/qt/src/s60installs/deviceconfiguration"/>
-          </component>
-        </collection>
-        <collection name="qt_info" long-name="Qt Info" level="mw">
-          <component name="qt_build" long-name="Qt Build" introduced="^2">
-            <unit bldFile="/sf/mw/qt/." proFile="projects.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
-          </component>
-        </collection>
-        <collection name="qtdemos" long-name="Qt Demos" level="app">
-          <component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-            <unit bldFile="/sf/mw/qt/demos" proFile="demos.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
-          </component>
-        </collection>
-        <collection name="qtexamples" long-name="Qt Examples" level="app">
-          <component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-            <unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
-          </component>
-        </collection>
-        <collection name="qt_tests" long-name="Qt Tests" level="app">
-          <component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-            <unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro"/>
-          </component>
-          <component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-            <unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+	<!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
+		This will be removed when sbsv2 builds are working -->
+  <package id="qt" name="Qt" levels="tool mw app">
+    <collection id="qtconf" name="Qt Config" level="tool">
+            <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="qt_tools" introduced="^2">
+                <unit bldFile="src/s60installs/deviceconfiguration"/>
+            </component>
+    </collection>
+    <collection id="qt_info" name="Qt Info" level="mw">
+            <component id="qt_build" name="Qt Build" introduced="^2">
+  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
+            </component>
+    </collection>
+    <collection id="qtdemos" name="Qt Demos" level="app">
+            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
+                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+            </component>
+    </collection>
+    <collection id="qtexamples" name="Qt Examples" level="app">
+            <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="qtexamples">
+                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+            </component>
+    </collection>
+    <collection id="qt_tests" name="Qt Tests" level="app">
+            <component id="qttestsauto" name="Qt Automated Tests" introduced="^2"  filter="qttestsauto,test">
+                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+            </component>
+            <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test">
+                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+            </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/qt/package_definition_3.0.xml
--- a/symbian4/mw/qt/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-	<!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
-		This will be removed when sbsv2 builds are working -->
-  <package id="qt" name="Qt" levels="tool mw app">
-    <collection id="qtconf" name="Qt Config" level="tool">
-            <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="qt_tools" introduced="^2">
-                <unit bldFile="src/s60installs/deviceconfiguration"/>
-            </component>
-    </collection>
-    <collection id="qt_info" name="Qt Info" level="mw">
-            <component id="qt_build" name="Qt Build" introduced="^2">
-  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
-            </component>
-    </collection>
-    <collection id="qtdemos" name="Qt Demos" level="app">
-            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
-                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
-            </component>
-    </collection>
-    <collection id="qtexamples" name="Qt Examples" level="app">
-            <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="qtexamples">
-                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
-            </component>
-    </collection>
-    <collection id="qt_tests" name="Qt Tests" level="app">
-            <component id="qttestsauto" name="Qt Automated Tests" introduced="^2"  filter="qttestsauto,test">
-                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
-            </component>
-            <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test">
-                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
-            </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/qtextensions/package_definition.xml
--- a/symbian4/mw/qtextensions/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,135 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
-        <collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-          <component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-        <collection name="qthighway" long-name="Qt Highway" level="app">
-          <component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="qthighwaytests" filter="test,qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-        <collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-          <component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-        <collection name="qtmobility" long-name="Qt Mobility" level="mw">
-          <component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="qtmobilitytests" filter="test,qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-        <collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
-          <component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qhbstyle" qmakeArgs="-r" proFile="qhbstyle.pro"/>
-          </component>
-        </collection>
-        <collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
-          <component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" class="conf">
-            <unit bldFile="/sf/mw/qtextensions/group"/>
-          </component>
-          <component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
-            <!-- break this up into the above collections-->
-            <unit bldFile="/sf/mw/qtextensions/." proFile="qtextensions.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+	<!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
+		This will be removed when sbsv2 builds are working -->
+  <package id="qtextensions" name="Qt Extensions" levels="tool mw app">
+   <collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
+     <component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin"  purpose="development" introduced="^4" class="plugin">
+      <unit bldFile="qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+     </component>
+    <component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples"  purpose="development" introduced="^4">
+      <unit bldFile="qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+     </component>
+    </collection>
+    <collection id="qthighway" name="Qt Highway" level="app">
+     <component id="qthighway_build" filter="qthighway" name="Qt Highway"  purpose="development" introduced="^4">
+      <unit bldFile="qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+     </component>
+    <component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples"  purpose="development" introduced="^4">
+      <unit bldFile="qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="qthighwaytests" filter="test,qtextensionstests" name="Qt Highway Tests"  purpose="development" introduced="^4">
+      <unit bldFile="qthighway/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
+     </component>
+    </collection>
+    <collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
+	 <component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions"  purpose="development" introduced="^4">
+      <unit bldFile="qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+     </component>
+    <component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples"  purpose="development" introduced="^4">
+      <unit bldFile="qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+     </component>
+    </collection>
+    <collection id="qtmobility" name="Qt Mobility" level="mw">
+	 <component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
+      <unit bldFile="qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+     </component>
+    <component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
+      <unit bldFile="qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+     </component>
+     <component id="qtmobilitytests" filter="test,qtextensionstests" name="Qt Extensions Tests"  purpose="development" introduced="^4">
+      <unit bldFile="qtmobility/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
+     </component>
+    </collection>
+    <collection id="qhbstyle" level="mw" name="Qt Orbit Style">
+     <component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
+      <unit bldFile="qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+     </component>
+    </collection>
+    <collection id="qtextensions_info" name="Qt Extensions Info" level="app">
+    <component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4" filter="qt_tools">
+      <unit bldFile="group"/>
+     </component>
+     <component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
+		<!-- break this up into the above collections-->
+      <unit bldFile="." qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
+     </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/remoteconn/package_definition.xml
--- a/symbian4/mw/remoteconn/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,131 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
-        <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-          <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-          </component>
-        </collection>
-        <collection name="mtptransports" long-name="MTP Transports" level="plugin">
-          <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-          </component>
-          <component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-          </component>
-          <component name="mtpcontroller" long-name="MTP Controller" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpcontroller/group" mrp="/sf/mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-          </component>
-        </collection>
-        <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-          <component name="mtpfw" long-name="MTP Framework" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="/sf/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-          </component>
-        </collection>
-        <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-          <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-          </component>
-          <component name="mtpimagedp" long-name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-          </component>
-          <component name="mtppictbridgedp" long-name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-          </component>
-        </collection>
-        <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-          <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-            <unit bldFile="/sf/mw/remoteconn/backupandrestore/backupengine/group" mrp="/sf/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-          </component>
-          <component name="backuptest" long-name="Backup Test" introduced="^2" purpose="development">
-            <unit bldFile="/sf/mw/remoteconn/backupandrestore/backuptest/group" mrp="/sf/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-          </component>
-        </collection>
-        <collection name="obex" long-name="OBEX" level="generic">
-          <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/mw/remoteconn/obex/obexprotocol/group" mrp="/sf/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
-          </component>
-          <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/mw/remoteconn/obex/obexextensionapi/group" mrp="/sf/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
+  <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+   <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtptransports" name="MTP Transports" level="plugin">
+   <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+   </component>
+   <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+   </component>
+   <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtpfws" name="MTP Frameworks" level="framework">
+   <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+    <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+   <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+   </component>
+   <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpimagedp/group" mrp="mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+   </component>
+   <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+   </component>
+  </collection>
+  <collection id="backupandrestore" name="Backup and Restore" level="specific">
+   <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+    <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+   </component>
+   <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+    <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+   </component>
+  </collection>
+  <collection id="obex" name="OBEX" level="generic">
+   <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+    <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
+   </component>
+   <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+    <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/remoteconn/package_definition_3.0.xml
--- a/symbian4/mw/remoteconn/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
-  <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
-   <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-   </component>
-  </collection>
-  <collection id="mtptransports" name="MTP Transports" level="plugin">
-   <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
-    <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-   </component>
-   <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-   </component>
-   <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-   </component>
-  </collection>
-  <collection id="mtpfws" name="MTP Frameworks" level="framework">
-   <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
-    <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
-   </component>
-  </collection>
-  <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
-   <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
-    <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-   </component>
-   <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="mtpdataproviders/mtpimagedp/group" mrp="mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-   </component>
-   <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-   </component>
-  </collection>
-  <collection id="backupandrestore" name="Backup and Restore" level="specific">
-   <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
-    <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-   </component>
-   <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
-    <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-   </component>
-  </collection>
-  <collection id="obex" name="OBEX" level="generic">
-   <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
-    <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
-   </component>
-   <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
-    <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,302 +1,263 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
-        <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-          <component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-          </component>
-        </collection>
-        <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-          <component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-          </component>
-          <component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-          </component>
-          <component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-          </component>
-          <component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-          </component>
-          <component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-          </component>
-          <component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-          </component>
-          <component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-          </component>
-          <component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-          </component>
-          <component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-          </component>
-          <component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-          </component>
-          <component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-          </component>
-          <component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-          </component>
-          <component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-          </component>
-          <component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-          </component>
-          <component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-          </component>
-          <component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-          </component>
-          <component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-          </component>
-          <component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-          </component>
-          <component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-          </component>
-          <component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-          </component>
-          <component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-          </component>
-          <component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-          </component>
-          <component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-          </component>
-          <component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-          </component>
-          <component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-          </component>
-          <component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-          </component>
-          <component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-          </component>
-          <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-          </component>
-          <component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-          </component>
-          <component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-          </component>
-          <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-          </component>
-          <component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-          </component>
-          <component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-          </component>
-          <component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-          </component>
-          <component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
-          </component>
-          <component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
-          </component>
-          <component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-          </component>
-        </collection>
-        <collection name="policymanagement" long-name="Policy Management" level="generic">
-          <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
-            <unit bldFile="/sf/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-          </component>
-          <component name="dmutilserver" filter="s60" long-name="DM Util Server">
-            <unit bldFile="/sf/mw/remotemgmt/policymanagement/dmutilserver/group"/>
-          </component>
-          <component name="policyengine" filter="s60" long-name="Policy Engine">
-            <unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/group" filter="!dfs_build"/>
-          </component>
-          <component name="policymanagement_build" filter="s60" long-name="Policy Management Build">
-            <!--  need to distribute exports, etc into the other components and remove this-->
-            <unit bldFile="/sf/mw/remotemgmt/policymanagement/group"/>
-          </component>
-        </collection>
-        <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-          <component name="syncmlfw_build" filter="s60" long-name="SyncML Framework Build">
-            <!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-            <unit bldFile="/sf/mw/remotemgmt/syncmlfw/group"/>
-          </component>
-        </collection>
-        <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-          <component name="scp" filter="s60" long-name="Security Code Proxy">
-            <!-- can only have one unit, need to have these #included from a single bld.inf -->
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
-          </component>
-          <component name="terminalsecurity_client" filter="s60" long-name="Terminal Control Client">
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/client/group"/>
-          </component>
-          <component name="terminalsecurity_server" filter="s60" long-name="Terminal Control Server">
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/server/group"/>
-          </component>
-          <component name="tcadapter" filter="s60" long-name="Terminal Control Adapter">
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-          </component>
-          <component name="terminalsecurity_build" filter="s60" long-name="Terminal Security Build">
-            <!--  need to distribute exports, etc into the other components and remove this-->
-            <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/group"/>
-          </component>
-        </collection>
-        <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-          <component name="pnputil" filter="s60" long-name="PnP Util">
-            <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
-          </component>
-          <component name="provisioning" filter="s60" long-name="Provisioning">
-            <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
-          </component>
-        </collection>
-        <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-          <component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-            <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-          </component>
-          <component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-            <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-          </component>
-          <component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-            <!--  can only have one unit, merge or split into two components -->
-            <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-            <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-          </component>
-          <component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-            <!--  need to distribute exports, etc into the other components and remove this-->
-            <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/group"/>
-          </component>
-        </collection>
-        <collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
-          <component name="dcmoclient" filter="s60" long-name="DCMO Client">
-            <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoclient/group"/>
-          </component>
-          <component name="dcmoserver" filter="s60" long-name="DCMO Server">
-            <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoserver/group"/>
-          </component>
-          <component name="dcmocustcmd" filter="s60" long-name="DCMO Custom Commands">
-            <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
-          </component>
-          <component name="dcmofw_build" filter="s60" long-name="DCMO Build">
-            <!--  need to distribute exports, etc into the other components and remove this-->
-            <unit bldFile="/sf/mw/remotemgmt/dcmofw/group"/>
-          </component>
-        </collection>
-        <collection name="fotaapplication" long-name="FOTA Application" level="generic">
-          <component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-            <!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-            <unit bldFile="/sf/mw/remotemgmt/fotaapplication/group"/>
-          </component>
-          <component name="fotaserver" filter="s60" long-name="FOTA Server">
-            <!-- uncomment when #ifdefs are resolved -->
-            <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-          </component>
-          <component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-            <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-            <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="remotemgmt" name="Remote Management" levels="plugin framework server generic specific">
+  <collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
+   <component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_pub/synchronization_capability_api/synchronization_capability_api.metaxml"/>
+    <unit bldFile="remotemgmt_pub/synchronization_capability_api/group"/>
+   </component>
+  </collection>
+  <collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
+   <component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/common_agent_util_and_definitions_api/common_agent_util_and_definitions_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+   </component>
+   <component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/policy_management_certificate_api/policy_management_certificate_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/policy_management_certificate_api/group"/>
+   </component>
+   <component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/oma_provisioning_adapter_api/oma_provisioning_adapter_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+   </component>
+   <component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/device_management_parameter_api/device_management_parameter_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/device_management_parameter_api/group"/>
+   </component>
+   <component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/data_synchronization_plugin_api/data_synchronization_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/data_synchronization_plugin_api/group"/>
+   </component>
+   <component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/sync_alert_handler_api/sync_alert_handler_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/sync_alert_handler_api/group"/>
+   </component>
+   <component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_api/syncml_notifier_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_notifier_api/group"/>
+   </component>
+   <component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_client_api/syncml_client_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_client_api/group"/>
+   </component>
+   <component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/device_management_plugin_api/device_management_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/device_management_plugin_api/group"/>
+   </component>
+   <component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/dm_tree_apis/dm_tree_apis.metaxml"/>
+    <unit bldFile="remotemgmt_plat/dm_tree_apis/group"/>
+   </component>
+   <component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/terminal_security_device_lock_api/terminal_security_device_lock_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/terminal_security_device_lock_api/group"/>
+   </component>
+   <component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/policy_management_request_api/policy_management_request_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/policy_management_request_api/group"/>
+   </component>
+   <component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/ds_constant_definitions_api/ds_constant_definitions_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/ds_constant_definitions_api/group"/>
+   </component>
+   <component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/scp_server_api/scp_server_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/scp_server_api/group"/>
+   </component>
+   <component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/data_synchronization_notification_api/data_synchronization_notification_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/data_synchronization_notification_api/group"/>
+   </component>
+   <component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/oma_provisioning_engine_api/oma_provisioning_engine_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/oma_provisioning_engine_api/group"/>
+   </component>
+   <component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/dm_utils_api/dm_utils_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/dm_utils_api/group"/>
+   </component>
+   <component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_alert_api/syncml_alert_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_alert_api/group"/>
+   </component>
+   <component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/obex_client_session_api/obex_client_session_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/obex_client_session_api/group"/>
+   </component>
+   <component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/setting_enforcement_info_api/setting_enforcement_info_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/setting_enforcement_info_api/group"/>
+   </component>
+   <component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/dm_constant_definitions_api/dm_constant_definitions_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/dm_constant_definitions_api/group"/>
+   </component>
+   <component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/oma_ds_extensions_api/oma_ds_extensions_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/oma_ds_extensions_api/group"/>
+   </component>
+   <component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/pnpms_utils_api/pnpms_utils_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/pnpms_utils_api/group"/>
+   </component>
+   <component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_utility_api/diagnostics_plugin_utility_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+   </component>
+   <component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_api/diagnostics_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_plugin_api/group"/>
+   </component>
+   <component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_framework_api/diagnostics_framework_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_framework_api/group"/>
+   </component>
+   <component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_results_api/diagnostics_results_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_results_api/group"/>
+   </component>
+   <component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_pool_api/diagnostics_plugin_pool_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+   </component>
+   <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/adaptive_history_list_api/group"/>
+   </component>
+   <component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_session_api/adaptive_history_list_session_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/adaptive_history_list_session_api/group"/>
+   </component>
+   <component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/fota_engine_api/fota_engine_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/fota_engine_api/group"/>
+   </component>
+   <component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/update_package_storage_plugin_api/update_package_storage_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/update_package_storage_plugin_api/group"/>
+   </component>
+   <component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_roaming_api/syncml_notifier_roaming_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+   </component>
+   <component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/sync_service_api/sync_service_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/sync_service_api/group"/>
+   </component>
+   <component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+    <unit bldFile="remotemgmt_plat/dcmo_adapter_api/group"/>
+   </component>
+   <component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+    <unit bldFile="remotemgmt_plat/dcmo_control_api/group"/>
+   </component>
+   <component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/ds_capability_mgmt_plugin_api/ds_capability_mgmt_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="policymanagement" name="Policy Management" level="generic">
+   <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
+    <unit bldFile="policymanagement/pmdmadapter/group"/>
+   </component>
+   <component id="dmutilserver" filter="s60" name="DM Util Server">
+    <unit bldFile="policymanagement/dmutilserver/group"/>
+   </component>
+   <component id="policyengine" filter="s60" name="Policy Engine">
+    <unit bldFile="policymanagement/policyengine/group" filter="!dfs_build"/>
+   </component>
+   <component id="policymanagement_build" filter="s60" name="Policy Management Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="policymanagement/group"/>
+   </component>
+  </collection>
+  <collection id="syncmlfw" name="SyncML Framework" level="server">
+   <component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
+    <!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+    <unit bldFile="syncmlfw/group"/>
+   </component>
+  </collection>
+  <collection id="terminalsecurity" name="Terminal Security" level="specific">
+   <component id="scp" filter="s60" name="Security Code Proxy">
+    <!-- can only have one unit, need to have these #included from a single bld.inf -->
+    <unit bldFile="terminalsecurity/scp/scpclient/group"/>
+    <unit bldFile="terminalsecurity/scp/scpdatabase/group"/>
+    <unit bldFile="terminalsecurity/scp/scpserver/group"/>
+    <unit bldFile="terminalsecurity/scp/scppatternplugin/group"/>
+    <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
+    <unit bldFile="terminalsecurity/scp/scptimestampplugin/group"/>
+    <unit bldFile="terminalsecurity/scp/scpeventhandler/group"/>
+    <unit bldFile="terminalsecurity/scp/dmeventnotifier/group"/>
+   </component>
+   <component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
+    <unit bldFile="terminalsecurity/client/group"/>
+   </component>
+   <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+    <unit bldFile="terminalsecurity/server/group"/>
+   </component>
+   <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+    <unit bldFile="terminalsecurity/tcadapter/bld"/>
+   </component>
+   <component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="terminalsecurity/group"/>
+   </component>
+  </collection>
+  <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+   <component id="pnputil" filter="s60" name="PnP Util">
+    <unit bldFile="omaprovisioning/pnputil/group"/>
+   </component>
+   <component id="provisioning" filter="s60" name="Provisioning">
+    <unit bldFile="omaprovisioning/provisioning/group"/>
+   </component>
+  </collection>
+  <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+   <component id="diagframework" filter="s60" name="Diagnostics Framework">
+    <unit bldFile="devicediagnosticsfw/diagframework/group"/>
+   </component>
+   <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+    <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
+   </component>
+   <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+    <!--  can only have one unit, merge or split into two components -->
+    <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
+    <unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
+   </component>
+   <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="devicediagnosticsfw/group"/>
+   </component>
+  </collection>
+  <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+   <component id="dcmoclient" filter="s60" name="DCMO Client">
+    <unit bldFile="dcmofw/dcmoclient/group"/>
+   </component>
+   <component id="dcmoserver" filter="s60" name="DCMO Server">
+    <unit bldFile="dcmofw/dcmoserver/group"/>
+   </component>
+   <component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+    <unit bldFile="dcmofw/dcmocustcmd/group"/>
+   </component>
+   <component id="dcmofw_build" filter="s60" name="DCMO Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="dcmofw/group"/>
+   </component>
+  </collection>
+  <collection id="fotaapplication" name="FOTA Application" level="generic">
+   <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+    <!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+    <unit bldFile="fotaapplication/group"/>
+   </component>
+   <component id="fotaserver" filter="s60" name="FOTA Server">
+    <meta rel="config">
+     <defined condition="__SYNCML_DM_FOTA"/>
+    </meta>
+    <!-- uncomment when #ifdefs are resolved -->
+    <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+   </component>
+   <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
+    <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+    <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/remotemgmt/package_definition_3.0.xml
--- a/symbian4/mw/remotemgmt/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="remotemgmt" name="Remote Management" levels="plugin framework server generic specific">
-  <collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
-   <component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_pub/synchronization_capability_api/synchronization_capability_api.metaxml"/>
-    <unit bldFile="remotemgmt_pub/synchronization_capability_api/group"/>
-   </component>
-  </collection>
-  <collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
-   <component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/common_agent_util_and_definitions_api/common_agent_util_and_definitions_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-   </component>
-   <component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/policy_management_certificate_api/policy_management_certificate_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/policy_management_certificate_api/group"/>
-   </component>
-   <component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/oma_provisioning_adapter_api/oma_provisioning_adapter_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-   </component>
-   <component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/device_management_parameter_api/device_management_parameter_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/device_management_parameter_api/group"/>
-   </component>
-   <component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/data_synchronization_plugin_api/data_synchronization_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/data_synchronization_plugin_api/group"/>
-   </component>
-   <component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/sync_alert_handler_api/sync_alert_handler_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/sync_alert_handler_api/group"/>
-   </component>
-   <component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_api/syncml_notifier_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/syncml_notifier_api/group"/>
-   </component>
-   <component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/syncml_client_api/syncml_client_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/syncml_client_api/group"/>
-   </component>
-   <component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/device_management_plugin_api/device_management_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/device_management_plugin_api/group"/>
-   </component>
-   <component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/dm_tree_apis/dm_tree_apis.metaxml"/>
-    <unit bldFile="remotemgmt_plat/dm_tree_apis/group"/>
-   </component>
-   <component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/terminal_security_device_lock_api/terminal_security_device_lock_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/terminal_security_device_lock_api/group"/>
-   </component>
-   <component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/policy_management_request_api/policy_management_request_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/policy_management_request_api/group"/>
-   </component>
-   <component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/ds_constant_definitions_api/ds_constant_definitions_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/ds_constant_definitions_api/group"/>
-   </component>
-   <component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/scp_server_api/scp_server_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/scp_server_api/group"/>
-   </component>
-   <component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/data_synchronization_notification_api/data_synchronization_notification_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/data_synchronization_notification_api/group"/>
-   </component>
-   <component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/oma_provisioning_engine_api/oma_provisioning_engine_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/oma_provisioning_engine_api/group"/>
-   </component>
-   <component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/dm_utils_api/dm_utils_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/dm_utils_api/group"/>
-   </component>
-   <component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/syncml_alert_api/syncml_alert_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/syncml_alert_api/group"/>
-   </component>
-   <component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/obex_client_session_api/obex_client_session_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/obex_client_session_api/group"/>
-   </component>
-   <component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/setting_enforcement_info_api/setting_enforcement_info_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/setting_enforcement_info_api/group"/>
-   </component>
-   <component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/dm_constant_definitions_api/dm_constant_definitions_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/dm_constant_definitions_api/group"/>
-   </component>
-   <component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/oma_ds_extensions_api/oma_ds_extensions_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/oma_ds_extensions_api/group"/>
-   </component>
-   <component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/pnpms_utils_api/pnpms_utils_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/pnpms_utils_api/group"/>
-   </component>
-   <component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_utility_api/diagnostics_plugin_utility_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-   </component>
-   <component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_api/diagnostics_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_plugin_api/group"/>
-   </component>
-   <component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_framework_api/diagnostics_framework_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_framework_api/group"/>
-   </component>
-   <component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_results_api/diagnostics_results_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_results_api/group"/>
-   </component>
-   <component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_pool_api/diagnostics_plugin_pool_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-   </component>
-   <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/adaptive_history_list_api/group"/>
-   </component>
-   <component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_session_api/adaptive_history_list_session_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/adaptive_history_list_session_api/group"/>
-   </component>
-   <component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/fota_engine_api/fota_engine_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/fota_engine_api/group"/>
-   </component>
-   <component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/update_package_storage_plugin_api/update_package_storage_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/update_package_storage_plugin_api/group"/>
-   </component>
-   <component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_roaming_api/syncml_notifier_roaming_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-   </component>
-   <component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/sync_service_api/sync_service_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/sync_service_api/group"/>
-   </component>
-   <component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
-    <unit bldFile="remotemgmt_plat/dcmo_adapter_api/group"/>
-   </component>
-   <component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
-    <unit bldFile="remotemgmt_plat/dcmo_control_api/group"/>
-   </component>
-   <component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/ds_capability_mgmt_plugin_api/ds_capability_mgmt_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
-   </component>
-  </collection>
-  <collection id="policymanagement" name="Policy Management" level="generic">
-   <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
-    <unit bldFile="policymanagement/pmdmadapter/group"/>
-   </component>
-   <component id="dmutilserver" filter="s60" name="DM Util Server">
-    <unit bldFile="policymanagement/dmutilserver/group"/>
-   </component>
-   <component id="policyengine" filter="s60" name="Policy Engine">
-    <unit bldFile="policymanagement/policyengine/group" filter="!dfs_build"/>
-   </component>
-   <component id="policymanagement_build" filter="s60" name="Policy Management Build">
-    <!--  need to distribute exports, etc into the other components and remove this-->
-    <unit bldFile="policymanagement/group"/>
-   </component>
-  </collection>
-  <collection id="syncmlfw" name="SyncML Framework" level="server">
-   <component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
-    <!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-    <unit bldFile="syncmlfw/group"/>
-   </component>
-  </collection>
-  <collection id="terminalsecurity" name="Terminal Security" level="specific">
-   <component id="scp" filter="s60" name="Security Code Proxy">
-    <!-- can only have one unit, need to have these #included from a single bld.inf -->
-    <unit bldFile="terminalsecurity/scp/scpclient/group"/>
-    <unit bldFile="terminalsecurity/scp/scpdatabase/group"/>
-    <unit bldFile="terminalsecurity/scp/scpserver/group"/>
-    <unit bldFile="terminalsecurity/scp/scppatternplugin/group"/>
-    <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
-    <unit bldFile="terminalsecurity/scp/scptimestampplugin/group"/>
-    <unit bldFile="terminalsecurity/scp/scpeventhandler/group"/>
-    <unit bldFile="terminalsecurity/scp/dmeventnotifier/group"/>
-   </component>
-   <component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
-    <unit bldFile="terminalsecurity/client/group"/>
-   </component>
-   <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
-    <unit bldFile="terminalsecurity/server/group"/>
-   </component>
-   <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
-    <unit bldFile="terminalsecurity/tcadapter/bld"/>
-   </component>
-   <component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
-    <!--  need to distribute exports, etc into the other components and remove this-->
-    <unit bldFile="terminalsecurity/group"/>
-   </component>
-  </collection>
-  <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
-   <component id="pnputil" filter="s60" name="PnP Util">
-    <unit bldFile="omaprovisioning/pnputil/group"/>
-   </component>
-   <component id="provisioning" filter="s60" name="Provisioning">
-    <unit bldFile="omaprovisioning/provisioning/group"/>
-   </component>
-  </collection>
-  <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
-   <component id="diagframework" filter="s60" name="Diagnostics Framework">
-    <unit bldFile="devicediagnosticsfw/diagframework/group"/>
-   </component>
-   <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
-    <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
-   </component>
-   <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
-    <!--  can only have one unit, merge or split into two components -->
-    <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
-    <unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
-   </component>
-   <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
-    <!--  need to distribute exports, etc into the other components and remove this-->
-    <unit bldFile="devicediagnosticsfw/group"/>
-   </component>
-  </collection>
-  <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
-   <component id="dcmoclient" filter="s60" name="DCMO Client">
-    <unit bldFile="dcmofw/dcmoclient/group"/>
-   </component>
-   <component id="dcmoserver" filter="s60" name="DCMO Server">
-    <unit bldFile="dcmofw/dcmoserver/group"/>
-   </component>
-   <component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
-    <unit bldFile="dcmofw/dcmocustcmd/group"/>
-   </component>
-   <component id="dcmofw_build" filter="s60" name="DCMO Build">
-    <!--  need to distribute exports, etc into the other components and remove this-->
-    <unit bldFile="dcmofw/group"/>
-   </component>
-  </collection>
-  <collection id="fotaapplication" name="FOTA Application" level="generic">
-   <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
-    <!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-    <unit bldFile="fotaapplication/group"/>
-   </component>
-   <component id="fotaserver" filter="s60" name="FOTA Server">
-    <meta rel="config">
-     <defined condition="__SYNCML_DM_FOTA"/>
-    </meta>
-    <!-- uncomment when #ifdefs are resolved -->
-    <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-   </component>
-   <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-    <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-    <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/searchsrv/package_definition.xml
--- a/symbian4/mw/searchsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,145 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
-        <collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
-          <component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
-          </component>
-          <component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
-          </component>
-          <component name="cpix_search_api" long-name="CPIX Search API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
-          </component>
-        </collection>
-        <collection name="searchengine" long-name="Search Engine" level="engine">
-          <component name="searchengine_util" long-name="Search Engine Utils" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/searchengine/util/group"/>
-          </component>
-          <component name="searchengine_oss" long-name="Search Engine OSS" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/searchengine/oss/group"/>
-          </component>
-          <component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/searchengine/cpix/group"/>
-          </component>
-        </collection>
-        <collection name="searcher" long-name="Searcher" level="generic">
-          <component name="searchclient" long-name="Search Client" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/searcher/SearchClient/group"/>
-          </component>
-          <component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/searcher/SearchServer/group"/>
-          </component>
-          <component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
-            <!-- #include from common bld.inf or split into two components -->
-            <unit bldFile="/sf/mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-            <unit bldFile="/sf/mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-          </component>
-        </collection>
-        <collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
-          <component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/harvester/pluginfw/group"/>
-          </component>
-          <component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/harvester/HarvesterServer/group"/>
-          </component>
-        </collection>
-        <collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
-          <component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/WatchDog/group"/>
-          </component>
-        </collection>
-        <collection name="qcpix" long-name="Qt CPIX" level="engine">
-          <component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/qcpix" proFile="qcpix.pro"/>
-          </component>
-        </collection>
-        <collection name="searchsrv_info" long-name="Search Services Info">
-          <component name="searchsrv_build" long-name="Search Services Build" introduced="^4">
-            <!-- move exports to own component and remove this -->
-            <unit bldFile="/sf/mw/searchsrv/group"/>
-          </component>
-          <component name="searchsrv_test" long-name="Search Services Test" purpose="development" filter="test" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/tsrc/CPixMWTester/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+   <package id="searchsrv" name="Search Services" levels="services engine generic api">
+      <collection id="searchsrv_plat" name="Search Services Platform Interfaces" level="api">
+	    <component id="cpix_utility_api" name="CPIX Utility API" filter="s60" class="api" introduced="^4">
+			<meta rel="Api" href="searchsrv_plat/cpix_utility_api/cpix_utility_api.metaxml"/>
+			<unit bldFile="searchsrv_plat/cpix_utility_api/group"/>
+       </component>
+	    <component id="cpix_framework_api" name="CPIX Framework API" filter="s60" class="api" introduced="^4">
+			<meta rel="Api" href="searchsrv_plat/cpix_framework_api/cpix_framework_api.metaxml"/>
+			<unit bldFile="searchsrv_plat/cpix_framework_api/group"/>
+       </component>
+	    <component id="cpix_search_api" name="CPIX Search API" filter="s60" class="api" introduced="^4">
+			<meta rel="Api" href="searchsrv_plat/cpix_search_api/cpix_search_api.metaxml"/>
+			<unit bldFile="searchsrv_plat/cpix_search_api/group"/>
+       </component>
+    </collection>
+    <collection id="searchengine" name="Search Engine" level="engine">
+       <component id="searchengine_util" name="Search Engine Utils" filter="s60" introduced="^4">
+			<unit bldFile="searchengine/util/group"/>
+       </component>
+       <component id="searchengine_oss" name="Search Engine OSS" filter="s60" introduced="^4">
+			<unit bldFile="searchengine/oss/group"/>
+       </component>
+       <component id="cpix" name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+			<unit bldFile="searchengine/cpix/group"/>
+       </component>
+    </collection>
+    <collection id="searcher" name="Searcher" level="generic">
+       <component id="searchclient" name="Search Client" filter="s60" introduced="^4">
+			<unit bldFile="searcher/SearchClient/group"/>
+       </component>
+       <component id="searchserver" name="Search Server" filter="s60" introduced="^4">
+			<unit bldFile="searcher/SearchServer/group"/>
+       </component>
+       <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+			<!-- #include from common bld.inf or split into two components -->
+			<unit bldFile="searcher/tsrc/RobustnessTest/group"/>
+			<unit bldFile="searcher/tsrc/LogPlayer/group"/>
+       </component>
+    </collection>
+    <collection id="searchsrv_harvester" name="Search Services Harvester" level="services">
+       <component id="searchsrv_pluginfw" name="Search Server" filter="s60" introduced="^4">
+			<unit bldFile="harvester/pluginfw/group"/>
+       </component>
+       <component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
+			<unit bldFile="harvester/HarvesterServer/group"/>
+       </component>
+    </collection>
+    <collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
+       <component id="searchsrv_watchdog_build" name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+			<unit bldFile="WatchDog/group"/>
+       </component>
+    </collection>
+   <collection id="qcpix" name="Qt CPIX" level="engine">     
+    <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
+      <unit bldFile="qcpix"  qt:proFile="qcpix.pro"/>
+     </component>
+    </collection>
+    <collection id="searchsrv_info" name="Search Services Info">
+    <component id="searchsrv_build" name="Search Services Build" introduced="^4">
+		<!-- move exports to own component and remove this -->
+      <unit bldFile="group"/>
+     </component>
+    <component id="searchsrv_test" name="Search Services Test" purpose="development" filter="test" introduced="^4">
+      <unit bldFile="tsrc/CPixMWTester/group"/>
+     </component>
+    </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/searchsrv/package_definition_3.0.xml
--- a/symbian4/mw/searchsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-   <package id="searchsrv" name="Search Services" levels="services engine generic api">
-      <collection id="searchsrv_plat" name="Search Services Platform Interfaces" level="api">
-	    <component id="cpix_utility_api" name="CPIX Utility API" filter="s60" class="api" introduced="^4">
-			<meta rel="Api" href="searchsrv_plat/cpix_utility_api/cpix_utility_api.metaxml"/>
-			<unit bldFile="searchsrv_plat/cpix_utility_api/group"/>
-       </component>
-	    <component id="cpix_framework_api" name="CPIX Framework API" filter="s60" class="api" introduced="^4">
-			<meta rel="Api" href="searchsrv_plat/cpix_framework_api/cpix_framework_api.metaxml"/>
-			<unit bldFile="searchsrv_plat/cpix_framework_api/group"/>
-       </component>
-	    <component id="cpix_search_api" name="CPIX Search API" filter="s60" class="api" introduced="^4">
-			<meta rel="Api" href="searchsrv_plat/cpix_search_api/cpix_search_api.metaxml"/>
-			<unit bldFile="searchsrv_plat/cpix_search_api/group"/>
-       </component>
-    </collection>
-    <collection id="searchengine" name="Search Engine" level="engine">
-       <component id="searchengine_util" name="Search Engine Utils" filter="s60" introduced="^4">
-			<unit bldFile="searchengine/util/group"/>
-       </component>
-       <component id="searchengine_oss" name="Search Engine OSS" filter="s60" introduced="^4">
-			<unit bldFile="searchengine/oss/group"/>
-       </component>
-       <component id="cpix" name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
-			<unit bldFile="searchengine/cpix/group"/>
-       </component>
-    </collection>
-    <collection id="searcher" name="Searcher" level="generic">
-       <component id="searchclient" name="Search Client" filter="s60" introduced="^4">
-			<unit bldFile="searcher/SearchClient/group"/>
-       </component>
-       <component id="searchserver" name="Search Server" filter="s60" introduced="^4">
-			<unit bldFile="searcher/SearchServer/group"/>
-       </component>
-       <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
-			<!-- #include from common bld.inf or split into two components -->
-			<unit bldFile="searcher/tsrc/RobustnessTest/group"/>
-			<unit bldFile="searcher/tsrc/LogPlayer/group"/>
-       </component>
-    </collection>
-    <collection id="searchsrv_harvester" name="Search Services Harvester" level="services">
-       <component id="searchsrv_pluginfw" name="Search Server" filter="s60" introduced="^4">
-			<unit bldFile="harvester/pluginfw/group"/>
-       </component>
-       <component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
-			<unit bldFile="harvester/HarvesterServer/group"/>
-       </component>
-    </collection>
-    <collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
-       <component id="searchsrv_watchdog_build" name="Search Services Watch Dog Build" filter="s60" introduced="^4">
-			<unit bldFile="WatchDog/group"/>
-       </component>
-    </collection>
-   <collection id="qcpix" name="Qt CPIX" level="engine">     
-    <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
-      <unit bldFile="qcpix"  qt:proFile="qcpix.pro"/>
-     </component>
-    </collection>
-    <collection id="searchsrv_info" name="Search Services Info">
-    <component id="searchsrv_build" name="Search Services Build" introduced="^4">
-		<!-- move exports to own component and remove this -->
-      <unit bldFile="group"/>
-     </component>
-    <component id="searchsrv_test" name="Search Services Test" purpose="development" filter="test" introduced="^4">
-      <unit bldFile="tsrc/CPixMWTester/group"/>
-     </component>
-    </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/securitysrv/package_definition.xml
--- a/symbian4/mw/securitysrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,263 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
-        <collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-          <component name="cms_api" long-name="CMS API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/cms_api/group"/>
-          </component>
-          <component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-          </component>
-          <component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-          </component>
-          <component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-          </component>
-          <component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-          </component>
-          <component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-          </component>
-          <component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-          </component>
-          <component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-          </component>
-          <component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-          </component>
-          <component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-          </component>
-          <component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-          </component>
-          <component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-          </component>
-          <component name="gba_api" long-name="GBA API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/gba_api/group"/>
-          </component>
-          <component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
-          </component>
-          <component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
-          </component>
-          <component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
-          </component>
-          <component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
-          </component>
-          <component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
-          </component>
-        </collection>
-        <collection name="cms" long-name="Certificate Management Service" level="server">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
-            <unit bldFile="/sf/mw/securitysrv/cms/group"/>
-          </component>
-        </collection>
-        <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-          <component name="x509certnameparser" filter="s60" long-name="X.509 Certificate Name Parser">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-          </component>
-          <component name="pkcs12" filter="s60" long-name="PKCS #12">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/pkcs12/group"/>
-          </component>
-          <component name="certmanui" filter="s60" long-name="Certificate Management UI">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/certmanui/group"/>
-          </component>
-          <component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-          </component>
-          <component name="certsaver" filter="s60" long-name="Certificate Saver">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/certsaver/group"/>
-          </component>
-          <component name="secmodui" filter="s60" long-name="Security Module UI">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/secmodui/group"/>
-          </component>
-          <component name="devicetoken" filter="s60" long-name="Device Token">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
-          </component>
-          <component name="certificates" filter="s60" long-name="Certificates">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
-          </component>
-          <component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
-            <!-- need to split this into the above components -->
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/group"/>
-          </component>
-          <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-          </component>
-        </collection>
-        <collection name="wim" long-name="Wireless Identity Module" level="framework">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="wim_build" filter="s60" long-name="WIM Build">
-            <unit bldFile="/sf/mw/securitysrv/wim/group"/>
-          </component>
-        </collection>
-        <collection name="remotelock" long-name="Remote Lock" level="generic">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="remotelock_build" filter="s60" long-name="Remote Lock Build">
-            <unit bldFile="/sf/mw/securitysrv/remotelock/group"/>
-          </component>
-        </collection>
-        <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-          <component name="keylockpolicyapi" filter="s60" long-name="Keylock Policy API">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-          </component>
-          <component name="autolock" long-name="Autolock" filter="s60">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/group"/>
-          </component>
-          <component name="secui" filter="s60" long-name="Security UI">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/secui/group"/>
-          </component>
-          <component name="securitynotifier" filter="s60" long-name="Security Notifier">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/securitynotifier/group"/>
-          </component>
-          <component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockclient/group"/>
-          </component>
-          <component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockapp/group"/>
-          </component>
-          <component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
-          </component>
-        </collection>
-        <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-          <!-- collection is really a component. Need to move down a directory-->
-          <component name="boottimeintegritycheck_build" filter="s60" long-name="Boot Time Integrity Check Build">
-            <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/group"/>
-          </component>
-        </collection>
-        <collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-          <component name="uicc" filter="s60" long-name="UICC" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/securitysrv/gba/uicc/group"/>
-          </component>
-          <component name="gbaserver" filter="s60" long-name="GBA Server" introduced="^2">
-            <unit bldFile="/sf/mw/securitysrv/gba/gbaserver/group"/>
-          </component>
-          <component name="gbaapi" filter="s60" long-name="GBA API" introduced="^2">
-            <unit bldFile="/sf/mw/securitysrv/gba/gbaapi/group"/>
-          </component>
-          <component name="gbafilter" filter="s60" long-name="GBA HTTP Filter" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/mw/securitysrv/gba/gbafilter/group"/>
-          </component>
-          <component name="gba_build" filter="s60" long-name="Generic Boot Architecture Build" introduced="^2">
-            <!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
-            <unit bldFile="/sf/mw/securitysrv/gba/group"/>
-          </component>
-        </collection>
-        <collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-          <component name="devenccommonutils" filter="s60" long-name="Device Encryption Common Utils" introduced="^3">
-            <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
-          </component>
-          <component name="devencrfsplugin" filter="s60" long-name="Device Encryption RFS Plugin" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
-          </component>
-          <component name="pk5recognizer" filter="s60" long-name="Device Encryption Pk5 Recognizer" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
-          </component>
-          <component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
-          </component>
-          <component name="devencdiskutils_build" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
-            <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
-            <unit bldFile="/sf/mw/securitysrv/devencdiskutils/group"/>
-          </component>
-        </collection>
-        <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-          <component name="securitysrv_test" filter="s60,test,api_test" purpose="development" long-name="Security Services Test">
-            <unit bldFile="/sf/mw/securitysrv/tsrc/group"/>
-          </component>
-          <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="securitysrv" name="Security Services" levels="plugin framework server generic specific">
+  <collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
+   <component id="cms_api" name="CMS API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/cms_api/cms_api.metaxml"/>
+    <unit bldFile="secsrv_plat/cms_api/group"/>
+   </component>
+   <component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/pkcs12_parser_api/pkcs12_parser_api.metaxml"/>
+    <unit bldFile="secsrv_plat/pkcs12_parser_api/group"/>
+   </component>
+   <component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/java_utils_api/java_utils_api.metaxml"/>
+    <unit bldFile="secsrv_plat/java_utils_api/group"/>
+   </component>
+   <component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/wim_cert_api/wim_cert_api.metaxml"/>
+    <unit bldFile="secsrv_plat/wim_cert_api/group"/>
+   </component>
+   <component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/device_key_store_encryption_plugin_api/device_key_store_encryption_plugin_api.metaxml"/>
+    <unit bldFile="secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+   </component>
+   <component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/x509certnameparser_api/x509certnameparser_api.metaxml"/>
+    <unit bldFile="secsrv_plat/x509certnameparser_api/group"/>
+   </component>
+   <component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/remote_lock_api/remote_lock_api.metaxml"/>
+    <unit bldFile="secsrv_plat/remote_lock_api/group"/>
+   </component>
+   <component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/pkidialog_api/pkidialog_api.metaxml"/>
+    <unit bldFile="secsrv_plat/pkidialog_api/group"/>
+   </component>
+   <component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/provisioning_api/provisioning_api.metaxml"/>
+    <unit bldFile="secsrv_plat/provisioning_api/group"/>
+   </component>
+   <component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/keyguard_configuration_api/keyguard_configuration_api.metaxml"/>
+    <unit bldFile="secsrv_plat/keyguard_configuration_api/group"/>
+   </component>
+   <component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/keylock_policy_api/keylock_policy_api.metaxml"/>
+    <unit bldFile="secsrv_plat/keylock_policy_api/group"/>
+   </component>
+   <component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/security_code_ui_api/security_code_ui_api.metaxml"/>
+    <unit bldFile="secsrv_plat/security_code_ui_api/group"/>
+   </component>
+   <component id="gba_api" name="GBA API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/gba_api/gba_api.metaxml"/>
+    <unit bldFile="secsrv_plat/gba_api/group"/>
+   </component>
+   <component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/keyguard_access_api/group"/>
+   </component>
+   <component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/devicelock_access_api/group"/>
+   </component>
+   <component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/lockapp_server_api/group"/>
+   </component>
+   <component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/devencadaptation_api/group"/>
+   </component>
+   <component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/devenccommonutils_api/group"/>
+   </component>
+  </collection>
+  <collection id="cms" name="Certificate Management Service" level="server">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="cms_build" filter="s60" name="CMS" introduced="^3">
+    <unit bldFile="cms/group"/>
+   </component>
+  </collection>
+  <collection id="pkiutilities" name="PKI Utilities" level="plugin">
+   <component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+    <unit bldFile="pkiutilities/x509certnameparser/group"/>
+   </component>
+   <component id="pkcs12" filter="s60" name="PKCS #12">
+    <unit bldFile="pkiutilities/pkcs12/group"/>
+   </component>
+   <component id="certmanui" filter="s60" name="Certificate Management UI">
+    <unit bldFile="pkiutilities/certmanui/group"/>
+   </component>
+   <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+    <unit bldFile="pkiutilities/ctsecuritydialogs/group"/>
+   </component>
+   <component id="certsaver" filter="s60" name="Certificate Saver">
+    <unit bldFile="pkiutilities/certsaver/group"/>
+   </component>
+   <component id="secmodui" filter="s60" name="Security Module UI">
+    <unit bldFile="pkiutilities/secmodui/group"/>
+   </component>
+   <component id="devicetoken" filter="s60" name="Device Token">
+    <unit bldFile="pkiutilities/devicetoken/group"/>
+   </component>
+   <component id="certificates" filter="s60" name="Certificates">
+    <unit bldFile="pkiutilities/Certificates/group" filter="sf_build"/>
+   </component>
+   <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+    <!-- need to split this into the above components -->
+    <unit bldFile="pkiutilities/group"/>
+   </component>
+   <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+    <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+   </component>
+  </collection>
+  <collection id="wim" name="Wireless Identity Module" level="framework">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="wim_build" filter="s60" name="WIM Build">
+    <unit bldFile="wim/group"/>
+   </component>
+  </collection>
+  <collection id="remotelock" name="Remote Lock" level="generic">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="remotelock_build" filter="s60" name="Remote Lock Build">
+    <unit bldFile="remotelock/group"/>
+   </component>
+  </collection>
+  <collection id="securitydialogs" name="Security Dialogs" level="specific">
+   <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+    <unit bldFile="securitydialogs/keylockpolicyapi/group"/>
+   </component>
+   <component id="autolock" name="Autolock" filter="s60">
+    <unit bldFile="securitydialogs/autolock/group"/>
+   </component>
+   <component id="secui" filter="s60" name="Security UI">
+    <unit bldFile="securitydialogs/secui/group"/>
+   </component>
+   <component id="securitynotifier" filter="s60" name="Security Notifier">
+    <unit bldFile="securitydialogs/securitynotifier/group"/>
+   </component>
+   <component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
+    <unit bldFile="securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+    <unit bldFile="securitydialogs/lockapp/group"/>
+   </component>
+   <component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
+      <unit bldFile="securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+    <unit bldFile="boottimeintegritycheck/group"/>
+   </component>
+  </collection>
+  <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+   <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+    <unit bldFile="gba/uicc/group"/>
+   </component>
+   <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+    <unit bldFile="gba/gbaserver/group"/>
+   </component>
+   <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+    <unit bldFile="gba/gbaapi/group"/>
+   </component>
+   <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+    <unit bldFile="gba/gbafilter/group"/>
+   </component>
+   <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+    <!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
+    <unit bldFile="gba/group"/>
+   </component>
+  </collection>
+  <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+   <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+    <unit bldFile="devencdiskutils/DevEncCommonUtils/group"/>
+   </component>
+   <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+    <unit bldFile="devencdiskutils/DevEncRfsPlugin/group"/>
+   </component>
+   <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+    <unit bldFile="devencdiskutils/Pk5Recognizer/group"/>
+   </component>
+   <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+    <unit bldFile="devencdiskutils/DevEncStarter/group"/>
+   </component>
+   <component id="devencdiskutils_build" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+    <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
+    <unit bldFile="devencdiskutils/group"/>
+   </component>
+  </collection>
+  <collection id="securitysrv_info" name="Security Services Info" level="specific">
+   <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/securitysrv/package_definition_3.0.xml
--- a/symbian4/mw/securitysrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="securitysrv" name="Security Services" levels="plugin framework server generic specific">
-  <collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
-   <component id="cms_api" name="CMS API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/cms_api/cms_api.metaxml"/>
-    <unit bldFile="secsrv_plat/cms_api/group"/>
-   </component>
-   <component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/pkcs12_parser_api/pkcs12_parser_api.metaxml"/>
-    <unit bldFile="secsrv_plat/pkcs12_parser_api/group"/>
-   </component>
-   <component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/java_utils_api/java_utils_api.metaxml"/>
-    <unit bldFile="secsrv_plat/java_utils_api/group"/>
-   </component>
-   <component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/wim_cert_api/wim_cert_api.metaxml"/>
-    <unit bldFile="secsrv_plat/wim_cert_api/group"/>
-   </component>
-   <component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/device_key_store_encryption_plugin_api/device_key_store_encryption_plugin_api.metaxml"/>
-    <unit bldFile="secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-   </component>
-   <component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/x509certnameparser_api/x509certnameparser_api.metaxml"/>
-    <unit bldFile="secsrv_plat/x509certnameparser_api/group"/>
-   </component>
-   <component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/remote_lock_api/remote_lock_api.metaxml"/>
-    <unit bldFile="secsrv_plat/remote_lock_api/group"/>
-   </component>
-   <component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/pkidialog_api/pkidialog_api.metaxml"/>
-    <unit bldFile="secsrv_plat/pkidialog_api/group"/>
-   </component>
-   <component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/provisioning_api/provisioning_api.metaxml"/>
-    <unit bldFile="secsrv_plat/provisioning_api/group"/>
-   </component>
-   <component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/keyguard_configuration_api/keyguard_configuration_api.metaxml"/>
-    <unit bldFile="secsrv_plat/keyguard_configuration_api/group"/>
-   </component>
-   <component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/keylock_policy_api/keylock_policy_api.metaxml"/>
-    <unit bldFile="secsrv_plat/keylock_policy_api/group"/>
-   </component>
-   <component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/security_code_ui_api/security_code_ui_api.metaxml"/>
-    <unit bldFile="secsrv_plat/security_code_ui_api/group"/>
-   </component>
-   <component id="gba_api" name="GBA API" class="api" filter="s60">
-    <meta rel="Api" href="secsrv_plat/gba_api/gba_api.metaxml"/>
-    <unit bldFile="secsrv_plat/gba_api/group"/>
-   </component>
-   <component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
-    <unit bldFile="secsrv_plat/keyguard_access_api/group"/>
-   </component>
-   <component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
-    <unit bldFile="secsrv_plat/devicelock_access_api/group"/>
-   </component>
-   <component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
-    <unit bldFile="secsrv_plat/lockapp_server_api/group"/>
-   </component>
-   <component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
-    <unit bldFile="secsrv_plat/devencadaptation_api/group"/>
-   </component>
-   <component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
-    <unit bldFile="secsrv_plat/devenccommonutils_api/group"/>
-   </component>
-  </collection>
-  <collection id="cms" name="Certificate Management Service" level="server">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="cms_build" filter="s60" name="CMS" introduced="^3">
-    <unit bldFile="cms/group"/>
-   </component>
-  </collection>
-  <collection id="pkiutilities" name="PKI Utilities" level="plugin">
-   <component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
-    <unit bldFile="pkiutilities/x509certnameparser/group"/>
-   </component>
-   <component id="pkcs12" filter="s60" name="PKCS #12">
-    <unit bldFile="pkiutilities/pkcs12/group"/>
-   </component>
-   <component id="certmanui" filter="s60" name="Certificate Management UI">
-    <unit bldFile="pkiutilities/certmanui/group"/>
-   </component>
-   <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
-    <unit bldFile="pkiutilities/ctsecuritydialogs/group"/>
-   </component>
-   <component id="certsaver" filter="s60" name="Certificate Saver">
-    <unit bldFile="pkiutilities/certsaver/group"/>
-   </component>
-   <component id="secmodui" filter="s60" name="Security Module UI">
-    <unit bldFile="pkiutilities/secmodui/group"/>
-   </component>
-   <component id="devicetoken" filter="s60" name="Device Token">
-    <unit bldFile="pkiutilities/devicetoken/group"/>
-   </component>
-   <component id="certificates" filter="s60" name="Certificates">
-    <unit bldFile="pkiutilities/Certificates/group" filter="sf_build"/>
-   </component>
-   <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
-    <!-- need to split this into the above components -->
-    <unit bldFile="pkiutilities/group"/>
-   </component>
-   <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-    <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-   </component>
-  </collection>
-  <collection id="wim" name="Wireless Identity Module" level="framework">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="wim_build" filter="s60" name="WIM Build">
-    <unit bldFile="wim/group"/>
-   </component>
-  </collection>
-  <collection id="remotelock" name="Remote Lock" level="generic">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="remotelock_build" filter="s60" name="Remote Lock Build">
-    <unit bldFile="remotelock/group"/>
-   </component>
-  </collection>
-  <collection id="securitydialogs" name="Security Dialogs" level="specific">
-   <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
-    <unit bldFile="securitydialogs/keylockpolicyapi/group"/>
-   </component>
-   <component id="autolock" name="Autolock" filter="s60">
-    <unit bldFile="securitydialogs/autolock/group"/>
-   </component>
-   <component id="secui" filter="s60" name="Security UI">
-    <unit bldFile="securitydialogs/secui/group"/>
-   </component>
-   <component id="securitynotifier" filter="s60" name="Security Notifier">
-    <unit bldFile="securitydialogs/securitynotifier/group"/>
-   </component>
-   <component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
-    <unit bldFile="securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
-   </component>
-   <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
-    <unit bldFile="securitydialogs/lockapp/group"/>
-   </component>
-   <component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
-      <unit bldFile="securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
-   </component>
-  </collection>
-  <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
-    <unit bldFile="boottimeintegritycheck/group"/>
-   </component>
-  </collection>
-  <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
-   <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
-    <unit bldFile="gba/uicc/group"/>
-   </component>
-   <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
-    <unit bldFile="gba/gbaserver/group"/>
-   </component>
-   <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
-    <unit bldFile="gba/gbaapi/group"/>
-   </component>
-   <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
-    <unit bldFile="gba/gbafilter/group"/>
-   </component>
-   <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
-    <!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
-    <unit bldFile="gba/group"/>
-   </component>
-  </collection>
-  <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
-   <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
-    <unit bldFile="devencdiskutils/DevEncCommonUtils/group"/>
-   </component>
-   <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
-    <unit bldFile="devencdiskutils/DevEncRfsPlugin/group"/>
-   </component>
-   <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
-    <unit bldFile="devencdiskutils/Pk5Recognizer/group"/>
-   </component>
-   <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
-    <unit bldFile="devencdiskutils/DevEncStarter/group"/>
-   </component>
-   <component id="devencdiskutils_build" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
-    <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
-    <unit bldFile="devencdiskutils/group"/>
-   </component>
-  </collection>
-  <collection id="securitysrv_info" name="Security Services Info" level="specific">
-   <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
-    <unit bldFile="tsrc/group"/>
-   </component>
-   <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/serviceapi/package_definition.xml
--- a/symbian4/mw/serviceapi/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/serviceapi/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,126 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
-        <!-- should break up this collection into something meaningful -->
-        <collection name="serviceproviders" long-name="Service Providers" level="mw1">
-          <component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-          </component>
-          <component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/group"/>
-          </component>
-          <component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-          </component>
-          <component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-          </component>
-          <component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-          </component>
-          <component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-          </component>
-          <component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-          </component>
-          <component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/group"/>
-          </component>
-          <component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-          </component>
-          <component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-          </component>
-          <component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-          </component>
-          <component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/jsapi/group"/>
-          </component>
-          <component name="serviceproviders_build" filter="s60" long-name="Service API Build">
-            <!--  distribute the exports or make this a ROM component by removing the #includes -->
-            <unit bldFile="/sf/mw/serviceapi/serviceproviders/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="serviceapi" name="Service API" levels="os mw1 mw2 app">
+  	<!-- should break up this collection into something meaningful -->
+    <collection id="serviceproviders" name="Service Providers" level="mw1">
+      <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI"  filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>
+      </component>
+      <component id="sapi_location" name="Location SAPI"  filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_location/group"/>
+      </component>
+      <component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_mediamanagement/group"/>
+      </component>
+      <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_landmarks/group"/>
+      </component>
+      <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_messaging/group"/>
+      </component>
+
+      <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>
+      </component>
+      <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_calendar/group"/>
+      </component>
+      <component id="sapi_logging" name="Logging SAPI"  filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_logging/group"/>
+      </component>
+      <component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_sensor/group"/>
+      </component>
+      <component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_sysinfo/group"/>
+      </component>
+      <component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/sapi_serviceregistry/group"/>
+      </component>
+      <component id="jsapi" name="Javascript API" filter="s60" class="plugin">
+        <unit bldFile="serviceproviders/jsapi/group"/>
+      </component>
+      <component id="serviceproviders_build" filter="s60" name="Service API Build">
+      	<!--  distribute the exports or make this a ROM component by removing the #includes -->
+        <unit bldFile="serviceproviders/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/serviceapi/package_definition_3.0.xml
--- a/symbian4/mw/serviceapi/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="serviceapi" name="Service API" levels="os mw1 mw2 app">
-  	<!-- should break up this collection into something meaningful -->
-    <collection id="serviceproviders" name="Service Providers" level="mw1">
-      <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI"  filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>
-      </component>
-      <component id="sapi_location" name="Location SAPI"  filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_location/group"/>
-      </component>
-      <component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_mediamanagement/group"/>
-      </component>
-      <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_landmarks/group"/>
-      </component>
-      <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_messaging/group"/>
-      </component>
-
-      <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>
-      </component>
-      <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_calendar/group"/>
-      </component>
-      <component id="sapi_logging" name="Logging SAPI"  filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_logging/group"/>
-      </component>
-      <component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_sensor/group"/>
-      </component>
-      <component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_sysinfo/group"/>
-      </component>
-      <component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_serviceregistry/group"/>
-      </component>
-      <component id="jsapi" name="Javascript API" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/jsapi/group"/>
-      </component>
-      <component id="serviceproviders_build" filter="s60" name="Service API Build">
-      	<!--  distribute the exports or make this a ROM component by removing the #includes -->
-        <unit bldFile="serviceproviders/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/serviceapifw/package_definition.xml
--- a/symbian4/mw/serviceapifw/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/serviceapifw/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,133 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
-        <collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
-        <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-          <component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-          </component>
-          <component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-          </component>
-          <component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-          </component>
-          <component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-          </component>
-          <component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-          </component>
-          <component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-          </component>
-          <component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-          </component>
-          <component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-          </component>
-          <component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-          </component>
-        </collection>
-        <collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
-          <component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
-            <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-          </component>
-          <component name="rtsecuritymanagerserver" filter="s60" long-name="Runtime Security Manager Server">
-            <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-          </component>
-          <component name="rtsecuritymanagerclient" filter="s60" long-name="Runtime Security Manager Client">
-            <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-          </component>
-          <component name="rtsecuritymanager_build" filter="s60" long-name="Runtime Security Manager Build">
-            <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-            <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/group"/>
-          </component>
-        </collection>
-        <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-          <component name="lifwservicehandler" filter="s60" long-name="Service Handler">
-            <unit bldFile="/sf/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="serviceapifw" name="Service API Framework" levels="plugin framework server generic specific">
+  <collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
+  <collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
+   <component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/rtsecuritymanager_common_api/rtsecuritymanager_common_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+   </component>
+   <component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/rtsecuritymanager_utility_api/rtsecuritymanager_utility_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+   </component>
+   <component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/rtsecuritymanager_client_api/rtsecuritymanager_client_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+   </component>
+   <component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/liw_provider_utility_api/liw_provider_utility_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/liw_provider_utility_api/group"/>
+   </component>
+   <component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/liw_service_interface_base_api/liw_service_interface_base_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/liw_service_interface_base_api/group"/>
+   </component>
+   <component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/liw_service_interface_menu_api/liw_service_interface_menu_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/liw_service_interface_menu_api/group"/>
+   </component>
+   <component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/liw_criteria_api/liw_criteria_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/liw_criteria_api/group"/>
+   </component>
+   <component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/liw_generic_parameter_api/liw_generic_parameter_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/liw_generic_parameter_api/group"/>
+   </component>
+   <component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
+    <meta rel="Api" href="serviceapifw_plat/liw_service_handler_api/liw_service_handler_api.metaxml"/>
+    <unit bldFile="serviceapifw_plat/liw_service_handler_api/group"/>
+   </component>
+  </collection>
+  <collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
+   <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
+    <unit bldFile="rtsecuritymanager/rtsecuritymanagerutil/group"/>
+   </component>
+   <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+    <unit bldFile="rtsecuritymanager/rtsecuritymanagerserver/group"/>
+   </component>
+   <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+    <unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
+   </component>
+   <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+    <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+    <unit bldFile="rtsecuritymanager/group"/>
+   </component>
+  </collection>
+  <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+   <component id="lifwservicehandler" filter="s60" name="Service Handler">
+    <unit bldFile="languageinterworkingfw/servicehandler/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/serviceapifw/package_definition_3.0.xml
--- a/symbian4/mw/serviceapifw/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="serviceapifw" name="Service API Framework" levels="plugin framework server generic specific">
-  <collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
-  <collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
-   <component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/rtsecuritymanager_common_api/rtsecuritymanager_common_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-   </component>
-   <component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/rtsecuritymanager_utility_api/rtsecuritymanager_utility_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-   </component>
-   <component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/rtsecuritymanager_client_api/rtsecuritymanager_client_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-   </component>
-   <component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/liw_provider_utility_api/liw_provider_utility_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/liw_provider_utility_api/group"/>
-   </component>
-   <component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/liw_service_interface_base_api/liw_service_interface_base_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/liw_service_interface_base_api/group"/>
-   </component>
-   <component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/liw_service_interface_menu_api/liw_service_interface_menu_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/liw_service_interface_menu_api/group"/>
-   </component>
-   <component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/liw_criteria_api/liw_criteria_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/liw_criteria_api/group"/>
-   </component>
-   <component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/liw_generic_parameter_api/liw_generic_parameter_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/liw_generic_parameter_api/group"/>
-   </component>
-   <component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
-    <meta rel="Api" href="serviceapifw_plat/liw_service_handler_api/liw_service_handler_api.metaxml"/>
-    <unit bldFile="serviceapifw_plat/liw_service_handler_api/group"/>
-   </component>
-  </collection>
-  <collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
-   <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
-    <unit bldFile="rtsecuritymanager/rtsecuritymanagerutil/group"/>
-   </component>
-   <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
-    <unit bldFile="rtsecuritymanager/rtsecuritymanagerserver/group"/>
-   </component>
-   <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
-    <unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
-   </component>
-   <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
-    <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-    <unit bldFile="rtsecuritymanager/group"/>
-   </component>
-  </collection>
-  <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
-   <component id="lifwservicehandler" filter="s60" name="Service Handler">
-    <unit bldFile="languageinterworkingfw/servicehandler/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/shortlinkconn/package_definition.xml
--- a/symbian4/mw/shortlinkconn/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/shortlinkconn/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,136 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-        <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-        <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-          <component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-          </component>
-          <component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-          </component>
-          <component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-          </component>
-          <component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-          </component>
-          <component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-          </component>
-          <component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-          </component>
-          <component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-          </component>
-          <component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-          </component>
-        </collection>
-        <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-          <component name="locod" long-name="Local Connectivity Daemon">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
-          </component>
-          <component name="obexserviceman" long-name="OBEX Service Managar">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-          </component>
-          <component name="obexsendservices" long-name="OBEX Send Services">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-          </component>
-          <component name="obexreceiveservices" long-name="OBEX Receive Services">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-          </component>
-          <component name="dun" long-name="Dial Up Networking">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
-          </component>
-          <component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-          </component>
-          <component name="generichid" long-name="Generic HID">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-          </component>
-          <component name="headset" long-name="Headset">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/headset/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="shortlinkconn" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+  <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+  <collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
+   <component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+    <meta rel="Api" href="shortlinkconn_plat/obex_service_utils_api/obex_service_utils_api.metaxml"/>
+    <unit bldFile="shortlinkconn_plat/obex_service_utils_api/group"/>
+   </component>
+   <component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="shortlinkconn_plat/obex_service_plugin_api/obex_service_plugin_api.metaxml"/>
+    <unit bldFile="shortlinkconn_plat/obex_service_plugin_api/group"/>
+   </component>
+   <component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
+    <meta rel="Api" href="shortlinkconn_plat/dialup_connection_status_api/dialup_connection_status_api.metaxml"/>
+    <unit bldFile="shortlinkconn_plat/dialup_connection_status_api/group"/>
+   </component>
+   <component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
+    <meta rel="Api" href="shortlinkconn_plat/dun_secondary_display_notification_api/dun_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+   </component>
+   <component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+    <meta rel="Api" href="shortlinkconn_plat/obex_secondary_display_notification_api/obex_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+   </component>
+   <component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+    <unit bldFile="shortlinkconn_plat/generic_hid_api/group"/>
+   </component>
+   <component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+    <unit bldFile="shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+   </component>
+   <component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
+    <unit bldFile="shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+   </component>
+  </collection>
+  <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+   <component id="locod" name="Local Connectivity Daemon">
+    <unit bldFile="localconnectivityservice/locod/group"/>
+   </component>
+   <component id="obexserviceman" name="OBEX Service Managar">
+    <unit bldFile="localconnectivityservice/obexserviceman/group"/>
+   </component>
+   <component id="obexsendservices" name="OBEX Send Services">
+    <unit bldFile="localconnectivityservice/obexsendservices/group"/>
+   </component>
+   <component id="obexreceiveservices" name="OBEX Receive Services">
+    <unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
+   </component>
+   <component id="dun" name="Dial Up Networking">
+    <unit bldFile="localconnectivityservice/dun/group"/>
+   </component>
+   <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
+    <unit bldFile="localconnectivityservice/lcstylustap/group"/>
+   </component>
+   <component id="generichid" name="Generic HID">
+    <unit bldFile="localconnectivityservice/generichid/group"/>
+   </component>
+   <component id="headset" name="Headset">
+    <unit bldFile="localconnectivityservice/headset/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/shortlinkconn/package_definition_3.0.xml
--- a/symbian4/mw/shortlinkconn/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="shortlinkconn" name="Shortlink Connectivity" levels="framework server generic specific plugin">
-  <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-  <collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
-   <component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
-    <meta rel="Api" href="shortlinkconn_plat/obex_service_utils_api/obex_service_utils_api.metaxml"/>
-    <unit bldFile="shortlinkconn_plat/obex_service_utils_api/group"/>
-   </component>
-   <component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="shortlinkconn_plat/obex_service_plugin_api/obex_service_plugin_api.metaxml"/>
-    <unit bldFile="shortlinkconn_plat/obex_service_plugin_api/group"/>
-   </component>
-   <component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
-    <meta rel="Api" href="shortlinkconn_plat/dialup_connection_status_api/dialup_connection_status_api.metaxml"/>
-    <unit bldFile="shortlinkconn_plat/dialup_connection_status_api/group"/>
-   </component>
-   <component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
-    <meta rel="Api" href="shortlinkconn_plat/dun_secondary_display_notification_api/dun_secondary_display_notification_api.metaxml"/>
-    <unit bldFile="shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-   </component>
-   <component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
-    <meta rel="Api" href="shortlinkconn_plat/obex_secondary_display_notification_api/obex_secondary_display_notification_api.metaxml"/>
-    <unit bldFile="shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-   </component>
-   <component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
-    <unit bldFile="shortlinkconn_plat/generic_hid_api/group"/>
-   </component>
-   <component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
-    <unit bldFile="shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-   </component>
-   <component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
-    <unit bldFile="shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-   </component>
-  </collection>
-  <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
-   <component id="locod" name="Local Connectivity Daemon">
-    <unit bldFile="localconnectivityservice/locod/group"/>
-   </component>
-   <component id="obexserviceman" name="OBEX Service Managar">
-    <unit bldFile="localconnectivityservice/obexserviceman/group"/>
-   </component>
-   <component id="obexsendservices" name="OBEX Send Services">
-    <unit bldFile="localconnectivityservice/obexsendservices/group"/>
-   </component>
-   <component id="obexreceiveservices" name="OBEX Receive Services">
-    <unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
-   </component>
-   <component id="dun" name="Dial Up Networking">
-    <unit bldFile="localconnectivityservice/dun/group"/>
-   </component>
-   <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
-    <unit bldFile="localconnectivityservice/lcstylustap/group"/>
-   </component>
-   <component id="generichid" name="Generic HID">
-    <unit bldFile="localconnectivityservice/generichid/group"/>
-   </component>
-   <component id="headset" name="Headset">
-    <unit bldFile="localconnectivityservice/headset/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/srvdiscovery/package_definition.xml
--- a/symbian4/mw/srvdiscovery/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,118 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
-        <collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
-          <component name="upnp_device_api" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
-          </component>
-          <component name="upnp_common_api" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
-          </component>
-          <component name="upnp_utils_api" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
-          </component>
-          <component name="upnp_control_point_api" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
-          </component>
-          <component name="upnp_httpserver_api" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
-          </component>
-          <component name="upnp_http_transfer_api" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
-          </component>
-        </collection>
-        <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-          <component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
-          </component>
-        </collection>
-        <collection name="upnp" long-name="UPnP" level="server">
-          <component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack/group"/>
-          </component>
-        </collection>
-        <collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
-          <component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+  <collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
+   <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+    <meta rel="Api" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
+    <unit bldFile="upnp/upnpstack_plat/upnp_device_api/group"/>
+   </component>
+   <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+    <meta rel="Api" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
+    <unit bldFile="upnp/upnpstack_plat/upnp_common_api/group"/>
+   </component>
+   <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+    <meta rel="Api" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
+    <unit bldFile="upnp/upnpstack_plat/upnp_utils_api/group"/>
+   </component>
+   <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+    <meta rel="Api" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
+    <unit bldFile="upnp/upnpstack_plat/upnp_control_point_api/group"/>
+   </component>
+   <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+    <meta rel="Api" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
+    <unit bldFile="upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+   </component>
+   <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+    <meta rel="Api" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
+    <unit bldFile="upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
+   </component>
+  </collection>
+  <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
+   <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+    <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+   </component>
+  </collection>
+  <collection id="upnp" name="UPnP" level="server">
+   <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+    <unit bldFile="upnp/upnpstack/group"/>
+   </component>
+  </collection>
+  <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
+   <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/srvdiscovery/package_definition_3.0.xml
--- a/symbian4/mw/srvdiscovery/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
-  <collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
-   <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
-    <meta rel="Api" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
-    <unit bldFile="upnp/upnpstack_plat/upnp_device_api/group"/>
-   </component>
-   <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
-    <meta rel="Api" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
-    <unit bldFile="upnp/upnpstack_plat/upnp_common_api/group"/>
-   </component>
-   <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
-    <meta rel="Api" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
-    <unit bldFile="upnp/upnpstack_plat/upnp_utils_api/group"/>
-   </component>
-   <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
-    <meta rel="Api" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
-    <unit bldFile="upnp/upnpstack_plat/upnp_control_point_api/group"/>
-   </component>
-   <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
-    <meta rel="Api" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
-    <unit bldFile="upnp/upnpstack_plat/upnp_httpserver_api/group"/>
-   </component>
-   <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
-    <meta rel="Api" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
-    <unit bldFile="upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
-   </component>
-  </collection>
-  <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
-   <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
-    <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
-   </component>
-  </collection>
-  <collection id="upnp" name="UPnP" level="server">
-   <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
-    <unit bldFile="upnp/upnpstack/group"/>
-   </component>
-  </collection>
-  <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
-   <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/svgt/package_definition.xml
--- a/symbian4/mw/svgt/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/svgt/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-        <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-          <component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/svgt/svgt_plat/svgt_api/group"/>
-          </component>
-          <component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/svgt/svgt_plat/nvg_api/group"/>
-          </component>
-        </collection>
-        <collection name="svgtopt" long-name="SVG-T Engine" level="util">
-          <component name="svgtopt_build" filter="s60" long-name="SVG Engine" introduced="9.2">
-            <!-- component is at collection level. Needs to be moved down a directory -->
-            <unit bldFile="/sf/mw/svgt/svgtopt/group"/>
-          </component>
-          <component name="svgtplugin" filter="s60" long-name="SVG Plugin" introduced="9.2" plugin="Y">
-            <unit bldFile="/sf/mw/svgt/svgtopt/svgtplugin/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="svgt" name="SVG Tiny" levels="util ui">
+  <collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+   <component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+    <meta rel="Api" href="svgt_plat/svgt_api/svgt_api.metaxml"/>
+    <unit bldFile="svgt_plat/svgt_api/group"/>
+   </component>
+   <component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+    <meta rel="Api" href="svgt_plat/nvg_api/nvg_api.metaxml"/>
+    <unit bldFile="svgt_plat/nvg_api/group"/>
+   </component>
+  </collection>
+  <collection id="svgtopt" name="SVG-T Engine" level="util">
+   <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+    <!-- component is at collection level. Needs to be moved down a directory -->
+    <unit bldFile="svgtopt/group"/>
+   </component>
+   <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+    <unit bldFile="svgtopt/svgtplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/svgt/package_definition_3.0.xml
--- a/symbian4/mw/svgt/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="svgt" name="SVG Tiny" levels="util ui">
-  <collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
-   <component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
-    <meta rel="Api" href="svgt_plat/svgt_api/svgt_api.metaxml"/>
-    <unit bldFile="svgt_plat/svgt_api/group"/>
-   </component>
-   <component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
-    <meta rel="Api" href="svgt_plat/nvg_api/nvg_api.metaxml"/>
-    <unit bldFile="svgt_plat/nvg_api/group"/>
-   </component>
-  </collection>
-  <collection id="svgtopt" name="SVG-T Engine" level="util">
-   <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
-    <!-- component is at collection level. Needs to be moved down a directory -->
-    <unit bldFile="svgtopt/group"/>
-   </component>
-   <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
-    <unit bldFile="svgtopt/svgtplugin/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/uiaccelerator/package_definition.xml
--- a/symbian4/mw/uiaccelerator/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/uiaccelerator/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,117 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-        <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
-          <component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-          </component>
-          <component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-          </component>
-          <component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-          </component>
-          <component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-          </component>
-          <component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-          </component>
-          <component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-          </component>
-        </collection>
-        <collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
-          <component name="hitchcock" filter="s60" long-name="Hitchcock">
-            <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-          </component>
-          <component name="uiacceltk_build" filter="s60" long-name="UI Accelerator Toolkit Build">
-            <!-- move into the other component, or  remove the #include and make this UI Accelerator Toolkit ROM-->
-            <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/group"/>
-          </component>
-        </collection>
-        <collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex">
-          <component name="uiaccelerator_test_build" long-name="UI Accelerator Test Build" filter="test,unit_test" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/uiaccelerator/tsrc/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="uiaccelerator" name="UI Accelerator" levels="plugin framework server ex if">
+  <collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+   <component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_core_toolkit_api/alf_core_toolkit_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_core_toolkit_api/group"/>
+   </component>
+   <component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_visual_api/alf_visual_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_visual_api/group"/>
+   </component>
+   <component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_extended_visual_api/alf_extended_visual_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_extended_visual_api/group"/>
+   </component>
+   <component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_extension_api/alf_extension_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_extension_api/group"/>
+   </component>
+   <component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_tracing_api/alf_tracing_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_tracing_api/group"/>
+   </component>
+   <component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_client_server_api/alf_client_server_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_client_server_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+   <component id="hitchcock" filter="s60" name="Hitchcock">
+    <unit bldFile="uiacceltk/hitchcock/group"/>
+   </component>
+   <component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+    <!-- move into the other component, or  remove the #include and make this UI Accelerator Toolkit ROM-->
+    <unit bldFile="uiacceltk/group"/>
+   </component>
+  </collection>
+  <collection id="uiaccelerator_test" name="UI Accelerator Test" level="ex">
+    <component id="uiaccelerator_test_build" name="UI Accelerator Test Build" filter="test,unit_test" purpose="development" introduced="^4">
+      <unit bldFile="tsrc/group"/>
+     </component>
+    </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/uiaccelerator/package_definition_3.0.xml
--- a/symbian4/mw/uiaccelerator/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="uiaccelerator" name="UI Accelerator" levels="plugin framework server ex if">
-  <collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
-   <component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
-    <meta rel="Api" href="uiaccelerator_plat/alf_core_toolkit_api/alf_core_toolkit_api.metaxml"/>
-    <unit bldFile="uiaccelerator_plat/alf_core_toolkit_api/group"/>
-   </component>
-   <component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
-    <meta rel="Api" href="uiaccelerator_plat/alf_visual_api/alf_visual_api.metaxml"/>
-    <unit bldFile="uiaccelerator_plat/alf_visual_api/group"/>
-   </component>
-   <component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
-    <meta rel="Api" href="uiaccelerator_plat/alf_extended_visual_api/alf_extended_visual_api.metaxml"/>
-    <unit bldFile="uiaccelerator_plat/alf_extended_visual_api/group"/>
-   </component>
-   <component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
-    <meta rel="Api" href="uiaccelerator_plat/alf_extension_api/alf_extension_api.metaxml"/>
-    <unit bldFile="uiaccelerator_plat/alf_extension_api/group"/>
-   </component>
-   <component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
-    <meta rel="Api" href="uiaccelerator_plat/alf_tracing_api/alf_tracing_api.metaxml"/>
-    <unit bldFile="uiaccelerator_plat/alf_tracing_api/group"/>
-   </component>
-   <component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
-    <meta rel="Api" href="uiaccelerator_plat/alf_client_server_api/alf_client_server_api.metaxml"/>
-    <unit bldFile="uiaccelerator_plat/alf_client_server_api/group"/>
-   </component>
-  </collection>
-  <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
-   <component id="hitchcock" filter="s60" name="Hitchcock">
-    <unit bldFile="uiacceltk/hitchcock/group"/>
-   </component>
-   <component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
-    <!-- move into the other component, or  remove the #include and make this UI Accelerator Toolkit ROM-->
-    <unit bldFile="uiacceltk/group"/>
-   </component>
-  </collection>
-  <collection id="uiaccelerator_test" name="UI Accelerator Test" level="ex">
-    <component id="uiaccelerator_test_build" name="UI Accelerator Test Build" filter="test,unit_test" purpose="development" introduced="^4">
-      <unit bldFile="tsrc/group"/>
-     </component>
-    </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/uiresources/package_definition.xml
--- a/symbian4/mw/uiresources/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/uiresources/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,239 +1,183 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-        <!-- are the custom filters below needed? -->
-        <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-          <component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
-          </component>
-          <component name="skins_api" long-name="Skins API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
-          </component>
-          <component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
-          </component>
-          <component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
-          </component>
-          <component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-          </component>
-          <component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-          </component>
-        </collection>
-        <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-          <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
-          </component>
-          <component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
-          </component>
-          <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
-          </component>
-          <component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
-          </component>
-          <component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-          </component>
-          <component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
-          </component>
-          <component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
-          </component>
-          <component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-          </component>
-          <component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-          </component>
-          <component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-          </component>
-          <component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-          </component>
-          <component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-          </component>
-          <component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-          </component>
-          <component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
-          </component>
-          <component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-          </component>
-          <component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-          </component>
-        </collection>
-        <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-          <component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development">
-            <unit bldFile="/sf/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
-          </component>
-        </collection>
-        <collection name="uigraphics" long-name="UI Graphics" level="generic">
-          <component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/bitmaps2/group"/>
-          </component>
-          <component name="icons" filter="s60" long-name="Icons" class="config">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/icons/group"/>
-          </component>
-          <component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/variatedbitmaps/group"/>
-          </component>
-          <component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
-          </component>
-          <component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/nvgrenderstage/group"/>
-          </component>
-        </collection>
-        <collection name="layouts" long-name="Layouts" level="plugin">
-          <component name="cdl" filter="s60" long-name="Customization Definition Language">
-            <!-- can only have one unit. Need to #include them or split into multiple components -->
-            <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlengine/group"/>
-            <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlserver/group"/>
-          </component>
-          <component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-            <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/group"/>
-          </component>
-        </collection>
-        <collection name="skins" long-name="Skins" level="data">
-          <component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-            <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
-          </component>
-          <component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-            <unit bldFile="/sf/mw/uiresources/skins/aknskins/group"/>
-          </component>
-        </collection>
-        <collection name="pictographs" long-name="Pictographs" level="data">
-          <component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-            <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/group"/>
-          </component>
-        </collection>
-        <collection name="locales" long-name="Locales" level="framework">
-          <component name="locales_build" filter="s60" long-name="Locales Build">
-            <unit bldFile="/sf/mw/uiresources/locales/loce32"/>
-          </component>
-        </collection>
-        <collection name="uiconfig" long-name="UI Config" level="server">
-          <component name="s60config" filter="s60" long-name="S60 UI Config">
-            <unit bldFile="/sf/mw/uiresources/uiconfig/s60config/group"/>
-          </component>
-        </collection>
-        <collection name="fontsupport" long-name="Font Support" level="generic">
-          <component name="fontprovider" filter="s60" long-name="Font Provider">
-            <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
-          </component>
-          <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+<SystemDefinition schema="3.0.0">
+ <package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
+   <!-- are the custom filters below needed? -->
+  <collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+   <component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/pictograph_api/pictograph_api.metaxml"/>
+    <unit bldFile="uiresources_pub/pictograph_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
+   </component>
+   <component id="skins_api" name="Skins API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/skins_api/skins_api.metaxml"/>
+    <unit bldFile="uiresources_pub/skins_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
+   </component>
+   <component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/font_definition_api/font_definition_api.metaxml"/>
+    <unit bldFile="uiresources_pub/font_definition_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
+   </component>
+   <component id="graphics_api" name="Graphics API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/graphics_api/graphics_api.metaxml"/>
+    <unit bldFile="uiresources_pub/graphics_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
+   </component>
+   <component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/scalable_icons_api/scalable_icons_api.metaxml"/>
+    <unit bldFile="uiresources_pub/scalable_icons_api/group"/>
+   </component>
+   <component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/layout_id_definitions_api/layout_id_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_pub/layout_id_definitions_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+   <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
+    <unit bldFile="uiresources_plat/layout_system_private_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
+   </component>
+   <component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/layout_data_api/layout_data_api.metaxml"/>
+    <unit bldFile="uiresources_plat/layout_data_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
+   </component>
+   <component id="cdl_api" name="CDL API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/cdl_api/cdl_api.metaxml"/>
+    <unit bldFile="uiresources_plat/cdl_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
+   </component>
+   <component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/extended_skins_api/extended_skins_api.metaxml"/>
+    <unit bldFile="uiresources_plat/extended_skins_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
+   </component>
+   <component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/tfx_server_controller_plugin_api/tfx_server_controller_plugin_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_server_controller_plugin_api/group"/>
+   </component>
+   <component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/extended_fonts_api/extended_fonts_api.metaxml"/>
+    <unit bldFile="uiresources_plat/extended_fonts_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
+   </component>
+   <component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/graphic_configuration_api/graphic_configuration_api.metaxml"/>
+    <unit bldFile="uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
+   </component>
+   <component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/mif_header_cdl_api/mif_header_cdl_api.metaxml"/>
+    <unit bldFile="uiresources_plat/mif_header_cdl_api/group"/>
+   </component>
+   <component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/personalisation_and_skins_settings_api/personalisation_and_skins_settings_api.metaxml"/>
+    <unit bldFile="uiresources_plat/personalisation_and_skins_settings_api/group"/>
+   </component>
+   <component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/tfx_effect_setup_plugin_api/tfx_effect_setup_plugin_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+   </component>
+   <component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/mifconv_definitions_api/mifconv_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/mifconv_definitions_api/group"/>
+   </component>
+   <component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/wallpaper_configuration_api/wallpaper_configuration_api.metaxml"/>
+    <unit bldFile="uiresources_plat/wallpaper_configuration_api/group"/>
+   </component>
+   <component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/language_code_definitions_api/language_code_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/language_code_definitions_api/group"/>
+   </component>
+   <component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/skins_image_attributes_api/skins_image_attributes_api.metaxml"/>
+    <unit bldFile="uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
+   </component>
+   <component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/private_user_area_code_definitions_api/private_user_area_code_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/private_user_area_code_definitions_api/group"/>
+   </component>
+   <component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/tfx_server_plugin_ids_api/tfx_server_plugin_ids_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_server_plugin_ids_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiresources_info" name="UI Resources Info" level="data">
+   <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+    <unit bldFile="tsrc/group" filter="uiresources_api_all"/>
+   </component>
+  </collection>
+  <collection id="uigraphics" name="UI Graphics" level="generic">
+   <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+    <unit bldFile="uigraphics/bitmaps2/group"/>
+   </component>
+   <component id="icons" filter="s60" class="config" name="Icons">
+    <unit bldFile="uigraphics/icons/group"/>
+   </component>
+   <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+    <unit bldFile="uigraphics/variatedbitmaps/group"/>
+   </component>
+   <component id="aknicon" filter="s60" name="Avkon Icon Framework">
+    <unit bldFile="uigraphics/aknicon/group"/>
+   </component>
+   <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+    <unit bldFile="uigraphics/nvgrenderstage/group"/>
+   </component>
+  </collection>
+  <collection id="layouts" name="Layouts" level="plugin">
+   <component id="cdl" filter="s60" name="Customization Definition Language">
+    <!-- can only have one unit. Need to #include them or split into multiple components -->
+    <unit bldFile="layouts/cdl/cdlengine/group"/>
+    <unit bldFile="layouts/cdl/cdlserver/group"/>
+   </component>
+   <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+    <unit bldFile="layouts/aknlayout2/group"/>
+   </component>
+  </collection>
+  <collection id="skins" name="Skins" level="data">
+   <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+    <unit bldFile="skins/aknskincontent/group"/>
+   </component>
+   <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+    <unit bldFile="skins/aknskins/group"/>
+   </component>
+  </collection>
+  <collection id="pictographs" name="Pictographs" level="data">
+   <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+    <unit bldFile="pictographs/aknpictograph/group"/>
+   </component>
+  </collection>
+  <collection id="locales" name="Locales" level="framework">
+   <component id="locales_build" filter="s60" name="Locales Build">
+    <unit bldFile="locales/loce32"/>
+   </component>
+  </collection>
+  <collection id="uiconfig" name="UI Config" level="server">
+   <component id="s60config" filter="s60" name="S60 UI Config">
+    <unit bldFile="uiconfig/s60config/group"/>
+   </component>
+  </collection>
+  <collection id="fontsupport" name="Font Support" level="generic">
+   <component id="fontprovider" filter="s60" name="Font Provider">
+    <unit bldFile="fontsupport/fontprovider/group"/>
+   </component>
+   <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
       <component id="s60_fonts" filter="s60" name="S60 Fonts">
         <unit bldFile="fontsupport/fontutils/group"/>
       </component>
 -->
-          <component name="fontutils" filter="sf_build" long-name="Font Utils">
-            <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-          </component>
-        </collection>
-        <collection name="helpthemes" long-name="Help Themes" level="data">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-            <unit bldFile="/sf/mw/uiresources/helpthemes/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+   <component id="fontutils" filter="sf_build" name="Font Utils">
+    <unit bldFile="fontsupport/fontutils/FontUtils/group"/>
+   </component>
+  </collection>
+  <collection id="helpthemes" name="Help Themes" level="data">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+    <unit bldFile="helpthemes/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/uiresources/package_definition_3.0.xml
--- a/symbian4/mw/uiresources/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
-   <!-- are the custom filters below needed? -->
-  <collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
-   <component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_pub/pictograph_api/pictograph_api.metaxml"/>
-    <unit bldFile="uiresources_pub/pictograph_api/group" filter="!test"/>
-    <unit bldFile="uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
-   </component>
-   <component id="skins_api" name="Skins API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_pub/skins_api/skins_api.metaxml"/>
-    <unit bldFile="uiresources_pub/skins_api/group" filter="!test"/>
-    <unit bldFile="uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
-   </component>
-   <component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_pub/font_definition_api/font_definition_api.metaxml"/>
-    <unit bldFile="uiresources_pub/font_definition_api/group" filter="!test"/>
-    <unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
-   </component>
-   <component id="graphics_api" name="Graphics API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_pub/graphics_api/graphics_api.metaxml"/>
-    <unit bldFile="uiresources_pub/graphics_api/group" filter="!test"/>
-    <unit bldFile="uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
-   </component>
-   <component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_pub/scalable_icons_api/scalable_icons_api.metaxml"/>
-    <unit bldFile="uiresources_pub/scalable_icons_api/group"/>
-   </component>
-   <component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_pub/layout_id_definitions_api/layout_id_definitions_api.metaxml"/>
-    <unit bldFile="uiresources_pub/layout_id_definitions_api/group"/>
-   </component>
-  </collection>
-  <collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
-   <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
-    <unit bldFile="uiresources_plat/layout_system_private_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
-   </component>
-   <component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/layout_data_api/layout_data_api.metaxml"/>
-    <unit bldFile="uiresources_plat/layout_data_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
-   </component>
-   <component id="cdl_api" name="CDL API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/cdl_api/cdl_api.metaxml"/>
-    <unit bldFile="uiresources_plat/cdl_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
-   </component>
-   <component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/extended_skins_api/extended_skins_api.metaxml"/>
-    <unit bldFile="uiresources_plat/extended_skins_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
-   </component>
-   <component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/tfx_server_controller_plugin_api/tfx_server_controller_plugin_api.metaxml"/>
-    <unit bldFile="uiresources_plat/tfx_server_controller_plugin_api/group"/>
-   </component>
-   <component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/extended_fonts_api/extended_fonts_api.metaxml"/>
-    <unit bldFile="uiresources_plat/extended_fonts_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
-   </component>
-   <component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/graphic_configuration_api/graphic_configuration_api.metaxml"/>
-    <unit bldFile="uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
-   </component>
-   <component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/mif_header_cdl_api/mif_header_cdl_api.metaxml"/>
-    <unit bldFile="uiresources_plat/mif_header_cdl_api/group"/>
-   </component>
-   <component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/personalisation_and_skins_settings_api/personalisation_and_skins_settings_api.metaxml"/>
-    <unit bldFile="uiresources_plat/personalisation_and_skins_settings_api/group"/>
-   </component>
-   <component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/tfx_effect_setup_plugin_api/tfx_effect_setup_plugin_api.metaxml"/>
-    <unit bldFile="uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-   </component>
-   <component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/mifconv_definitions_api/mifconv_definitions_api.metaxml"/>
-    <unit bldFile="uiresources_plat/mifconv_definitions_api/group"/>
-   </component>
-   <component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/wallpaper_configuration_api/wallpaper_configuration_api.metaxml"/>
-    <unit bldFile="uiresources_plat/wallpaper_configuration_api/group"/>
-   </component>
-   <component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/language_code_definitions_api/language_code_definitions_api.metaxml"/>
-    <unit bldFile="uiresources_plat/language_code_definitions_api/group"/>
-   </component>
-   <component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/skins_image_attributes_api/skins_image_attributes_api.metaxml"/>
-    <unit bldFile="uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-    <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
-   </component>
-   <component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/private_user_area_code_definitions_api/private_user_area_code_definitions_api.metaxml"/>
-    <unit bldFile="uiresources_plat/private_user_area_code_definitions_api/group"/>
-   </component>
-   <component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
-    <meta rel="Api" href="uiresources_plat/tfx_server_plugin_ids_api/tfx_server_plugin_ids_api.metaxml"/>
-    <unit bldFile="uiresources_plat/tfx_server_plugin_ids_api/group"/>
-   </component>
-  </collection>
-  <collection id="uiresources_info" name="UI Resources Info" level="data">
-   <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
-    <unit bldFile="tsrc/group" filter="uiresources_api_all"/>
-   </component>
-  </collection>
-  <collection id="uigraphics" name="UI Graphics" level="generic">
-   <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
-    <unit bldFile="uigraphics/bitmaps2/group"/>
-   </component>
-   <component id="icons" filter="s60" class="config" name="Icons">
-    <unit bldFile="uigraphics/icons/group"/>
-   </component>
-   <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
-    <unit bldFile="uigraphics/variatedbitmaps/group"/>
-   </component>
-   <component id="aknicon" filter="s60" name="Avkon Icon Framework">
-    <unit bldFile="uigraphics/aknicon/group"/>
-   </component>
-   <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
-    <unit bldFile="uigraphics/nvgrenderstage/group"/>
-   </component>
-  </collection>
-  <collection id="layouts" name="Layouts" level="plugin">
-   <component id="cdl" filter="s60" name="Customization Definition Language">
-    <!-- can only have one unit. Need to #include them or split into multiple components -->
-    <unit bldFile="layouts/cdl/cdlengine/group"/>
-    <unit bldFile="layouts/cdl/cdlserver/group"/>
-   </component>
-   <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
-    <unit bldFile="layouts/aknlayout2/group"/>
-   </component>
-  </collection>
-  <collection id="skins" name="Skins" level="data">
-   <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
-    <unit bldFile="skins/aknskincontent/group"/>
-   </component>
-   <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
-    <unit bldFile="skins/aknskins/group"/>
-   </component>
-  </collection>
-  <collection id="pictographs" name="Pictographs" level="data">
-   <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
-    <unit bldFile="pictographs/aknpictograph/group"/>
-   </component>
-  </collection>
-  <collection id="locales" name="Locales" level="framework">
-   <component id="locales_build" filter="s60" name="Locales Build">
-    <unit bldFile="locales/loce32"/>
-   </component>
-  </collection>
-  <collection id="uiconfig" name="UI Config" level="server">
-   <component id="s60config" filter="s60" name="S60 UI Config">
-    <unit bldFile="uiconfig/s60config/group"/>
-   </component>
-  </collection>
-  <collection id="fontsupport" name="Font Support" level="generic">
-   <component id="fontprovider" filter="s60" name="Font Provider">
-    <unit bldFile="fontsupport/fontprovider/group"/>
-   </component>
-   <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
--->
-   <component id="fontutils" filter="sf_build" name="Font Utils">
-    <unit bldFile="fontsupport/fontutils/FontUtils/group"/>
-   </component>
-  </collection>
-  <collection id="helpthemes" name="Help Themes" level="data">
-   <!-- collection is really a component. Need to move down a directory -->
-   <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
-    <unit bldFile="helpthemes/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/uitools/package_definition.xml
--- a/symbian4/mw/uitools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/uitools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,136 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
-        <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
-          <component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-          </component>
-        </collection>
-        <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
-          <component name="uitools_cdl_api" long-name="CDL API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uitools/uitools_plat/cdl_api/group"/>
-          </component>
-          <component name="uitools_layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uitools/uitools_plat/layout_system_private_api/group"/>
-          </component>
-        </collection>
-        <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-          <!-- collection is actually a component. Needs to be moved down a directory -->
-          <component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
-            <unit bldFile="/sf/mw/uitools/cdlcompilertoolkit/group"/>
-          </component>
-        </collection>
-        <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-          <!-- collection is actually a component. Needs to be moved down a directory -->
-          <component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
-            <unit bldFile="/sf/mw/uitools/cdlcompiler/group"/>
-          </component>
-        </collection>
-        <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-          <component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
-            <unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
-          </component>
-        </collection>
-        <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-          <!-- collection is actually a component. Needs to be moved down a directory -->
-          <component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
-            <unit bldFile="/sf/mw/uitools/aknlayoutcompiler/group"/>
-          </component>
-        </collection>
-        <collection name="skincompiler" long-name="Skin Compiler" level="compile">
-          <component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
-            <unit bldFile="/sf/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
-          </component>
-        </collection>
-        <collection name="reszip" long-name="Resource Zip" level="encode">
-          <!-- collection is actually a component. Needs to be moved down a directory -->
-          <component name="reszip_build" filter="s60" long-name="Resource Zip Build">
-            <unit bldFile="/sf/mw/uitools/reszip/group"/>
-          </component>
-        </collection>
-        <collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
-        <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-          <component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
-            <unit bldFile="/sf/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="uitools" name="UI Tools" levels="compile encode tool if">
+  <collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
+   <component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
+    <meta rel="Api" href="uitools_pub/third_party_bitmap_palette_api/third_party_bitmap_palette_api.metaxml"/>
+    <unit bldFile="uitools_pub/third_party_bitmap_palette_api/group"/>
+   </component>
+  </collection>
+  <collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
+   <component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
+    <meta rel="Api" href="uitools_plat/cdl_api/cdl_api.metaxml"/>
+    <unit bldFile="uitools_plat/cdl_api/group"/>
+   </component>
+   <component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+    <meta rel="Api" href="uitools_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
+    <unit bldFile="uitools_plat/layout_system_private_api/group"/>
+   </component>
+  </collection>
+  <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+    <unit bldFile="cdlcompilertoolkit/group"/>
+   </component>
+  </collection>
+  <collection id="cdlcompiler" name="CDL Compiler" level="compile">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+    <unit bldFile="cdlcompiler/group"/>
+   </component>
+  </collection>
+  <collection id="gfxtools" name="Graphics Tools" level="tool">
+   <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+    <unit bldFile="gfxtools/color/group"/>
+   </component>
+  </collection>
+  <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+    <unit bldFile="../uitools/aknlayoutcompiler/group"/>
+   </component>
+  </collection>
+  <collection id="skincompiler" name="Skin Compiler" level="compile">
+   <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+    <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
+   </component>
+  </collection>
+  <collection id="reszip" name="Resource Zip" level="encode">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="reszip_build" filter="s60" name="Resource Zip Build">
+    <unit bldFile="reszip/group"/>
+   </component>
+  </collection>
+  <collection id="toollibraries" name="Tool Libraries" level="tool"/>
+  <collection id="svgtencoder" name="SVGT Encoder" level="encode">
+   <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
+    <unit bldFile="svgtencoder/svgtenc/standalone/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/uitools/package_definition_3.0.xml
--- a/symbian4/mw/uitools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="uitools" name="UI Tools" levels="compile encode tool if">
-  <collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
-   <component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
-    <meta rel="Api" href="uitools_pub/third_party_bitmap_palette_api/third_party_bitmap_palette_api.metaxml"/>
-    <unit bldFile="uitools_pub/third_party_bitmap_palette_api/group"/>
-   </component>
-  </collection>
-  <collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
-   <component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
-    <meta rel="Api" href="uitools_plat/cdl_api/cdl_api.metaxml"/>
-    <unit bldFile="uitools_plat/cdl_api/group"/>
-   </component>
-   <component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
-    <meta rel="Api" href="uitools_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
-    <unit bldFile="uitools_plat/layout_system_private_api/group"/>
-   </component>
-  </collection>
-  <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
-    <unit bldFile="cdlcompilertoolkit/group"/>
-   </component>
-  </collection>
-  <collection id="cdlcompiler" name="CDL Compiler" level="compile">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
-    <unit bldFile="cdlcompiler/group"/>
-   </component>
-  </collection>
-  <collection id="gfxtools" name="Graphics Tools" level="tool">
-   <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
-    <unit bldFile="gfxtools/color/group"/>
-   </component>
-  </collection>
-  <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
-    <unit bldFile="../uitools/aknlayoutcompiler/group"/>
-   </component>
-  </collection>
-  <collection id="skincompiler" name="Skin Compiler" level="compile">
-   <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
-    <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
-   </component>
-  </collection>
-  <collection id="reszip" name="Resource Zip" level="encode">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="reszip_build" filter="s60" name="Resource Zip Build">
-    <unit bldFile="reszip/group"/>
-   </component>
-  </collection>
-  <collection id="toollibraries" name="Tool Libraries" level="tool"/>
-  <collection id="svgtencoder" name="SVGT Encoder" level="encode">
-   <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
-    <unit bldFile="svgtencoder/svgtenc/standalone/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,181 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-        <collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
-          <component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
-          </component>
-          <component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
-          </component>
-          <component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
-          </component>
-          <component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
-          </component>
-          <component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
-          </component>
-          <component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
-          </component>
-          <component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
-          </component>
-          <component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
-          </component>
-          <component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
-          </component>
-          <component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
-          </component>
-        </collection>
-        <collection name="usbengines" long-name="USB Engines" level="generic">
-          <component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
-            <unit bldFile="/sf/mw/usbservices/usbengines/usbotgwatcher/group"/>
-          </component>
-          <component name="usbwatcher" filter="s60" long-name="USB Watcher">
-            <unit bldFile="/sf/mw/usbservices/usbengines/usbwatcher/group"/>
-          </component>
-          <component name="usblocodplugin" filter="s60" long-name="USB Local Connectivity Domain Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/usbservices/usbengines/usblocodplugin/group"/>
-          </component>
-          <component name="usbdevcon" filter="s60" long-name="USB Device Control">
-            <unit bldFile="/sf/mw/usbservices/usbengines/usbdevcon/group"/>
-          </component>
-          <component name="usbremotepersonality" filter="s60" long-name="USB Remote Personality">
-            <unit bldFile="/sf/mw/usbservices/usbengines/usbremotepersonality/group"/>
-          </component>
-        </collection>
-        <collection name="usbclasses" long-name="USB Classes" level="framework">
-          <component name="usbobexclasscontroller" filter="s60" long-name="USB OBEX Class Controller" plugin="Y">
-            <unit bldFile="/sf/mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
-          </component>
-          <component name="usbbasicpersonality" filter="s60" long-name="USB Basic Personality" plugin="Y">
-            <unit bldFile="/sf/mw/usbservices/usbclasses/usbbasicpersonality/group"/>
-          </component>
-          <component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
-            <unit bldFile="/sf/mw/usbservices/usbclasses/usbmscpersonality/group"/>
-          </component>
-          <!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="usbservices" name="USB Services" levels="framework server generic specific plugin">
+  <collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+   <component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/pictbridge_api/pictbridge_api.metaxml"/>
+    <unit bldFile="usbservices_plat/pictbridge_api/group"/>
+   </component>
+   <component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/ptp_responder_api/ptp_responder_api.metaxml"/>
+    <unit bldFile="usbservices_plat/ptp_responder_api/group"/>
+   </component>
+   <component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/ptp_transport_api/ptp_transport_api.metaxml"/>
+    <unit bldFile="usbservices_plat/ptp_transport_api/group"/>
+   </component>
+   <component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_device_control_plugin_api/usb_device_control_plugin_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_device_control_plugin_api/group"/>
+   </component>
+   <component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_notifier_api/usb_notifier_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_notifier_api/group"/>
+   </component>
+   <component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_personality_api_header/usb_personality_api_header.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_personality_api_header/group"/>
+   </component>
+   <component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_personality_plugin_api/usb_personality_plugin_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_personality_plugin_api/group"/>
+   </component>
+   <component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_secondary_display_api/usb_secondary_display_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_secondary_display_api/group"/>
+   </component>
+   <component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_watcher_api/usb_watcher_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_watcher_api/group"/>
+   </component>
+   <component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_watcher_info_api_header/usb_watcher_info_api_header.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_watcher_info_api_header/group"/>
+   </component>
+  </collection>
+  <collection id="usbengines" name="USB Engines" level="generic">
+   <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+    <unit bldFile="usbengines/usbotgwatcher/group"/>
+   </component>
+   <component id="usbwatcher" filter="s60" name="USB Watcher">
+    <unit bldFile="usbengines/usbwatcher/group"/>
+   </component>
+   <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+    <unit bldFile="usbengines/usblocodplugin/group"/>
+   </component>
+   <component id="usbdevcon" filter="s60" name="USB Device Control">
+    <unit bldFile="usbengines/usbdevcon/group"/>
+   </component>
+   <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+    <unit bldFile="usbengines/usbremotepersonality/group"/>
+   </component>
+  </collection>
+  <collection id="usbclasses" name="USB Classes" level="framework">
+   <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+    <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
+   </component>
+   <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+    <unit bldFile="usbclasses/usbbasicpersonality/group"/>
+   </component>
+   <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+    <unit bldFile="usbclasses/usbmscpersonality/group"/>
+   </component>
+   <!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
-          <component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-            <unit bldFile="/sf/mw/usbservices/usbclasses/pictbridgeengine/group"/>
-          </component>
-          <component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
-            <unit bldFile="/sf/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
-          </component>
-        </collection>
-        <collection name="usbuis" long-name="USB UIs" level="specific">
-          <component name="usbui" filter="s60" long-name="USB UI">
-            <unit bldFile="/sf/mw/usbservices/usbuis/usbui/group"/>
-          </component>
-          <component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-            <unit bldFile="/sf/mw/usbservices/usbuis/usbuinotif/group"/>
-          </component>
-          <component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
-            <unit bldFile="/sf/mw/usbservices/usbuis/imageprintuiprovider/group"/>
-          </component>
-          <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
-            <unit bldFile="/sf/mw/usbservices/usbuis/imageprintui/group"/>
-          </component>
-          <component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-            <unit bldFile="/sf/mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
-          </component>
-        </collection>
-        <collection name="usbservices_test" long-name="USB Services Test" level="server">
-          <component name="usbservices_test_build" long-name="USB Services Test Build" filter="test,api_test,s60" introduced="^4">
-            <unit bldFile="/sf/mw/usbservices/tsrc/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+   <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+    <unit bldFile="usbclasses/pictbridgeengine/group"/>
+   </component>
+   <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+    <unit bldFile="usbclasses/usbphoneasmodem/group"/>
+   </component>
+  </collection>
+  <collection id="usbuis" name="USB UIs" level="specific">
+   <component id="usbui" filter="s60" name="USB UI">
+    <unit bldFile="usbuis/usbui/group"/>
+   </component>
+   <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+    <unit bldFile="usbuis/usbuinotif/group"/>
+   </component>
+   <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+    <unit bldFile="usbuis/imageprintuiprovider/group"/>
+   </component>
+   <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+    <unit bldFile="usbuis/imageprintui/group"/>
+   </component>
+   <component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
+      <unit bldFile="usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
+    </component>
+  </collection>
+  <collection id="usbservices_test" name="USB Services Test" level="server">
+     <component id="usbservices_test_build" name="USB Services Test Build" filter="test,api_test,s60"  introduced="^4">
+      <unit bldFile="tsrc/group"/>
+     </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/usbservices/package_definition_3.0.xml
--- a/symbian4/mw/usbservices/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="usbservices" name="USB Services" levels="framework server generic specific plugin">
-  <collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
-   <component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/pictbridge_api/pictbridge_api.metaxml"/>
-    <unit bldFile="usbservices_plat/pictbridge_api/group"/>
-   </component>
-   <component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/ptp_responder_api/ptp_responder_api.metaxml"/>
-    <unit bldFile="usbservices_plat/ptp_responder_api/group"/>
-   </component>
-   <component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/ptp_transport_api/ptp_transport_api.metaxml"/>
-    <unit bldFile="usbservices_plat/ptp_transport_api/group"/>
-   </component>
-   <component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_device_control_plugin_api/usb_device_control_plugin_api.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_device_control_plugin_api/group"/>
-   </component>
-   <component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_notifier_api/usb_notifier_api.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_notifier_api/group"/>
-   </component>
-   <component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_personality_api_header/usb_personality_api_header.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_personality_api_header/group"/>
-   </component>
-   <component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_personality_plugin_api/usb_personality_plugin_api.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_personality_plugin_api/group"/>
-   </component>
-   <component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_secondary_display_api/usb_secondary_display_api.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_secondary_display_api/group"/>
-   </component>
-   <component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_watcher_api/usb_watcher_api.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_watcher_api/group"/>
-   </component>
-   <component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
-    <meta rel="Api" href="usbservices_plat/usb_watcher_info_api_header/usb_watcher_info_api_header.metaxml"/>
-    <unit bldFile="usbservices_plat/usb_watcher_info_api_header/group"/>
-   </component>
-  </collection>
-  <collection id="usbengines" name="USB Engines" level="generic">
-   <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
-    <unit bldFile="usbengines/usbotgwatcher/group"/>
-   </component>
-   <component id="usbwatcher" filter="s60" name="USB Watcher">
-    <unit bldFile="usbengines/usbwatcher/group"/>
-   </component>
-   <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
-    <unit bldFile="usbengines/usblocodplugin/group"/>
-   </component>
-   <component id="usbdevcon" filter="s60" name="USB Device Control">
-    <unit bldFile="usbengines/usbdevcon/group"/>
-   </component>
-   <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
-    <unit bldFile="usbengines/usbremotepersonality/group"/>
-   </component>
-  </collection>
-  <collection id="usbclasses" name="USB Classes" level="framework">
-   <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
-    <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
-   </component>
-   <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
-    <unit bldFile="usbclasses/usbbasicpersonality/group"/>
-   </component>
-   <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
-    <unit bldFile="usbclasses/usbmscpersonality/group"/>
-   </component>
-   <!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
-      </component>-->
-   <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
-    <unit bldFile="usbclasses/pictbridgeengine/group"/>
-   </component>
-   <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
-    <unit bldFile="usbclasses/usbphoneasmodem/group"/>
-   </component>
-  </collection>
-  <collection id="usbuis" name="USB UIs" level="specific">
-   <component id="usbui" filter="s60" name="USB UI">
-    <unit bldFile="usbuis/usbui/group"/>
-   </component>
-   <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
-    <unit bldFile="usbuis/usbuinotif/group"/>
-   </component>
-   <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
-    <unit bldFile="usbuis/imageprintuiprovider/group"/>
-   </component>
-   <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
-    <unit bldFile="usbuis/imageprintui/group"/>
-   </component>
-   <component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
-      <unit bldFile="usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
-    </component>
-  </collection>
-  <collection id="usbservices_test" name="USB Services Test" level="server">
-     <component id="usbservices_test_build" name="USB Services Test Build" filter="test,api_test,s60"  introduced="^4">
-      <unit bldFile="tsrc/group"/>
-     </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/videoutils/package_definition.xml
--- a/symbian4/mw/videoutils/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
-        <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
-          <component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
-          </component>
-          <component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
-          </component>
-        </collection>
-        <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-          <!-- don't build these -->
-          <component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
-            <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group" filter="test"/>
-          </component>
-          <component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
-            <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group" filter="test"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="videoutils" name="Video Utils" levels="eng util if">
+  <collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+   <component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoscheduler_api/group"/>
+   </component>
+   <component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoplayer_constants_api/group"/>
+   </component>
+  </collection>
+  <collection id="videoscheduler" name="Video Scheduler" level="util">
+   <!-- don't build these -->
+   <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+    <unit bldFile="videoscheduler/schedulerclient/group" filter="test"/>
+   </component>
+   <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+    <unit bldFile="videoscheduler/schedulerserver/group" filter="test"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/videoutils/package_definition_3.0.xml
--- a/symbian4/mw/videoutils/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="videoutils" name="Video Utils" levels="eng util if">
-  <collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
-   <component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
-    <meta rel="Api" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
-    <unit bldFile="videoutils_plat/videoscheduler_api/group"/>
-   </component>
-   <component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
-    <meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
-    <unit bldFile="videoutils_plat/videoplayer_constants_api/group"/>
-   </component>
-  </collection>
-  <collection id="videoscheduler" name="Video Scheduler" level="util">
-   <!-- don't build these -->
-   <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
-    <unit bldFile="videoscheduler/schedulerclient/group" filter="test"/>
-   </component>
-   <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
-    <unit bldFile="videoscheduler/schedulerserver/group" filter="test"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/vpnclient/package_definition.xml
--- a/symbian4/mw/vpnclient/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,206 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-        <!-- is the !oem_build filter needed? -->
-        <collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
-          <component name="vpnapi" filter="s60" long-name="VPN API" class="api">
-            <unit bldFile="/sf/mw/vpnclient/vpnc_plat/vpnapi/group"/>
-          </component>
-        </collection>
-        <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-          <component name="vpnapi_impl" filter="s60" long-name="VPN API">
-            <unit bldFile="/sf/mw/vpnclient/vpnapiimpl/group"/>
-          </component>
-        </collection>
-        <collection name="vpnengine" long-name="VPN Engine" level="engine">
-          <!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<SystemDefinition schema="3.0.0">
+ <package id="vpnclient" name="VPN Client" levels="engine ui api">
+  <!-- is the !oem_build filter needed? -->
+  <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
+      <component id="vpnapi" filter="s60" class="api" name="VPN API">
+		<meta rel="Api" href="vpnc_plat/vpnapi/vpn_api.metaxml"/>
+        <unit bldFile="vpnc_plat/vpnapi/group"/>
+      </component>
+  </collection>
+  <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+   <component id="vpnapi_impl" filter="s60" name="VPN API">
+    <unit bldFile="vpnapiimpl/group"/>
+   </component>
+  </collection>
+  <collection id="vpnengine" name="VPN Engine" level="engine">
+   <!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
-          <component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-          </component>
-          <component name="eventviewer" filter="s60" long-name="Event Viewer">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/eventviewer/group"/>
-          </component>
-          <component name="vpnins" filter="s60" long-name="VPN Installer">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnins/group"/>
-          </component>
-          <component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikepolparser/group"/>
-          </component>
-          <component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/utlbase64/group"/>
-          </component>
-          <component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/utlcrypto/group"/>
-          </component>
-          <component name="utlxml" filter="s60" long-name="XML Utilities">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/utlxml/group"/>
-          </component>
-          <component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs10/group"/>
-          </component>
-          <component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-          </component>
-          <component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikecert/group"/>
-          </component>
-          <component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdapi/group"/>
-          </component>
-          <component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdserver/group"/>
-          </component>
-          <component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikeutils/group"/>
-          </component>
-          <component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev1lib/group"/>
-          </component>
-          <component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev2lib/group"/>
-          </component>
-          <component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-          </component>
-          <component name="sit" filter="s60" long-name="Socket Interaction Thread">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/sit/group"/>
-          </component>
-          <component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-          </component>
-          <component name="eventmediator" filter="s60" long-name="Event Mediator">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediator/group"/>
-          </component>
-          <component name="pkiservice" filter="s60" long-name="PKI Service">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiservice/group"/>
-          </component>
-          <component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnconnagt/group"/>
-          </component>
-          <component name="vpnmanager" filter="s60" long-name="VPN Manager">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnmanager/group"/>
-          </component>
-          <component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/vpncleaner/group"/>
-          </component>
-          <component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs12/group"/>
-          </component>
-          <component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadengine/group"/>
-          </component>
-          <component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-          </component>
-          <component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadpki/group"/>
-          </component>
-          <component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikesocket/group"/>
-          </component>
-        </collection>
-        <collection name="vpnui" long-name="VPN UI" level="ui">
-          <component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-            <unit bldFile="/sf/mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-          </component>
-          <component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-            <unit bldFile="/sf/mw/vpnclient/vpnui/vpndialogmanager/group"/>
-          </component>
-          <component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-            <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolins/group"/>
-          </component>
-          <component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-            <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-          </component>
-        </collection>
-        <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-          <component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-            <unit bldFile="/sf/mw/vpnclient/help/group"/>
-          </component>
-          <component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-            <!-- should split this up into the other components and remove this-->
-            <unit bldFile="/sf/mw/vpnclient/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+   <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
+    <unit bldFile="vpnengine/eventmediatorapi/group"/>
+   </component>
+   <component id="eventviewer" filter="s60" name="Event Viewer">
+    <unit bldFile="vpnengine/eventviewer/group"/>
+   </component>
+   <component id="vpnins" filter="s60" name="VPN Installer">
+    <unit bldFile="vpnengine/vpnins/group"/>
+   </component>
+   <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+    <unit bldFile="vpnengine/ikepolparser/group"/>
+   </component>
+   <component id="utlbase64" filter="s60" name="Base64 Utilities">
+    <unit bldFile="vpnengine/utlbase64/group"/>
+   </component>
+   <component id="utlcrypto" filter="s60" name="Crypto Utilities">
+    <unit bldFile="vpnengine/utlcrypto/group"/>
+   </component>
+   <component id="utlxml" filter="s60" name="XML Utilities">
+    <unit bldFile="vpnengine/utlxml/group"/>
+   </component>
+   <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+    <unit bldFile="vpnengine/utlpkcs10/group"/>
+   </component>
+   <component id="pkiserviceapi" filter="s60" name="PKI Service API">
+    <unit bldFile="vpnengine/pkiserviceapi/group"/>
+   </component>
+   <component id="ikecert" filter="s60" name="IKE Certificate Management">
+    <unit bldFile="vpnengine/ikecert/group"/>
+   </component>
+   <component id="kmdapi" filter="s60" name="Key Management Daemon API">
+    <unit bldFile="vpnengine/kmdapi/group"/>
+   </component>
+   <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+    <unit bldFile="vpnengine/kmdserver/group"/>
+   </component>
+   <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+    <unit bldFile="vpnengine/ikeutils/group"/>
+   </component>
+   <component id="ikev1lib" filter="s60" name="IKEv1 Library">
+    <unit bldFile="vpnengine/ikev1lib/group"/>
+   </component>
+   <component id="ikev2lib" filter="s60" name="IKEv2 Library">
+    <unit bldFile="vpnengine/ikev2lib/group"/>
+   </component>
+   <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+    <unit bldFile="vpnengine/vpnipsecpolparser/group"/>
+   </component>
+   <component id="sit" filter="s60" name="Socket Interaction Thread">
+    <unit bldFile="vpnengine/sit/group"/>
+   </component>
+   <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+    <unit bldFile="vpnengine/vpntcwrapper/group"/>
+   </component>
+   <component id="eventmediator" filter="s60" name="Event Mediator">
+    <unit bldFile="vpnengine/eventmediator/group"/>
+   </component>
+   <component id="pkiservice" filter="s60" name="PKI Service">
+    <unit bldFile="vpnengine/pkiservice/group"/>
+   </component>
+   <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+    <unit bldFile="vpnengine/vpnconnagt/group"/>
+   </component>
+   <component id="vpnmanager" filter="s60" name="VPN Manager">
+    <unit bldFile="vpnengine/vpnmanager/group"/>
+   </component>
+   <component id="vpncleaner" filter="s60" name="VPN Cleaner">
+    <unit bldFile="vpnengine/vpncleaner/group"/>
+   </component>
+   <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+    <unit bldFile="vpnengine/utlpkcs12/group"/>
+   </component>
+   <component id="dmadengine" filter="s60" name="DM Adapter Engine">
+    <unit bldFile="vpnengine/dmadengine/group"/>
+   </component>
+   <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
+    <unit bldFile="vpnengine/dmadipsecvpn/group"/>
+   </component>
+   <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+    <unit bldFile="vpnengine/dmadpki/group"/>
+   </component>
+   <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+    <unit bldFile="vpnengine/ikesocket/group"/>
+   </component>
+  </collection>
+  <collection id="vpnui" name="VPN UI" level="ui">
+   <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
+    <unit bldFile="vpnui/vpnecomnotifier/group"/>
+   </component>
+   <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+    <unit bldFile="vpnui/vpndialogmanager/group"/>
+   </component>
+   <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+    <unit bldFile="vpnui/vpnpolins/group"/>
+   </component>
+   <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
+    <unit bldFile="vpnui/vpnpolicyrecognizer/group"/>
+   </component>
+  </collection>
+  <collection id="vpnclient_info" name="VPN Client Info" level="api">
+   <component id="vpnclient_help" filter="s60" name="VPN Client Help">
+    <unit bldFile="help/group"/>
+   </component>
+   <component id="vpnclient_build" filter="s60" name="VPN Client Build">
+    <!-- should split this up into the other components and remove this-->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/vpnclient/package_definition_3.0.xml
--- a/symbian4/mw/vpnclient/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="vpnclient" name="VPN Client" levels="engine ui api">
-  <!-- is the !oem_build filter needed? -->
-  <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
-      <component id="vpnapi" filter="s60" class="api" name="VPN API">
-		<meta rel="Api" href="vpnc_plat/vpnapi/vpn_api.metaxml"/>
-        <unit bldFile="vpnc_plat/vpnapi/group"/>
-      </component>
-  </collection>
-  <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
-   <component id="vpnapi_impl" filter="s60" name="VPN API">
-    <unit bldFile="vpnapiimpl/group"/>
-   </component>
-  </collection>
-  <collection id="vpnengine" name="VPN Engine" level="engine">
-   <!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
-    		or maybe split the collection into more reasonable groups  -->
-   <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
-    <unit bldFile="vpnengine/eventmediatorapi/group"/>
-   </component>
-   <component id="eventviewer" filter="s60" name="Event Viewer">
-    <unit bldFile="vpnengine/eventviewer/group"/>
-   </component>
-   <component id="vpnins" filter="s60" name="VPN Installer">
-    <unit bldFile="vpnengine/vpnins/group"/>
-   </component>
-   <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
-    <unit bldFile="vpnengine/ikepolparser/group"/>
-   </component>
-   <component id="utlbase64" filter="s60" name="Base64 Utilities">
-    <unit bldFile="vpnengine/utlbase64/group"/>
-   </component>
-   <component id="utlcrypto" filter="s60" name="Crypto Utilities">
-    <unit bldFile="vpnengine/utlcrypto/group"/>
-   </component>
-   <component id="utlxml" filter="s60" name="XML Utilities">
-    <unit bldFile="vpnengine/utlxml/group"/>
-   </component>
-   <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
-    <unit bldFile="vpnengine/utlpkcs10/group"/>
-   </component>
-   <component id="pkiserviceapi" filter="s60" name="PKI Service API">
-    <unit bldFile="vpnengine/pkiserviceapi/group"/>
-   </component>
-   <component id="ikecert" filter="s60" name="IKE Certificate Management">
-    <unit bldFile="vpnengine/ikecert/group"/>
-   </component>
-   <component id="kmdapi" filter="s60" name="Key Management Daemon API">
-    <unit bldFile="vpnengine/kmdapi/group"/>
-   </component>
-   <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
-    <unit bldFile="vpnengine/kmdserver/group"/>
-   </component>
-   <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
-    <unit bldFile="vpnengine/ikeutils/group"/>
-   </component>
-   <component id="ikev1lib" filter="s60" name="IKEv1 Library">
-    <unit bldFile="vpnengine/ikev1lib/group"/>
-   </component>
-   <component id="ikev2lib" filter="s60" name="IKEv2 Library">
-    <unit bldFile="vpnengine/ikev2lib/group"/>
-   </component>
-   <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
-    <unit bldFile="vpnengine/vpnipsecpolparser/group"/>
-   </component>
-   <component id="sit" filter="s60" name="Socket Interaction Thread">
-    <unit bldFile="vpnengine/sit/group"/>
-   </component>
-   <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
-    <unit bldFile="vpnengine/vpntcwrapper/group"/>
-   </component>
-   <component id="eventmediator" filter="s60" name="Event Mediator">
-    <unit bldFile="vpnengine/eventmediator/group"/>
-   </component>
-   <component id="pkiservice" filter="s60" name="PKI Service">
-    <unit bldFile="vpnengine/pkiservice/group"/>
-   </component>
-   <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
-    <unit bldFile="vpnengine/vpnconnagt/group"/>
-   </component>
-   <component id="vpnmanager" filter="s60" name="VPN Manager">
-    <unit bldFile="vpnengine/vpnmanager/group"/>
-   </component>
-   <component id="vpncleaner" filter="s60" name="VPN Cleaner">
-    <unit bldFile="vpnengine/vpncleaner/group"/>
-   </component>
-   <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
-    <unit bldFile="vpnengine/utlpkcs12/group"/>
-   </component>
-   <component id="dmadengine" filter="s60" name="DM Adapter Engine">
-    <unit bldFile="vpnengine/dmadengine/group"/>
-   </component>
-   <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
-    <unit bldFile="vpnengine/dmadipsecvpn/group"/>
-   </component>
-   <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
-    <unit bldFile="vpnengine/dmadpki/group"/>
-   </component>
-   <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
-    <unit bldFile="vpnengine/ikesocket/group"/>
-   </component>
-  </collection>
-  <collection id="vpnui" name="VPN UI" level="ui">
-   <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
-    <unit bldFile="vpnui/vpnecomnotifier/group"/>
-   </component>
-   <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
-    <unit bldFile="vpnui/vpndialogmanager/group"/>
-   </component>
-   <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
-    <unit bldFile="vpnui/vpnpolins/group"/>
-   </component>
-   <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
-    <unit bldFile="vpnui/vpnpolicyrecognizer/group"/>
-   </component>
-  </collection>
-  <collection id="vpnclient_info" name="VPN Client Info" level="api">
-   <component id="vpnclient_help" filter="s60" name="VPN Client Help">
-    <unit bldFile="help/group"/>
-   </component>
-   <component id="vpnclient_build" filter="s60" name="VPN Client Build">
-    <!-- should split this up into the other components and remove this-->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,312 +1,273 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-        <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-          <component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/browser_control_api/group"/>
-          </component>
-          <component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/download_mgr_client_api/group"/>
-          </component>
-          <component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/download_mgr_ui_api/group"/>
-          </component>
-          <component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/favourites_engine_api/group"/>
-          </component>
-          <component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/browser_plugin_api/group"/>
-          </component>
-          <component name="settings_api" long-name="Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/settings_api/group"/>
-          </component>
-        </collection>
-        <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-          <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/aiw_browser_provider_api/group"/>
-          </component>
-          <component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/browser_dialogs_provider_api/group"/>
-          </component>
-          <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/browser_platform_api/group"/>
-          </component>
-          <component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/cod_handler_api/group"/>
-          </component>
-          <component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/connection_manager_api/group"/>
-          </component>
-          <component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/cxml_library_api/group"/>
-          </component>
-          <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/download_mgr_client_api_extn/group"/>
-          </component>
-          <component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/feeds_engine_api/group"/>
-          </component>
-          <component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/launcher_api/group"/>
-          </component>
-          <component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/multipart_parser_api/group"/>
-          </component>
-          <component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/recent_url_store_api/group"/>
-          </component>
-          <component name="rt_gesturehelper_api" long-name="Runtime Gesture Helper API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/rt_gesturehelper_api/group"/>
-          </component>
-          <component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/scheme_handler_plugin_api/group"/>
-          </component>
-          <component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/scriptable_plugin_api/group"/>
-          </component>
-          <component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/webutils_api/group"/>
-          </component>
-          <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/widget_registry_api/group"/>
-          </component>
-          <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/xml_parser_api/group"/>
-          </component>
-        </collection>
-        <collection name="web_info" long-name="Web Info" level="specific">
-          <component name="web_build" filter="s60" long-name="Web Build">
-            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-            <unit bldFile="/sf/mw/web/group"/>
-          </component>
-        </collection>
-        <collection name="browserutilities" long-name="Browser Utilities" level="utils">
-          <component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-            <unit bldFile="/sf/mw/web/browserutilities/browserdialogsprovider/group"/>
-          </component>
-          <component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-            <unit bldFile="/sf/mw/web/browserutilities/recenturlstore/group"/>
-          </component>
-          <component name="xmlparser" filter="s60" long-name="XML Interface">
-            <unit bldFile="/sf/mw/web/browserutilities/xmlparser/group"/>
-          </component>
-          <component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-            <unit bldFile="/sf/mw/web/browserutilities/cxmllibrary/group"/>
-          </component>
-          <component name="downloadmgr" filter="s60" long-name="Download Manager">
-            <unit bldFile="/sf/mw/web/browserutilities/downloadmgr/group"/>
-          </component>
-          <component name="connectionmanager" filter="s60" long-name="Connection Manager">
-            <unit bldFile="/sf/mw/web/browserutilities/connectionmanager/group"/>
-          </component>
-          <component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-            <unit bldFile="/sf/mw/web/browserutilities/browsertelservice/group"/>
-          </component>
-          <component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-            <unit bldFile="/sf/mw/web/browserutilities/favouritesengine/group"/>
-          </component>
-          <component name="feedsengine" filter="s60" long-name="Feeds Engine">
-            <unit bldFile="/sf/mw/web/browserutilities/feedsengine/group"/>
-          </component>
-          <component name="multipartparser" filter="s60" long-name="Multipart Parser">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-            <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-          </component>
-          <component name="schemehandler" filter="s60" long-name="Scheme Handler">
-            <unit bldFile="/sf/mw/web/browserutilities/schemehandler/group"/>
-          </component>
-          <component name="webutils" filter="s60" long-name="Web Utils">
-            <unit bldFile="/sf/mw/web/browserutilities/webutils/group"/>
-          </component>
-          <component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-            <unit bldFile="/sf/mw/web/browserutilities/aiwbrowserprovider/group"/>
-          </component>
-          <component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-            <unit bldFile="/sf/mw/web/browserutilities/group"/>
-          </component>
-        </collection>
-        <collection name="webengine" long-name="Web Engine" level="server">
-          <component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-            <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/cache/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/memorymanager/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/npscript/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-          </component>
-          <component name="webkitutils" filter="s60" long-name="WebKit Utils">
-            <unit bldFile="/sf/mw/web/webengine/webkitutils/group"/>
-          </component>
-          <component name="pagescaler" filter="s60" long-name="Page Scaler">
-            <unit bldFile="/sf/mw/web/webengine/pagescaler/group"/>
-          </component>
-          <component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-            <unit bldFile="/sf/mw/web/webengine/widgetinstaller/group"/>
-          </component>
-          <component name="widgetregistry" filter="s60" long-name="Widget Registry">
-            <unit bldFile="/sf/mw/web/webengine/widgetregistry/group"/>
-          </component>
-          <component name="wmlengine" filter="s60" long-name="WML Engine">
-            <unit bldFile="/sf/mw/web/webengine/wmlengine/group"/>
-          </component>
-          <component name="device" filter="s60" long-name="Device">
-            <!-- this needs a more meaningful name -->
-            <unit bldFile="/sf/mw/web/webengine/device/group"/>
-          </component>
-          <component name="widgetengine" filter="s60" long-name="Widget Engine">
-            <unit bldFile="/sf/mw/web/webengine/widgetengine/group"/>
-          </component>
-          <component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/memoryplugin/group"/>
-          </component>
-          <component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/widgetmemoryplugin/group"/>
-          </component>
-          <component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-            <unit bldFile="/sf/mw/web/webengine/widgetbackuprestore/group"/>
-          </component>
-          <component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/browserrecognizers/group"/>
-          </component>
-          <component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/wrtharvester/group"/>
-          </component>
-        </collection>
-        <collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-          <component name="codeng" filter="s60" long-name="COD Engine">
-            <unit bldFile="/sf/mw/web/codhandler/codeng/group"/>
-          </component>
-          <component name="codui" filter="s60" long-name="COD UI">
-            <unit bldFile="/sf/mw/web/codhandler/codui/group"/>
-          </component>
-          <component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-            <unit bldFile="/sf/mw/web/codhandler/codrecog/group"/>
-          </component>
-          <component name="codviewer" filter="s60" long-name="COD Viewer">
-            <unit bldFile="/sf/mw/web/codhandler/codviewer/group"/>
-          </component>
-          <component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-            <unit bldFile="/sf/mw/web/codhandler/ddrecog/group"/>
-          </component>
-          <component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-            <unit bldFile="/sf/mw/web/codhandler/ddviewer/group"/>
-          </component>
-          <component name="coddownload" filter="s60" long-name="COD Download">
-            <unit bldFile="/sf/mw/web/codhandler/coddownload/group"/>
-          </component>
-          <component name="roapapp" filter="s60" long-name="ROAP Application">
-            <unit bldFile="/sf/mw/web/codhandler/roapapp/group"/>
-          </component>
-          <component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-            <!-- Exports need to go into another component or make this self-contained.
+<SystemDefinition schema="3.0.0">
+ <package id="web" name="Web" levels="plugin utils server generic specific">
+  <collection id="web_pub" name="Web Public Interfaces" level="specific">
+   <component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/browser_control_api/browser_control_api.metaxml"/>
+    <unit bldFile="web_pub/browser_control_api/group"/>
+   </component>
+   <component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/download_mgr_client_api/download_mgr_client_api.metaxml"/>
+    <unit bldFile="web_pub/download_mgr_client_api/group"/>
+   </component>
+   <component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/download_mgr_ui_api/download_mgr_ui_api.metaxml"/>
+    <unit bldFile="web_pub/download_mgr_ui_api/group"/>
+   </component>
+   <component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/favourites_engine_api/favourites_engine_api.metaxml"/>
+    <unit bldFile="web_pub/favourites_engine_api/group"/>
+   </component>
+   <component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/browser_plugin_api/browser_plugin_api.metaxml"/>
+    <unit bldFile="web_pub/browser_plugin_api/group"/>
+   </component>
+   <component id="settings_api" name="Settings API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/settings_api/settings_api.metaxml"/>
+    <unit bldFile="web_pub/settings_api/group"/>
+   </component>
+  </collection>
+  <collection id="web_plat" name="Web Platform Interfaces" level="specific">
+   <component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/aiw_browser_provider_api/aiw_browser_provider_api.metaxml"/>
+    <unit bldFile="web_plat/aiw_browser_provider_api/group"/>
+   </component>
+   <component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/browser_dialogs_provider_api/browser_dialogs_provider_api.metaxml"/>
+    <unit bldFile="web_plat/browser_dialogs_provider_api/group"/>
+   </component>
+   <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/browser_platform_api/browser_platform_api.metaxml"/>
+    <unit bldFile="web_plat/browser_platform_api/group"/>
+   </component>
+   <component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/cod_handler_api/cod_handler_api.metaxml"/>
+    <unit bldFile="web_plat/cod_handler_api/group"/>
+   </component>
+   <component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/connection_manager_api/connection_manager_api.metaxml"/>
+    <unit bldFile="web_plat/connection_manager_api/group"/>
+   </component>
+   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/cxml_library_api/cxml_library_api.metaxml"/>
+    <unit bldFile="web_plat/cxml_library_api/group"/>
+   </component>
+   <component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
+    <unit bldFile="web_plat/download_mgr_client_api_extn/group"/>
+   </component>
+   <component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/feeds_engine_api/feeds_engine_api.metaxml"/>
+    <unit bldFile="web_plat/feeds_engine_api/group"/>
+   </component>
+   <component id="launcher_api" name="Launcher API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/launcher_api/launcher_api.metaxml"/>
+    <unit bldFile="web_plat/launcher_api/group"/>
+   </component>
+   <component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/multipart_parser_api/multipart_parser_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+    </meta>
+    <unit bldFile="web_plat/multipart_parser_api/group"/>
+   </component>
+   <component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/recent_url_store_api/recent_url_store_api.metaxml"/>
+    <unit bldFile="web_plat/recent_url_store_api/group"/>
+   </component>
+   <component id="rt_gesturehelper_api" name="Runtime Gesture Helper API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="web_plat/rt_gesturehelper_api/rt_gesturehelper_api.metaxml"/>
+    <unit bldFile="web_plat/rt_gesturehelper_api/group"/>
+   </component>
+   <component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/scheme_handler_plugin_api/scheme_handler_plugin_api.metaxml"/>
+    <unit bldFile="web_plat/scheme_handler_plugin_api/group"/>
+   </component>
+   <component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/scriptable_plugin_api/scriptable_plugin_api.metaxml"/>
+    <unit bldFile="web_plat/scriptable_plugin_api/group"/>
+   </component>
+   <component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/webutils_api/webutils_api.metaxml"/>
+    <unit bldFile="web_plat/webutils_api/group"/>
+   </component>
+   <component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/widget_registry_api/widget_registry_api.metaxml"/>
+    <unit bldFile="web_plat/widget_registry_api/group"/>
+   </component>
+   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
+    <unit bldFile="web_plat/xml_parser_api/group"/>
+   </component>
+  </collection>
+  <collection id="web_info" name="Web Info" level="specific">
+   <component id="web_build" filter="s60" name="Web Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+  <collection id="browserutilities" name="Browser Utilities" level="utils">
+   <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+    <unit bldFile="browserutilities/browserdialogsprovider/group"/>
+   </component>
+   <component id="recenturlstore" filter="s60" name="Recent URL Store">
+    <unit bldFile="browserutilities/recenturlstore/group"/>
+   </component>
+   <component id="xmlparser" filter="s60" name="XML Interface">
+    <unit bldFile="browserutilities/xmlparser/group"/>
+   </component>
+   <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+    <unit bldFile="browserutilities/cxmllibrary/group"/>
+   </component>
+   <component id="downloadmgr" filter="s60" name="Download Manager">
+    <unit bldFile="browserutilities/downloadmgr/group"/>
+   </component>
+   <component id="connectionmanager" filter="s60" name="Connection Manager">
+    <unit bldFile="browserutilities/connectionmanager/group"/>
+   </component>
+   <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+    <unit bldFile="browserutilities/browsertelservice/group"/>
+   </component>
+   <component id="favouritesengine" filter="s60" name="Favourites Engine">
+    <unit bldFile="browserutilities/favouritesengine/group"/>
+   </component>
+   <component id="feedsengine" filter="s60" name="Feeds Engine">
+    <unit bldFile="browserutilities/feedsengine/group"/>
+   </component>
+   <component id="multipartparser" filter="s60" name="Multipart Parser">
+    <meta rel="config">
+     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+    <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+   </component>
+   <component id="schemehandler" filter="s60" name="Scheme Handler">
+    <unit bldFile="browserutilities/schemehandler/group"/>
+   </component>
+   <component id="webutils" filter="s60" name="Web Utils">
+    <unit bldFile="browserutilities/webutils/group"/>
+   </component>
+   <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+    <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
+   </component>
+   <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+    <unit bldFile="browserutilities/group"/>
+   </component>
+  </collection>
+  <collection id="webengine" name="Web Engine" level="server">
+   <component id="osswebengine" filter="s60" name="OSS Web Engine">
+    <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+    <unit bldFile="webengine/osswebengine/cache/group"/>
+    <unit bldFile="webengine/osswebengine/memorymanager/group"/>
+    <unit bldFile="webengine/osswebengine/npscript/group"/>
+    <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
+    <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+   </component>
+   <component id="webkitutils" filter="s60" name="WebKit Utils">
+    <unit bldFile="webengine/webkitutils/group"/>
+   </component>
+   <component id="pagescaler" filter="s60" name="Page Scaler">
+    <unit bldFile="webengine/pagescaler/group"/>
+   </component>
+   <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+    <unit bldFile="webengine/widgetinstaller/group"/>
+   </component>
+   <component id="widgetregistry" filter="s60" name="Widget Registry">
+    <unit bldFile="webengine/widgetregistry/group"/>
+   </component>
+   <component id="wmlengine" filter="s60" name="WML Engine">
+    <unit bldFile="webengine/wmlengine/group"/>
+   </component>
+   <component id="device" filter="s60" name="Device">
+    <!-- this needs a more meaningful name -->
+    <unit bldFile="webengine/device/group"/>
+   </component>
+   <component id="widgetengine" filter="s60" name="Widget Engine">
+    <unit bldFile="webengine/widgetengine/group"/>
+   </component>
+   <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+    <unit bldFile="webengine/memoryplugin/group"/>
+   </component>
+   <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+    <unit bldFile="webengine/widgetmemoryplugin/group"/>
+   </component>
+   <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+    <unit bldFile="webengine/widgetbackuprestore/group"/>
+   </component>
+   <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+    <unit bldFile="webengine/browserrecognizers/group"/>
+   </component>
+   <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+    <unit bldFile="webengine/wrtharvester/group"/>
+   </component>
+  </collection>
+  <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+   <component id="codeng" filter="s60" name="COD Engine">
+    <unit bldFile="codhandler/codeng/group"/>
+   </component>
+   <component id="codui" filter="s60" name="COD UI">
+    <unit bldFile="codhandler/codui/group"/>
+   </component>
+   <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+    <unit bldFile="codhandler/codrecog/group"/>
+   </component>
+   <component id="codviewer" filter="s60" name="COD Viewer">
+    <unit bldFile="codhandler/codviewer/group"/>
+   </component>
+   <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+    <unit bldFile="codhandler/ddrecog/group"/>
+   </component>
+   <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+    <unit bldFile="codhandler/ddviewer/group"/>
+   </component>
+   <component id="coddownload" filter="s60" name="COD Download">
+    <unit bldFile="codhandler/coddownload/group"/>
+   </component>
+   <component id="roapapp" filter="s60" name="ROAP Application">
+    <unit bldFile="codhandler/roapapp/group"/>
+   </component>
+   <component id="codhandler_build" filter="s60" name="COD Handler Build">
+    <!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
-            <unit bldFile="/sf/mw/web/codhandler/group"/>
-          </component>
-        </collection>
-        <collection name="widgets" long-name="Web Widget Framework" level="generic">
-          <!-- the following units can be uncommented when configuration is put in place -->
-          <component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y" class="placeholder">
-            <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-          </component>
-          <component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y" class="placeholder">
-            <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-          </component>
-          <component name="widgetlauncher" filter="s60" long-name="Widget Launcher" class="placeholder">
-            <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-          </component>
-          <component name="widgetapp" filter="s60" long-name="Widget UI" class="placeholder">
-            <!--<unit bldFile="widgets/widgetapp/group"/>-->
-          </component>
-          <component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-            <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-          </component>
-          <component name="widgetstartup" filter="s60" long-name="Widget Startup">
-            <!--<unit bldFile="widgets/widgetstartup/group"/>-->
-          </component>
-          <component name="widgets_build" filter="s60" long-name="Widgets Build">
-            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+    <unit bldFile="codhandler/group"/>
+   </component>
+  </collection>
+  <collection id="widgets" name="Web Widget Framework" level="generic">
+   <meta rel="config">
+    <defined condition="RD_BROWSER_WIDGETS"/>
+    <defined condition="__WEB_WIDGETS"/>
+   </meta>
+   <!-- the following units can be uncommented when configuration is put in place -->
+   <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+    <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+   </component>
+   <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+    <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+   </component>
+   <component id="widgetlauncher" filter="s60" name="Widget Launcher">
+    <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+   </component>
+   <component id="widgetapp" filter="s60" name="Widget UI">
+    <!--<unit bldFile="widgets/widgetapp/group"/>-->
+   </component>
+   <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+    <meta rel="config">
+     <defined condition="RD_WIDGET_PREINSTALLER"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+   </component>
+   <component id="widgetstartup" filter="s60" name="Widget Startup">
+    <meta rel="config">
+     <defined condition="RD_WIDGET_PREINSTALLER"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetstartup/group"/>-->
+   </component>
+   <component id="widgets_build" filter="s60" name="Widgets Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
-            <unit bldFile="/sf/mw/web/widgets/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="widgets/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/web/package_definition_3.0.xml
--- a/symbian4/mw/web/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="web" name="Web" levels="plugin utils server generic specific">
-  <collection id="web_pub" name="Web Public Interfaces" level="specific">
-   <component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
-    <meta rel="Api" href="web_pub/browser_control_api/browser_control_api.metaxml"/>
-    <unit bldFile="web_pub/browser_control_api/group"/>
-   </component>
-   <component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
-    <meta rel="Api" href="web_pub/download_mgr_client_api/download_mgr_client_api.metaxml"/>
-    <unit bldFile="web_pub/download_mgr_client_api/group"/>
-   </component>
-   <component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
-    <meta rel="Api" href="web_pub/download_mgr_ui_api/download_mgr_ui_api.metaxml"/>
-    <unit bldFile="web_pub/download_mgr_ui_api/group"/>
-   </component>
-   <component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
-    <meta rel="Api" href="web_pub/favourites_engine_api/favourites_engine_api.metaxml"/>
-    <unit bldFile="web_pub/favourites_engine_api/group"/>
-   </component>
-   <component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="web_pub/browser_plugin_api/browser_plugin_api.metaxml"/>
-    <unit bldFile="web_pub/browser_plugin_api/group"/>
-   </component>
-   <component id="settings_api" name="Settings API" class="api" filter="s60">
-    <meta rel="Api" href="web_pub/settings_api/settings_api.metaxml"/>
-    <unit bldFile="web_pub/settings_api/group"/>
-   </component>
-  </collection>
-  <collection id="web_plat" name="Web Platform Interfaces" level="specific">
-   <component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/aiw_browser_provider_api/aiw_browser_provider_api.metaxml"/>
-    <unit bldFile="web_plat/aiw_browser_provider_api/group"/>
-   </component>
-   <component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/browser_dialogs_provider_api/browser_dialogs_provider_api.metaxml"/>
-    <unit bldFile="web_plat/browser_dialogs_provider_api/group"/>
-   </component>
-   <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/browser_platform_api/browser_platform_api.metaxml"/>
-    <unit bldFile="web_plat/browser_platform_api/group"/>
-   </component>
-   <component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/cod_handler_api/cod_handler_api.metaxml"/>
-    <unit bldFile="web_plat/cod_handler_api/group"/>
-   </component>
-   <component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/connection_manager_api/connection_manager_api.metaxml"/>
-    <unit bldFile="web_plat/connection_manager_api/group"/>
-   </component>
-   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/cxml_library_api/cxml_library_api.metaxml"/>
-    <unit bldFile="web_plat/cxml_library_api/group"/>
-   </component>
-   <component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
-    <unit bldFile="web_plat/download_mgr_client_api_extn/group"/>
-   </component>
-   <component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/feeds_engine_api/feeds_engine_api.metaxml"/>
-    <unit bldFile="web_plat/feeds_engine_api/group"/>
-   </component>
-   <component id="launcher_api" name="Launcher API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/launcher_api/launcher_api.metaxml"/>
-    <unit bldFile="web_plat/launcher_api/group"/>
-   </component>
-   <component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/multipart_parser_api/multipart_parser_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
-    </meta>
-    <unit bldFile="web_plat/multipart_parser_api/group"/>
-   </component>
-   <component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/recent_url_store_api/recent_url_store_api.metaxml"/>
-    <unit bldFile="web_plat/recent_url_store_api/group"/>
-   </component>
-   <component id="rt_gesturehelper_api" name="Runtime Gesture Helper API" class="api" filter="s60" introduced="^4">
-    <meta rel="Api" href="web_plat/rt_gesturehelper_api/rt_gesturehelper_api.metaxml"/>
-    <unit bldFile="web_plat/rt_gesturehelper_api/group"/>
-   </component>
-   <component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/scheme_handler_plugin_api/scheme_handler_plugin_api.metaxml"/>
-    <unit bldFile="web_plat/scheme_handler_plugin_api/group"/>
-   </component>
-   <component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/scriptable_plugin_api/scriptable_plugin_api.metaxml"/>
-    <unit bldFile="web_plat/scriptable_plugin_api/group"/>
-   </component>
-   <component id="webutils_api" name="Web Utils API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/webutils_api/webutils_api.metaxml"/>
-    <unit bldFile="web_plat/webutils_api/group"/>
-   </component>
-   <component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/widget_registry_api/widget_registry_api.metaxml"/>
-    <unit bldFile="web_plat/widget_registry_api/group"/>
-   </component>
-   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
-    <unit bldFile="web_plat/xml_parser_api/group"/>
-   </component>
-  </collection>
-  <collection id="web_info" name="Web Info" level="specific">
-   <component id="web_build" filter="s60" name="Web Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
-  <collection id="browserutilities" name="Browser Utilities" level="utils">
-   <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
-    <unit bldFile="browserutilities/browserdialogsprovider/group"/>
-   </component>
-   <component id="recenturlstore" filter="s60" name="Recent URL Store">
-    <unit bldFile="browserutilities/recenturlstore/group"/>
-   </component>
-   <component id="xmlparser" filter="s60" name="XML Interface">
-    <unit bldFile="browserutilities/xmlparser/group"/>
-   </component>
-   <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
-    <unit bldFile="browserutilities/cxmllibrary/group"/>
-   </component>
-   <component id="downloadmgr" filter="s60" name="Download Manager">
-    <unit bldFile="browserutilities/downloadmgr/group"/>
-   </component>
-   <component id="connectionmanager" filter="s60" name="Connection Manager">
-    <unit bldFile="browserutilities/connectionmanager/group"/>
-   </component>
-   <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
-    <unit bldFile="browserutilities/browsertelservice/group"/>
-   </component>
-   <component id="favouritesengine" filter="s60" name="Favourites Engine">
-    <unit bldFile="browserutilities/favouritesengine/group"/>
-   </component>
-   <component id="feedsengine" filter="s60" name="Feeds Engine">
-    <unit bldFile="browserutilities/feedsengine/group"/>
-   </component>
-   <component id="multipartparser" filter="s60" name="Multipart Parser">
-    <meta rel="config">
-     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
-    </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-    <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-   </component>
-   <component id="schemehandler" filter="s60" name="Scheme Handler">
-    <unit bldFile="browserutilities/schemehandler/group"/>
-   </component>
-   <component id="webutils" filter="s60" name="Web Utils">
-    <unit bldFile="browserutilities/webutils/group"/>
-   </component>
-   <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
-    <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
-   </component>
-   <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-    <unit bldFile="browserutilities/group"/>
-   </component>
-  </collection>
-  <collection id="webengine" name="Web Engine" level="server">
-   <component id="osswebengine" filter="s60" name="OSS Web Engine">
-    <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-    <unit bldFile="webengine/osswebengine/cache/group"/>
-    <unit bldFile="webengine/osswebengine/memorymanager/group"/>
-    <unit bldFile="webengine/osswebengine/npscript/group"/>
-    <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
-    <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-   </component>
-   <component id="webkitutils" filter="s60" name="WebKit Utils">
-    <unit bldFile="webengine/webkitutils/group"/>
-   </component>
-   <component id="pagescaler" filter="s60" name="Page Scaler">
-    <unit bldFile="webengine/pagescaler/group"/>
-   </component>
-   <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
-    <unit bldFile="webengine/widgetinstaller/group"/>
-   </component>
-   <component id="widgetregistry" filter="s60" name="Widget Registry">
-    <unit bldFile="webengine/widgetregistry/group"/>
-   </component>
-   <component id="wmlengine" filter="s60" name="WML Engine">
-    <unit bldFile="webengine/wmlengine/group"/>
-   </component>
-   <component id="device" filter="s60" name="Device">
-    <!-- this needs a more meaningful name -->
-    <unit bldFile="webengine/device/group"/>
-   </component>
-   <component id="widgetengine" filter="s60" name="Widget Engine">
-    <unit bldFile="webengine/widgetengine/group"/>
-   </component>
-   <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
-    <unit bldFile="webengine/memoryplugin/group"/>
-   </component>
-   <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
-    <unit bldFile="webengine/widgetmemoryplugin/group"/>
-   </component>
-   <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
-    <unit bldFile="webengine/widgetbackuprestore/group"/>
-   </component>
-   <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
-    <unit bldFile="webengine/browserrecognizers/group"/>
-   </component>
-   <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
-    <unit bldFile="webengine/wrtharvester/group"/>
-   </component>
-  </collection>
-  <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
-   <component id="codeng" filter="s60" name="COD Engine">
-    <unit bldFile="codhandler/codeng/group"/>
-   </component>
-   <component id="codui" filter="s60" name="COD UI">
-    <unit bldFile="codhandler/codui/group"/>
-   </component>
-   <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
-    <unit bldFile="codhandler/codrecog/group"/>
-   </component>
-   <component id="codviewer" filter="s60" name="COD Viewer">
-    <unit bldFile="codhandler/codviewer/group"/>
-   </component>
-   <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
-    <unit bldFile="codhandler/ddrecog/group"/>
-   </component>
-   <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
-    <unit bldFile="codhandler/ddviewer/group"/>
-   </component>
-   <component id="coddownload" filter="s60" name="COD Download">
-    <unit bldFile="codhandler/coddownload/group"/>
-   </component>
-   <component id="roapapp" filter="s60" name="ROAP Application">
-    <unit bldFile="codhandler/roapapp/group"/>
-   </component>
-   <component id="codhandler_build" filter="s60" name="COD Handler Build">
-    <!-- Exports need to go into another component or make this self-contained.
-      		#included .hrh file needs to be #included in each of the other components -->
-    <unit bldFile="codhandler/group"/>
-   </component>
-  </collection>
-  <collection id="widgets" name="Web Widget Framework" level="generic">
-   <meta rel="config">
-    <defined condition="RD_BROWSER_WIDGETS"/>
-    <defined condition="__WEB_WIDGETS"/>
-   </meta>
-   <!-- the following units can be uncommented when configuration is put in place -->
-   <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-    <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-   </component>
-   <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-    <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-   </component>
-   <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-    <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-   </component>
-   <component id="widgetapp" filter="s60" name="Widget UI">
-    <!--<unit bldFile="widgets/widgetapp/group"/>-->
-   </component>
-   <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
-    <meta rel="config">
-     <defined condition="RD_WIDGET_PREINSTALLER"/>
-    </meta>
-    <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-   </component>
-   <component id="widgetstartup" filter="s60" name="Widget Startup">
-    <meta rel="config">
-     <defined condition="RD_WIDGET_PREINSTALLER"/>
-    </meta>
-    <!--<unit bldFile="widgets/widgetstartup/group"/>-->
-   </component>
-   <component id="widgets_build" filter="s60" name="Widgets Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
-      		#included .hrh file needs to be #included in each of the other components -->
-    <unit bldFile="widgets/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/webruntime/package_definition.xml
--- a/symbian4/mw/webruntime/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/webruntime/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,89 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="webruntime" level="specific" long-name="Web Runtime">
-        <!-- need to break up this package nito collections and components -->
-        <collection name="webruntime_info" long-name="Web Runtime Info">
-          <component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-            <unit bldFile="/sf/mw/webruntime/." proFile="cwrt.pro" qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="webruntime" name="Web Runtime">
+	<!-- need to break up this package nito collections and components -->
+    <collection id="webruntime_info" name="Web Runtime Info">
+     <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
+      <unit bldFile="." qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+     </component>
+    </collection>
+   </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/webruntime/package_definition_3.0.xml
--- a/symbian4/mw/webruntime/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="webruntime" name="Web Runtime">
-	<!-- need to break up this package nito collections and components -->
-    <collection id="webruntime_info" name="Web Runtime Info">
-     <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
-      <unit bldFile="." qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
-     </component>
-    </collection>
-   </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/websrv/package_definition.xml
--- a/symbian4/mw/websrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/websrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,200 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
-        <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-          <component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/group"/>
-          </component>
-          <component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/group"/>
-          </component>
-          <component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/group"/>
-          </component>
-          <component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-          </component>
-          <component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-          </component>
-          <component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/group"/>
-          </component>
-          <component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/xml_fragment_api/group"/>
-          </component>
-        </collection>
-        <collection name="webservices" long-name="Web Services Framework" level="generic">
-          <!-- consider breaking this collection into more meaningful subsets -->
-          <component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/wsnotifierplugins/group"/>
-          </component>
-          <component name="wslogger" filter="s60" long-name="WS Logger">
-            <unit bldFile="/sf/mw/websrv/webservices/wslogger/group"/>
-          </component>
-          <component name="wsxml" filter="s60" long-name="WS XML Extensions">
-            <unit bldFile="/sf/mw/websrv/webservices/wsxml/group"/>
-          </component>
-          <component name="wsutils" filter="s60" long-name="WS Utils">
-            <unit bldFile="/sf/mw/websrv/webservices/wsutils/group"/>
-          </component>
-          <component name="wsfragment" filter="s60" long-name="WS Fragment">
-            <unit bldFile="/sf/mw/websrv/webservices/wsfragment/group"/>
-          </component>
-          <component name="wsdescription" filter="s60" long-name="WS Service Description">
-            <unit bldFile="/sf/mw/websrv/webservices/wsdescription/group"/>
-          </component>
-          <component name="wsconnection" filter="s60" long-name="WS Service Connection">
-            <unit bldFile="/sf/mw/websrv/webservices/wsconnection/group"/>
-          </component>
-          <component name="wsmessages" filter="s60" long-name="WS Messages">
-            <unit bldFile="/sf/mw/websrv/webservices/wsmessages/group"/>
-          </component>
-          <component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
-            <unit bldFile="/sf/mw/websrv/webservices/wscredentialmanager/group"/>
-          </component>
-          <component name="wsframework" filter="s60" long-name="WS Framework">
-            <unit bldFile="/sf/mw/websrv/webservices/wsframework/group"/>
-          </component>
-          <component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-          </component>
-          <component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
-            <unit bldFile="/sf/mw/websrv/webservices/wsconnectionagent/group"/>
-          </component>
-          <component name="wsprovider" filter="s60" long-name="WS Provider">
-            <unit bldFile="/sf/mw/websrv/webservices/wsprovider/group"/>
-          </component>
-          <component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
-            <unit bldFile="/sf/mw/websrv/webservices/wshostletconnection/group"/>
-          </component>
-          <component name="wsmanager" filter="s60" long-name="WS Service Manager">
-            <unit bldFile="/sf/mw/websrv/webservices/wsmanager/group"/>
-          </component>
-          <component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
-            <unit bldFile="/sf/mw/websrv/webservices/wsidentitymanager/group"/>
-          </component>
-          <component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/idwsfplugin/group"/>
-          </component>
-          <component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/wsibasicplugin/group"/>
-          </component>
-          <component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/wsrestplugin/group"/>
-          </component>
-          <component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
-            <unit bldFile="/sf/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-          </component>
-          <component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
-            <unit bldFile="/sf/mw/websrv/webservices/wspasswordtransforms/group"/>
-          </component>
-          <component name="wscore" filter="s60" long-name="WS Core Service Manager">
-            <unit bldFile="/sf/mw/websrv/webservices/wscore/group"/>
-          </component>
-          <component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/wslocaltransportplugin/group"/>
-          </component>
-          <component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/websrv/webservices/wshostlettransportplugin/group"/>
-          </component>
-          <component name="wsstar" filter="s60" long-name="WS Star">
-            <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-            <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
-            <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
-            <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
-          </component>
-          <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-            <unit bldFile="/sf/mw/websrv/webservices/wsoviplugin/group"/>
-          </component>
-          <component name="webservices_build" filter="s60" long-name="Web Services Build">
-            <!-- need to split into self-contained components -->
-            <unit bldFile="/sf/mw/websrv/webservices/group"/>
-          </component>
-        </collection>
-        <collection name="websrv_info" long-name="Web Services Info" level="specific">
-          <component name="websrv_bld" filter="s60" long-name="Web Services Build">
-            <!-- need to include common .hrh in each unit -->
-            <unit bldFile="/sf/mw/websrv/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="websrv" name="Web Services" levels="plugin framework server generic specific">
+  <collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
+   <component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/web_service_description_api/web_service_description_api.metaxml"/>
+    <unit bldFile="websrv_pub/web_service_description_api/group"/>
+   </component>
+   <component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/web_service_connection_api/web_service_connection_api.metaxml"/>
+    <unit bldFile="websrv_pub/web_service_connection_api/group"/>
+   </component>
+   <component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/web_service_manager_api/web_service_manager_api.metaxml"/>
+    <unit bldFile="websrv_pub/web_service_manager_api/group"/>
+   </component>
+   <component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/hostlet_connection_api/hostlet_connection_api.metaxml"/>
+    <unit bldFile="websrv_pub/hostlet_connection_api/group"/>
+   </component>
+   <component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/web_service_messaging_api/web_service_messaging_api.metaxml"/>
+    <unit bldFile="websrv_pub/web_service_messaging_api/group"/>
+   </component>
+   <component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/xml_extensions_api/xml_extensions_api.metaxml"/>
+    <unit bldFile="websrv_pub/xml_extensions_api/group"/>
+   </component>
+   <component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/xml_fragment_api/xml_fragment_api.metaxml"/>
+    <unit bldFile="websrv_pub/xml_fragment_api/group"/>
+   </component>
+  </collection>
+  <collection id="webservices" name="Web Services Framework" level="generic">
+   <!-- consider breaking this collection into more meaningful subsets -->
+   <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+    <unit bldFile="webservices/wsnotifierplugins/group"/>
+   </component>
+   <component id="wslogger" filter="s60" name="WS Logger">
+    <unit bldFile="webservices/wslogger/group"/>
+   </component>
+   <component id="wsxml" filter="s60" name="WS XML Extensions">
+    <unit bldFile="webservices/wsxml/group"/>
+   </component>
+   <component id="wsutils" filter="s60" name="WS Utils">
+    <unit bldFile="webservices/wsutils/group"/>
+   </component>
+   <component id="wsfragment" filter="s60" name="WS Fragment">
+    <unit bldFile="webservices/wsfragment/group"/>
+   </component>
+   <component id="wsdescription" filter="s60" name="WS Service Description">
+    <unit bldFile="webservices/wsdescription/group"/>
+   </component>
+   <component id="wsconnection" filter="s60" name="WS Service Connection">
+    <unit bldFile="webservices/wsconnection/group"/>
+   </component>
+   <component id="wsmessages" filter="s60" name="WS Messages">
+    <unit bldFile="webservices/wsmessages/group"/>
+   </component>
+   <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
+    <unit bldFile="webservices/wscredentialmanager/group"/>
+   </component>
+   <component id="wsframework" filter="s60" name="WS Framework">
+    <unit bldFile="webservices/wsframework/group"/>
+   </component>
+   <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+    <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
+   </component>
+   <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+    <unit bldFile="webservices/wsconnectionagent/group"/>
+   </component>
+   <component id="wsprovider" filter="s60" name="WS Provider">
+    <unit bldFile="webservices/wsprovider/group"/>
+   </component>
+   <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+    <unit bldFile="webservices/wshostletconnection/group"/>
+   </component>
+   <component id="wsmanager" filter="s60" name="WS Service Manager">
+    <unit bldFile="webservices/wsmanager/group"/>
+   </component>
+   <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
+    <unit bldFile="webservices/wsidentitymanager/group"/>
+   </component>
+   <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+    <unit bldFile="webservices/idwsfplugin/group"/>
+   </component>
+   <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+    <unit bldFile="webservices/wsibasicplugin/group"/>
+   </component>
+   <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+    <unit bldFile="webservices/wsrestplugin/group"/>
+   </component>
+   <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+    <unit bldFile="webservices/idwsfsecuritymechanism/group"/>
+   </component>
+   <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+    <unit bldFile="webservices/wspasswordtransforms/group"/>
+   </component>
+   <component id="wscore" filter="s60" name="WS Core Service Manager">
+    <unit bldFile="webservices/wscore/group"/>
+   </component>
+   <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+    <unit bldFile="webservices/wslocaltransportplugin/group"/>
+   </component>
+   <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+    <unit bldFile="webservices/wshostlettransportplugin/group"/>
+   </component>
+   <component id="wsstar" filter="s60" name="WS Star">
+    <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+    <unit bldFile="webservices/wsstar/wsstarpolicy/group"/>
+    <unit bldFile="webservices/wsstar/wsstarplugin/group"/>
+    <unit bldFile="webservices/wsstar/wsstarmessagehandlers/group"/>
+   </component>
+   <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+    <unit bldFile="webservices/wsoviplugin/group"/>
+   </component>
+   <component id="webservices_build" filter="s60" name="Web Services Build">
+    <!-- need to split into self-contained components -->
+    <unit bldFile="webservices/group"/>
+   </component>
+  </collection>
+  <collection id="websrv_info" name="Web Services Info" level="specific">
+   <component id="websrv_bld" filter="s60" name="Web Services Build">
+    <!-- need to include common .hrh in each unit -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/websrv/package_definition_3.0.xml
--- a/symbian4/mw/websrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="websrv" name="Web Services" levels="plugin framework server generic specific">
-  <collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
-   <component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/web_service_description_api/web_service_description_api.metaxml"/>
-    <unit bldFile="websrv_pub/web_service_description_api/group"/>
-   </component>
-   <component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/web_service_connection_api/web_service_connection_api.metaxml"/>
-    <unit bldFile="websrv_pub/web_service_connection_api/group"/>
-   </component>
-   <component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/web_service_manager_api/web_service_manager_api.metaxml"/>
-    <unit bldFile="websrv_pub/web_service_manager_api/group"/>
-   </component>
-   <component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/hostlet_connection_api/hostlet_connection_api.metaxml"/>
-    <unit bldFile="websrv_pub/hostlet_connection_api/group"/>
-   </component>
-   <component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/web_service_messaging_api/web_service_messaging_api.metaxml"/>
-    <unit bldFile="websrv_pub/web_service_messaging_api/group"/>
-   </component>
-   <component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/xml_extensions_api/xml_extensions_api.metaxml"/>
-    <unit bldFile="websrv_pub/xml_extensions_api/group"/>
-   </component>
-   <component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
-    <meta rel="Api" href="websrv_pub/xml_fragment_api/xml_fragment_api.metaxml"/>
-    <unit bldFile="websrv_pub/xml_fragment_api/group"/>
-   </component>
-  </collection>
-  <collection id="webservices" name="Web Services Framework" level="generic">
-   <!-- consider breaking this collection into more meaningful subsets -->
-   <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
-    <unit bldFile="webservices/wsnotifierplugins/group"/>
-   </component>
-   <component id="wslogger" filter="s60" name="WS Logger">
-    <unit bldFile="webservices/wslogger/group"/>
-   </component>
-   <component id="wsxml" filter="s60" name="WS XML Extensions">
-    <unit bldFile="webservices/wsxml/group"/>
-   </component>
-   <component id="wsutils" filter="s60" name="WS Utils">
-    <unit bldFile="webservices/wsutils/group"/>
-   </component>
-   <component id="wsfragment" filter="s60" name="WS Fragment">
-    <unit bldFile="webservices/wsfragment/group"/>
-   </component>
-   <component id="wsdescription" filter="s60" name="WS Service Description">
-    <unit bldFile="webservices/wsdescription/group"/>
-   </component>
-   <component id="wsconnection" filter="s60" name="WS Service Connection">
-    <unit bldFile="webservices/wsconnection/group"/>
-   </component>
-   <component id="wsmessages" filter="s60" name="WS Messages">
-    <unit bldFile="webservices/wsmessages/group"/>
-   </component>
-   <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
-    <unit bldFile="webservices/wscredentialmanager/group"/>
-   </component>
-   <component id="wsframework" filter="s60" name="WS Framework">
-    <unit bldFile="webservices/wsframework/group"/>
-   </component>
-   <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
-    <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
-   </component>
-   <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
-    <unit bldFile="webservices/wsconnectionagent/group"/>
-   </component>
-   <component id="wsprovider" filter="s60" name="WS Provider">
-    <unit bldFile="webservices/wsprovider/group"/>
-   </component>
-   <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
-    <unit bldFile="webservices/wshostletconnection/group"/>
-   </component>
-   <component id="wsmanager" filter="s60" name="WS Service Manager">
-    <unit bldFile="webservices/wsmanager/group"/>
-   </component>
-   <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
-    <unit bldFile="webservices/wsidentitymanager/group"/>
-   </component>
-   <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
-    <unit bldFile="webservices/idwsfplugin/group"/>
-   </component>
-   <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
-    <unit bldFile="webservices/wsibasicplugin/group"/>
-   </component>
-   <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
-    <unit bldFile="webservices/wsrestplugin/group"/>
-   </component>
-   <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
-    <unit bldFile="webservices/idwsfsecuritymechanism/group"/>
-   </component>
-   <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
-    <unit bldFile="webservices/wspasswordtransforms/group"/>
-   </component>
-   <component id="wscore" filter="s60" name="WS Core Service Manager">
-    <unit bldFile="webservices/wscore/group"/>
-   </component>
-   <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
-    <unit bldFile="webservices/wslocaltransportplugin/group"/>
-   </component>
-   <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
-    <unit bldFile="webservices/wshostlettransportplugin/group"/>
-   </component>
-   <component id="wsstar" filter="s60" name="WS Star">
-    <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-    <unit bldFile="webservices/wsstar/wsstarpolicy/group"/>
-    <unit bldFile="webservices/wsstar/wsstarplugin/group"/>
-    <unit bldFile="webservices/wsstar/wsstarmessagehandlers/group"/>
-   </component>
-   <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
-    <unit bldFile="webservices/wsoviplugin/group"/>
-   </component>
-   <component id="webservices_build" filter="s60" name="Web Services Build">
-    <!-- need to split into self-contained components -->
-    <unit bldFile="webservices/group"/>
-   </component>
-  </collection>
-  <collection id="websrv_info" name="Web Services Info" level="specific">
-   <component id="websrv_bld" filter="s60" name="Web Services Build">
-    <!-- need to include common .hrh in each unit -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,146 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-        <collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-          <component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-          </component>
-          <component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-          </component>
-          <component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-          </component>
-          <component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-          </component>
-        </collection>
-        <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-          <component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-            <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-          </component>
-          <component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-            <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-          </component>
-          <component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-            <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-            <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-          </component>
-          <component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-            <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-            <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-          </component>
-          <component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-            <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-            <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-          </component>
-          <component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-            <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-            <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-          </component>
-          <component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-            <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
-            <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
-          </component>
-        </collection>
-        <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-          <component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
-            <!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-            <unit bldFile="/sf/mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
-          </component>
-          <component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-            <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-          </component>
-          <component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-            <!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-          </component>
-          <component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-            <!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-          </component>
-          <component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-            <!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-          </component>
-          <component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-            <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="wirelessacc" name="Wireless Access" levels="framework generic ui">
+  <collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+   <component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/hotspot_framework_client_api/hotspot_framework_client_api.metaxml"/>
+    <unit bldFile="hsfw_plat/hotspot_framework_client_api/group"/>
+   </component>
+   <component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/internet_connectivity_test_service_api/internet_connectivity_test_service_api.metaxml"/>
+    <unit bldFile="hsfw_plat/internet_connectivity_test_service_api/group"/>
+   </component>
+   <component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/internet_connectivity_test_service_settings_api/internet_connectivity_test_service_settings_api.metaxml"/>
+    <unit bldFile="hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+   </component>
+   <component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/hotspot_framework_client_plugin_api/hotspot_framework_client_plugin_api.metaxml"/>
+    <unit bldFile="hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="hotspotfw" name="HotSpot Framework" level="framework">
+   <component id="hsserver" filter="s60" name="HotSpot Server">
+    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+   </component>
+   <component id="hsclient" filter="s60" name="HotSpot Client">
+    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+   </component>
+   <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+   </component>
+   <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+   </component>
+   <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+   </component>
+   <component id="hsbrowser" filter="s60" name="HotSpot Browser">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+   </component>
+   <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+    <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+    <unit bldFile="hotspotfw/group"/>
+   </component>
+  </collection>
+  <collection id="wlanutilities" name="WLAN Utilities" level="generic">
+   <component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
+	<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
+      <unit bldFile="wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
+    </component>
+   <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
+    <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+   </component>
+   <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+    <!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+   </component>
+   <component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
+    <!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+   </component>
+   <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+    <!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+   </component>
+   <component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin"  introduced="^4">
+    <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/mw/wirelessacc/package_definition_3.0.xml
--- a/symbian4/mw/wirelessacc/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="wirelessacc" name="Wireless Access" levels="framework generic ui">
-  <collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
-   <component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
-    <meta rel="Api" href="hsfw_plat/hotspot_framework_client_api/hotspot_framework_client_api.metaxml"/>
-    <unit bldFile="hsfw_plat/hotspot_framework_client_api/group"/>
-   </component>
-   <component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
-    <meta rel="Api" href="hsfw_plat/internet_connectivity_test_service_api/internet_connectivity_test_service_api.metaxml"/>
-    <unit bldFile="hsfw_plat/internet_connectivity_test_service_api/group"/>
-   </component>
-   <component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
-    <meta rel="Api" href="hsfw_plat/internet_connectivity_test_service_settings_api/internet_connectivity_test_service_settings_api.metaxml"/>
-    <unit bldFile="hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-   </component>
-   <component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="hsfw_plat/hotspot_framework_client_plugin_api/hotspot_framework_client_plugin_api.metaxml"/>
-    <unit bldFile="hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-   </component>
-  </collection>
-  <collection id="hotspotfw" name="HotSpot Framework" level="framework">
-   <component id="hsserver" filter="s60" name="HotSpot Server">
-    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-   </component>
-   <component id="hsclient" filter="s60" name="HotSpot Client">
-    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-   </component>
-   <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-   </component>
-   <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-   </component>
-   <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-   </component>
-   <component id="hsbrowser" filter="s60" name="HotSpot Browser">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-   </component>
-   <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
-    <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
-    <unit bldFile="hotspotfw/group"/>
-   </component>
-  </collection>
-  <collection id="wlanutilities" name="WLAN Utilities" level="generic">
-   <component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
-	<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-      <unit bldFile="wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
-    </component>
-   <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
-    <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
-   </component>
-   <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
-    <!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
-   </component>
-   <component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
-    <!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
-   </component>
-   <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
-    <!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
-   </component>
-   <component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin"  introduced="^4">
-    <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/boardsupport/package_definition.xml
--- a/symbian4/os/boardsupport/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/boardsupport/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,98 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-        <collection name="emulator" long-name="Emulator" level="bsp">
-          <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-            <unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-          </component>
-        </collection>
-        <collection name="haitest" long-name="HAI Test Suites" level="test">
-          <component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-            <unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-          </component>
-        </collection>
-        <collection name="boardsupport_info" long-name="Board Support Info" level="config">
-          <component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="boardsupport" name="Board Support" levels="bsp test 2 3 config">
+    <collection id="emulator" name="Emulator" level="bsp">
+      <component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+        <unit bldFile="emulator/emulatorbsp" mrp="emulator/emulatorbsp/base_wins.mrp"/>
+      </component>
+    </collection>
+    <collection id="haitest" name="HAI Test Suites" level="test">
+      <component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+        <unit mrp="haitest/bspsvs/group/bspsvs.mrp"/>
+      </component>
+    </collection>
+    <collection id="boardsupport_info" name="Board Support Info" level="config">
+      <component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/boardsupport/package_definition_3.0.xml
--- a/symbian4/os/boardsupport/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="boardsupport" name="Board Support" levels="bsp test 2 3 config">
-    <collection id="emulator" name="Emulator" level="bsp">
-      <component id="emulatorbsp" name="Emulator BSP" purpose="optional">
-        <unit bldFile="emulator/emulatorbsp" mrp="emulator/emulatorbsp/base_wins.mrp"/>
-      </component>
-    </collection>
-    <collection id="haitest" name="HAI Test Suites" level="test">
-      <component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
-        <unit mrp="haitest/bspsvs/group/bspsvs.mrp"/>
-      </component>
-    </collection>
-    <collection id="boardsupport_info" name="Board Support Info" level="config">
-      <component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/bt/package_definition.xml
--- a/symbian4/os/bt/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/bt/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,174 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-          <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
-          </component>
-          <component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
-            <unit bldFile="/sf/os/bt/bt_plat/bluetooth_power_management_api/group"/>
-          </component>
-          <component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/bt/bt_plat/at_command_handler_plugin_api/group"/>
-          </component>
-        </collection>
-        <collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-          <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-          </component>
-          <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/bt/bluetooth/btcomm" mrp="/sf/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-          </component>
-          <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetooth/btsdp" mrp="/sf/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-          </component>
-          <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetooth/btextnotifiers" mrp="/sf/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-          </component>
-          <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetooth/gavdp/group" mrp="/sf/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-          </component>
-          <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
-            <unit mrp="/sf/os/bt/bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="/sf/os/bt/bluetooth/btexample/test/group"/>
-          </component>
-          <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetooth/btlogger/group" mrp="/sf/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-          </component>
-          <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-          </component>
-        </collection>
-        <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-          <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetoothmgmt/btmgr" mrp="/sf/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-          </component>
-          <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-            <unit bldFile="/sf/os/bt/bluetoothmgmt/btconfig" mrp="/sf/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-          </component>
-          <component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetoothmgmt/btrom" mrp="/sf/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-          </component>
-          <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/sf/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-          </component>
-          <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional" filter="test">
-            <unit mrp="/sf/os/bt/bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="/sf/os/bt/bluetoothmgmt/btcommon"/>
-          </component>
-        </collection>
-        <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-          <component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/sf/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-          </component>
-        </collection>
-        <collection name="bthci" long-name="Host Controller Interface" level="server">
-          <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/bt/bthci/bthci2/group" mrp="/sf/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-          </component>
-          <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/os/bt/bthci/hciextensioninterface" mrp="/sf/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-          </component>
-          <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/bt/bthci/hci2implementations/group" mrp="/sf/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-          </component>
-        </collection>
-        <collection name="irda" long-name="IrDA" level="plugin">
-          <component name="irdastack" long-name="IrDA Stack" purpose="optional">
-            <unit bldFile="/sf/os/bt/irda/irdastack/group" mrp="/sf/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-          </component>
-        </collection>
-        <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-          <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
-            <unit mrp="/sf/os/bt/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="/sf/os/bt/bluetoothapitest/bluetoothsvs/group"/>
-          </component>
-        </collection>
-        <collection name="atext" long-name="AT Extensions" level="server">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-            <unit bldFile="/sf/os/bt/atext/group"/>
-          </component>
-        </collection>
-        <collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-          <component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
-            <unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
+   <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
+    <meta rel="Api" href="bt_plat/bluetooth_audio_adaptation_api/bluetooth_audio_adaptation_api.metaxml"/>
+    <unit bldFile="bt_plat/bluetooth_audio_adaptation_api/group"/>
+   </component>
+   <component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
+    <meta rel="Api" href="bt_plat/bluetooth_power_management_api/bluetooth_power_management_api.metaxml"/>
+    <unit bldFile="bt_plat/bluetooth_power_management_api/group"/>
+   </component>
+   <component id="at_command_handler_plugin_api" name="AT Command Handler Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="bt_plat/at_command_handler_plugin_api/at_command_handler_plugin_api.metaxml"/>
+    <unit bldFile="bt_plat/at_command_handler_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="bluetooth" name="Bluetooth Core" level="framework">
+   <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+    <unit bldFile="bluetooth/btstack" mrp="bluetooth/btstack/bluetooth_stack.mrp"/>
+   </component>
+   <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+    <unit bldFile="bluetooth/btcomm" mrp="bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+   </component>
+   <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+    <unit bldFile="bluetooth/btsdp" mrp="bluetooth/btsdp/bluetooth_sdp.mrp"/>
+   </component>
+   <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+    <unit bldFile="bluetooth/btextnotifiers" mrp="bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+   </component>
+   <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+    <unit bldFile="bluetooth/gavdp/group" mrp="bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+   </component>
+   <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+    <unit mrp="bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="bluetooth/btexample/test/group"/>
+   </component>
+   <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+    <unit bldFile="bluetooth/btlogger/group" mrp="bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+   </component>
+   <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+    <unit mrp="bluetooth/btdocs/bluetooth_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+   <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+    <unit bldFile="bluetoothmgmt/btmgr" mrp="bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+   </component>
+   <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+    <unit bldFile="bluetoothmgmt/btconfig" mrp="bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+   </component>
+   <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+    <unit bldFile="bluetoothmgmt/btrom" mrp="bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+   </component>
+   <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+    <unit bldFile="bluetoothmgmt/bluetoothclientlib" mrp="bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+   </component>
+   <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
+    <unit mrp="bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="bluetoothmgmt/btcommon"/>
+   </component>
+  </collection>
+  <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+   <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+    <unit bldFile="bluetoothcommsprofiles/btpan/group" mrp="bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+   </component>
+  </collection>
+  <collection id="bthci" name="Host Controller Interface" level="server">
+   <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+    <unit bldFile="bthci/bthci2/group" mrp="bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+   </component>
+   <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+    <unit bldFile="bthci/hciextensioninterface" mrp="bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+   </component>
+   <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+    <unit bldFile="bthci/hci2implementations/group" mrp="bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+   </component>
+  </collection>
+  <collection id="irda" name="IrDA" level="plugin">
+   <component id="irdastack" name="IrDA Stack" purpose="optional">
+    <unit bldFile="irda/irdastack/group" mrp="irda/irdastack/group/infra-red_irda.mrp"/>
+   </component>
+  </collection>
+  <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+   <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+    <unit mrp="bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="bluetoothapitest/bluetoothsvs/group"/>
+   </component>
+  </collection>
+  <collection id="atext" name="AT Extensions" level="server">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+    <unit bldFile="atext/group"/>
+   </component>
+  </collection>
+  <collection id="bt_info" name="Bluetooth Info" level="app-if">
+   <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+    <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/bt/package_definition_3.0.xml
--- a/symbian4/os/bt/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-  <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
-   <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="bt_plat/bluetooth_audio_adaptation_api/bluetooth_audio_adaptation_api.metaxml"/>
-    <unit bldFile="bt_plat/bluetooth_audio_adaptation_api/group"/>
-   </component>
-   <component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
-    <meta rel="Api" href="bt_plat/bluetooth_power_management_api/bluetooth_power_management_api.metaxml"/>
-    <unit bldFile="bt_plat/bluetooth_power_management_api/group"/>
-   </component>
-   <component id="at_command_handler_plugin_api" name="AT Command Handler Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="bt_plat/at_command_handler_plugin_api/at_command_handler_plugin_api.metaxml"/>
-    <unit bldFile="bt_plat/at_command_handler_plugin_api/group"/>
-   </component>
-  </collection>
-  <collection id="bluetooth" name="Bluetooth Core" level="framework">
-   <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
-    <unit bldFile="bluetooth/btstack" mrp="bluetooth/btstack/bluetooth_stack.mrp"/>
-   </component>
-   <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
-    <unit bldFile="bluetooth/btcomm" mrp="bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-   </component>
-   <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
-    <unit bldFile="bluetooth/btsdp" mrp="bluetooth/btsdp/bluetooth_sdp.mrp"/>
-   </component>
-   <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-    <unit bldFile="bluetooth/btextnotifiers" mrp="bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-   </component>
-   <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-    <unit bldFile="bluetooth/gavdp/group" mrp="bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-   </component>
-   <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
-    <unit mrp="bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="bluetooth/btexample/test/group"/>
-   </component>
-   <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-    <unit bldFile="bluetooth/btlogger/group" mrp="bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-   </component>
-   <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
-    <unit mrp="bluetooth/btdocs/bluetooth_documentation.mrp"/>
-   </component>
-  </collection>
-  <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
-   <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
-    <unit bldFile="bluetoothmgmt/btmgr" mrp="bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-   </component>
-   <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
-    <unit bldFile="bluetoothmgmt/btconfig" mrp="bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-   </component>
-   <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
-    <unit bldFile="bluetoothmgmt/btrom" mrp="bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-   </component>
-   <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-    <unit bldFile="bluetoothmgmt/bluetoothclientlib" mrp="bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-   </component>
-   <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
-    <unit mrp="bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="bluetoothmgmt/btcommon"/>
-   </component>
-  </collection>
-  <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
-   <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
-    <unit bldFile="bluetoothcommsprofiles/btpan/group" mrp="bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-   </component>
-  </collection>
-  <collection id="bthci" name="Host Controller Interface" level="server">
-   <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-    <unit bldFile="bthci/bthci2/group" mrp="bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-   </component>
-   <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-    <unit bldFile="bthci/hciextensioninterface" mrp="bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-   </component>
-   <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
-    <unit bldFile="bthci/hci2implementations/group" mrp="bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-   </component>
-  </collection>
-  <collection id="irda" name="IrDA" level="plugin">
-   <component id="irdastack" name="IrDA Stack" purpose="optional">
-    <unit bldFile="irda/irdastack/group" mrp="irda/irdastack/group/infra-red_irda.mrp"/>
-   </component>
-  </collection>
-  <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
-   <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
-    <unit mrp="bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="bluetoothapitest/bluetoothsvs/group"/>
-   </component>
-  </collection>
-  <collection id="atext" name="AT Extensions" level="server">
-   <!-- collection is really a component. Need to move down a directory -->
-   <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-    <unit bldFile="atext/group"/>
-   </component>
-  </collection>
-  <collection id="bt_info" name="Bluetooth Info" level="app-if">
-   <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-    <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/buildtools/package_definition.xml
--- a/symbian4/os/buildtools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/buildtools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,125 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-        <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-          <component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-            <unit mrp="/sf/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-          </component>
-          <component name="commonbldutils" long-name="Common Utils" purpose="development">
-            <unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-          </component>
-        </collection>
-        <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-          <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-            <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-          </component>
-          <component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-            <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-          </component>
-          <component name="wintunnel" long-name="Wintunnel" purpose="development" filter="test">
-            <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="/sf/os/buildtools/toolsandutils/wintunnel/group"/>
-          </component>
-          <component name="autotest" long-name="Autotest" purpose="development">
-            <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-          </component>
-        </collection>
-        <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-          <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-            <unit mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group"/>
-          </component>
-        </collection>
-        <collection name="imgtools_os" long-name="Image Tools" level="fw">
-          <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-            <unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-          </component>
-        </collection>
-        <collection name="misccomponents" long-name="Misc Components" level="mw">
-          <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-            <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-          </component>
-        </collection>
-        <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-          <component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="buildtools" name="Build Tools" levels="bld mw fw ui">
+    <collection id="bldsystemtools" name="Build System Tools" level="bld">
+      <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+        <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+      </component>
+      <component id="commonbldutils" name="Common Utils" purpose="development">
+        <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+      </component>
+    </collection>
+    <collection id="toolsandutils" name="Tools and Utils" level="mw">
+      <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+        <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
+      </component>
+      <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+        <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+      </component>
+      <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
+        <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
+      </component>
+      <component id="autotest" name="Autotest" purpose="development">
+        <unit bldFile="toolsandutils/autotest/group" mrp="toolsandutils/autotest/group/tools_autotest.mrp"/>
+      </component>
+    </collection>
+    <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
+        <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
+      </component>
+	 </collection>
+	 <collection id="imgtools_os" name="Image Tools" level="fw">
+      <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+        <unit bldFile="imgtools_os/romkiteka2/group" mrp="imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+      </component>
+    </collection>
+    <collection id="misccomponents" name="Misc Components" level="mw">
+      <component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+        <unit bldFile="misccomponents/emulatorlauncher/group" mrp="misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+      </component>
+    </collection>
+    <collection id="buildtools_info" name="Build Tools Info" level="ui">
+      <component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/buildtools/package_definition_3.0.xml
--- a/symbian4/os/buildtools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="buildtools" name="Build Tools" levels="bld mw fw ui">
-    <collection id="bldsystemtools" name="Build System Tools" level="bld">
-      <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
-        <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-      </component>
-      <component id="commonbldutils" name="Common Utils" purpose="development">
-        <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-      </component>
-    </collection>
-    <collection id="toolsandutils" name="Tools and Utils" level="mw">
-      <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
-        <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
-      </component>
-      <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
-        <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-      </component>
-      <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
-        <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
-      </component>
-      <component id="autotest" name="Autotest" purpose="development">
-        <unit bldFile="toolsandutils/autotest/group" mrp="toolsandutils/autotest/group/tools_autotest.mrp"/>
-      </component>
-    </collection>
-    <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
-      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
-        <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
-      </component>
-	 </collection>
-	 <collection id="imgtools_os" name="Image Tools" level="fw">
-      <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
-        <unit bldFile="imgtools_os/romkiteka2/group" mrp="imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-      </component>
-    </collection>
-    <collection id="misccomponents" name="Misc Components" level="mw">
-      <component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
-        <unit bldFile="misccomponents/emulatorlauncher/group" mrp="misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-      </component>
-    </collection>
-    <collection id="buildtools_info" name="Build Tools Info" level="ui">
-      <component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,202 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-          <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
-            <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-          </component>
-        </collection>
-        <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-          <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-          </component>
-        </collection>
-        <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-          <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-          </component>
-        </collection>
-        <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-          <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-          </component>
-          <component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-          </component>
-          <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-          </component>
-          <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-          </component>
-          <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-          </component>
-          <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-          </component>
-          <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-          </component>
-          <component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-          </component>
-          <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-          </component>
-        </collection>
-        <collection name="telephonyserver" long-name="Telephony Server" level="server">
-          <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-          </component>
-          <component name="etelconfig" long-name="ETel Config" purpose="mandatory" filter="test" class="config">
-            <unit mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/data"/>
-          </component>
-          <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/sf/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-          </component>
-          <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-          </component>
-          <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-          </component>
-        </collection>
-        <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-          <component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-          </component>
-          <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
-            <unit mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
-          </component>
-          <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-          </component>
-          <component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-          </component>
-          <component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-          </component>
-          <component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-          </component>
-        </collection>
-        <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-          <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-            <unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-          </component>
-          <component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-          </component>
-          <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-            <unit bldFile="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-          </component>
-        </collection>
-        <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-          <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-          </component>
-          <component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-          </component>
-          <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-          </component>
-        </collection>
-        <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-          <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
-            <unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-          </component>
-        </collection>
-        <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
-          <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group"/>
-          </component>
-          <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group"/>
-          </component>
-          <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
+      <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
+        <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+      </component>
+    </collection>
+    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+      <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
+        <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+      </component>
+    </collection>
+    <collection id="smsprotocols" name="SMS Protocols" level="framework">
+      <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+        <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+      </component>
+    </collection>
+    <collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+      <component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/csdagt/group" mrp="telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+      </component>
+      <component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/psdagt/group" mrp="telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+      </component>
+      <component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/gprsumtsqosprt/group" mrp="telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+      </component>
+      <component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/gprsumtsqosinterface/group" mrp="telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+      </component>
+      <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+        <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+      </component>
+      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+      </component>
+      <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+      </component>
+      <component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/pdplayer/group" mrp="telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+      </component>
+      <component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+        <unit bldFile="telephonyprotocols/rawipnif/group" mrp="telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+      </component>
+    </collection>
+    <collection id="telephonyserver" name="Telephony Server" level="server">
+      <component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+        <unit bldFile="telephonyserver/etelserverandcore/group" mrp="telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+      </component>
+      <component id="etelconfig" name="ETel Config" purpose="mandatory" class="config" filter="test">
+        <unit mrp="telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="telephonyserver/etelserverandcore/data"/>
+      </component>
+      <component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+        <unit bldFile="telephonyserver/etelmultimode/group" mrp="telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+      </component>
+      <component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+        <unit bldFile="telephonyserver/etelpacketdata/group" mrp="telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+      </component>
+      <component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+        <unit bldFile="telephonyserver/etelsimtoolkit/group" mrp="telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+      </component>
+    </collection>
+    <collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+      <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+      </component>
+      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+        <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
+      </component>
+      <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+        <unit bldFile="telephonyserverplugins/multimodetsy/group" mrp="telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+      </component>
+      <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+        <unit bldFile="telephonyserverplugins/simtsy/group" mrp="telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+      </component>
+      <component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="telephonyserverplugins/ctsydispatchlayer/group" mrp="telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+      </component>
+      <component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+      </component>
+    </collection>
+    <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+      <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+        <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
+      </component>
+      <component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+        <unit bldFile="telephonyutils/telephonywatchers/group" mrp="telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+      </component>
+      <component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+        <unit bldFile="telephonyutils/etel3rdpartyapi/Group" mrp="telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+      </component>
+    </collection>
+    <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+      <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+        <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+      </component>
+      <component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+        <unit mrp="cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+      </component>
+      <component id="cellularsrv_metadata" name="Cellular Baseband Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+      </component>
+    </collection>
+    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+      <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
+        <unit bldFile="hwpluginsimulation/mocksy/group" mrp="hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+      </component>
+    </collection>
+    <collection id="cellularsrvapitest" name="Telephony API Tests" level="app-if">
+      <component id="datatransferhaitest" name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
+			  <unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="cellularsrvapitest/datatransferhaitest/group"/>
+      </component>
+      <component id="telephonyhaitest" name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+			  <unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="cellularsrvapitest/telephonyhaitest/group"/>
+      </component>
+      <component id="telephonydevsoundhaitest" name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/cellularsrv/package_definition_3.0.xml
--- a/symbian4/os/cellularsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
-      <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
-        <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-      </component>
-    </collection>
-    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
-      <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
-        <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-      </component>
-    </collection>
-    <collection id="smsprotocols" name="SMS Protocols" level="framework">
-      <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
-        <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-      </component>
-    </collection>
-    <collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
-      <component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/csdagt/group" mrp="telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-      </component>
-      <component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/psdagt/group" mrp="telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-      </component>
-      <component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/gprsumtsqosprt/group" mrp="telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-      </component>
-      <component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/gprsumtsqosinterface/group" mrp="telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-      </component>
-      <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
-        <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-      </component>
-      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-      </component>
-      <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-      </component>
-      <component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/pdplayer/group" mrp="telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-      </component>
-      <component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
-        <unit bldFile="telephonyprotocols/rawipnif/group" mrp="telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-      </component>
-    </collection>
-    <collection id="telephonyserver" name="Telephony Server" level="server">
-      <component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
-        <unit bldFile="telephonyserver/etelserverandcore/group" mrp="telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-      </component>
-      <component id="etelconfig" name="ETel Config" purpose="mandatory" class="config" filter="test">
-        <unit mrp="telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="telephonyserver/etelserverandcore/data"/>
-      </component>
-      <component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
-        <unit bldFile="telephonyserver/etelmultimode/group" mrp="telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-      </component>
-      <component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-        <unit bldFile="telephonyserver/etelpacketdata/group" mrp="telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-      </component>
-      <component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-        <unit bldFile="telephonyserver/etelsimtoolkit/group" mrp="telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-      </component>
-    </collection>
-    <collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
-      <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-      </component>
-      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
-        <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
-      </component>
-      <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
-        <unit bldFile="telephonyserverplugins/multimodetsy/group" mrp="telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-      </component>
-      <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
-        <unit bldFile="telephonyserverplugins/simtsy/group" mrp="telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-      </component>
-      <component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="telephonyserverplugins/ctsydispatchlayer/group" mrp="telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-      </component>
-      <component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-      </component>
-    </collection>
-    <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
-      <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
-        <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
-      </component>
-      <component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
-        <unit bldFile="telephonyutils/telephonywatchers/group" mrp="telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-      </component>
-      <component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-        <unit bldFile="telephonyutils/etel3rdpartyapi/Group" mrp="telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-      </component>
-    </collection>
-    <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
-      <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
-        <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-      </component>
-      <component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
-        <unit mrp="cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-      </component>
-      <component id="cellularsrv_metadata" name="Cellular Baseband Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
-      <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
-        <unit bldFile="hwpluginsimulation/mocksy/group" mrp="hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-      </component>
-    </collection>
-    <collection id="cellularsrvapitest" name="Telephony API Tests" level="app-if">
-      <component id="datatransferhaitest" name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
-			  <unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="cellularsrvapitest/datatransferhaitest/group"/>
-      </component>
-      <component id="telephonyhaitest" name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
-			  <unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="cellularsrvapitest/telephonyhaitest/group"/>
-      </component>
-      <component id="telephonydevsoundhaitest" name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
-			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/commsfw/package_definition.xml
--- a/symbian4/os/commsfw/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/commsfw/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,167 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-        <collection name="commsprocess" long-name="Comms Process" level="process">
-          <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-          </component>
-          <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" filter="test" class="config">
-            <unit mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/etc"/>
-          </component>
-        </collection>
-        <collection name="commsconfig" long-name="Comms Config" level="process">
-          <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-          </component>
-          <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/sf/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-          </component>
-        </collection>
-        <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-          <component name="esockserver" long-name="ESock Server" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/datacommsserver/esockserver/group" mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-          </component>
-          <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" filter="test" class="config">
-            <unit mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="/sf/os/commsfw/datacommsserver/esockserver/etc" version="3"/>
-          </component>
-          <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-          </component>
-          <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-            <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-          </component>
-          <component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/commsfw/datacommsserver/networkcontroller/group" mrp="/sf/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-          </component>
-        </collection>
-        <collection name="serialserver" long-name="Serial Server" level="server">
-          <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/commsfw/serialserver/serialportcsy" mrp="/sf/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-          </component>
-          <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-            <unit bldFile="/sf/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/sf/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-          </component>
-          <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/serialserver/c32serialserver/group" mrp="/sf/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-          </component>
-          <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-            <unit bldFile="/sf/os/commsfw/serialserver/c32serialserverconfig" mrp="/sf/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-          </component>
-          <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-          </component>
-        </collection>
-        <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-          <component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/commsfwutils/commsbufs/group" mrp="/sf/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-          </component>
-        </collection>
-        <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-          <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-            <unit mrp="/sf/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-          </component>
-          <component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-          </component>
-        </collection>
-        <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-          <component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-            <unit bldFile="/sf/os/commsfw/commsfwsupport/commselements/group" mrp="/sf/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-          </component>
-        </collection>
-        <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-          <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-            <unit mrp="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-          </component>
-        </collection>
-        <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-          <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-            <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-          </component>
-          <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-            <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-          </component>
-          <component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
-            <unit bldFile="/sf/os/commsfw/commsfwtools/commstools/group" mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="commsfw" name="Communications Framework" levels="server support framework process app-if">
+    <collection id="commsprocess" name="Comms Process" level="process">
+      <component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+        <unit bldFile="commsprocess/commsrootserverconfig/group" mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+      </component>
+      <component id="commsrootserverconfig" name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+        <unit mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="commsprocess/commsrootserverconfig/etc"/>
+      </component>
+    </collection>
+    <collection id="commsconfig" name="Comms Config" level="process">
+      <component id="commsdatabase" name="Comms Database" purpose="mandatory">
+        <unit bldFile="commsfwtools/preparedefaultcommsdatabase/group" mrp="commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+      </component>
+      <component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+        <unit bldFile="commsconfig/commsdatabaseshim/group" mrp="commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+      </component>
+    </collection>
+    <collection id="datacommsserver" name="Data Comms Server" level="framework">
+      <component id="esockserver" name="ESock Server" purpose="mandatory">
+        <unit version="3" bldFile="datacommsserver/esockserver/group" mrp="datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+      </component>
+      <component id="esockserverconfig" name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+        <unit version="3" mrp="datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="datacommsserver/esockserver/etc"/>
+      </component>
+      <component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+        <unit bldFile="datacommsserver/networkingdialogapi/group" mrp="datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+      </component>
+      <component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+        <unit bldFile="datacommsserver/networkingdialogapi/default" mrp="datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+      </component>
+      <component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="datacommsserver/networkcontroller/group" mrp="datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+      </component>
+    </collection>
+    <collection id="serialserver" name="Serial Server" level="server">
+      <component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+        <unit bldFile="serialserver/serialportcsy" mrp="serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+      </component>
+      <component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+        <unit bldFile="serialserver/packetloopbackcsy/group" mrp="serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+      </component>
+      <component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+        <unit bldFile="serialserver/c32serialserver/group" mrp="serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+      </component>
+      <component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+        <unit bldFile="serialserver/c32serialserverconfig" mrp="serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+      </component>
+      <component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+        <unit mrp="serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+      </component>
+    </collection>
+    <collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+      <component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+        <unit bldFile="commsfwutils/commsbufs/group" mrp="commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+      </component>
+    </collection>
+    <collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+      <component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+        <unit mrp="commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+      </component>
+      <component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+      </component>
+    </collection>
+    <collection id="commsfwsupport" name="Comms Framework Support" level="support">
+      <component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+        <unit bldFile="commsfwsupport/commselements/group" mrp="commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+      </component>
+	  </collection>
+    <collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+      <component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+        <unit mrp="commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+      </component>
+    </collection>
+    <collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+      <component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+        <unit bldFile="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+      </component>
+      <component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+        <unit bldFile="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+      </component>
+      <component id="commstools" name="Comms Tools" introduced="^3" purpose="development" target="desktop">
+         <unit bldFile="commsfwtools/commstools/group" mrp="commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+      </component>
+	  </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/commsfw/package_definition_3.0.xml
--- a/symbian4/os/commsfw/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="commsfw" name="Communications Framework" levels="server support framework process app-if">
-    <collection id="commsprocess" name="Comms Process" level="process">
-      <component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-        <unit bldFile="commsprocess/commsrootserverconfig/group" mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-      </component>
-      <component id="commsrootserverconfig" name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
-        <unit mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="commsprocess/commsrootserverconfig/etc"/>
-      </component>
-    </collection>
-    <collection id="commsconfig" name="Comms Config" level="process">
-      <component id="commsdatabase" name="Comms Database" purpose="mandatory">
-        <unit bldFile="commsfwtools/preparedefaultcommsdatabase/group" mrp="commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-      </component>
-      <component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-        <unit bldFile="commsconfig/commsdatabaseshim/group" mrp="commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-      </component>
-    </collection>
-    <collection id="datacommsserver" name="Data Comms Server" level="framework">
-      <component id="esockserver" name="ESock Server" purpose="mandatory">
-        <unit version="3" bldFile="datacommsserver/esockserver/group" mrp="datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
-      </component>
-      <component id="esockserverconfig" name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
-        <unit version="3" mrp="datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="datacommsserver/esockserver/etc"/>
-      </component>
-      <component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
-        <unit bldFile="datacommsserver/networkingdialogapi/group" mrp="datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-      </component>
-      <component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-        <unit bldFile="datacommsserver/networkingdialogapi/default" mrp="datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-      </component>
-      <component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="datacommsserver/networkcontroller/group" mrp="datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-      </component>
-    </collection>
-    <collection id="serialserver" name="Serial Server" level="server">
-      <component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
-        <unit bldFile="serialserver/serialportcsy" mrp="serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-      </component>
-      <component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
-        <unit bldFile="serialserver/packetloopbackcsy/group" mrp="serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-      </component>
-      <component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-        <unit bldFile="serialserver/c32serialserver/group" mrp="serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-      </component>
-      <component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-        <unit bldFile="serialserver/c32serialserverconfig" mrp="serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-      </component>
-      <component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
-        <unit mrp="serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-      </component>
-    </collection>
-    <collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
-      <component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
-        <unit bldFile="commsfwutils/commsbufs/group" mrp="commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-      </component>
-    </collection>
-    <collection id="commsfw_info" name="Comms Framework Info" level="app-if">
-      <component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-        <unit mrp="commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-      </component>
-      <component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="commsfwsupport" name="Comms Framework Support" level="support">
-      <component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
-        <unit bldFile="commsfwsupport/commselements/group" mrp="commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-      </component>
-	  </collection>
-    <collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
-      <component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
-        <unit mrp="commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-      </component>
-    </collection>
-    <collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
-      <component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
-        <unit bldFile="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-      </component>
-      <component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
-        <unit bldFile="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-      </component>
-      <component id="commstools" name="Comms Tools" introduced="^3" purpose="development" target="desktop">
-         <unit bldFile="commsfwtools/commstools/group" mrp="commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-      </component>
-	  </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -101,122 +101,122 @@
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^4">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
-      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
-      <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>
+      <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adaptation/stubs/package_definition.xml"/>
+      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition.xml"/>
+      <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition.xml"/>
     </layer>
     <layer id="os" name="OS" levels="hw services">
-      <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition_3.0.xml"/>
-      <package id="boardsupport" level="hw" tech-domain="hb" href="../../../../os/boardsupport/package_definition_3.0.xml"/>
-      <package id="buildtools" level="hw" tech-domain="to" href="../../../../os/buildtools/package_definition_3.0.xml"/>
-      <package id="ossrv" level="services" tech-domain="hb" href="../../../../os/ossrv/package_definition_3.0.xml"/>
-      <package id="persistentdata" level="services" tech-domain="hb" href="../../../../os/persistentdata/package_definition_3.0.xml"/>
-      <package id="devicesrv" level="services" tech-domain="hb" href="../../../../os/devicesrv/package_definition_3.0.xml"/>
-      <package id="security" level="services" tech-domain="se" href="../../../../os/security/package_definition_3.0.xml"/>
-      <package id="lbs" level="services" tech-domain="lo" href="../../../../os/lbs/package_definition_3.0.xml"/>
-      <package id="commsfw" level="services" tech-domain="dc" href="../../../../os/commsfw/package_definition_3.0.xml"/>
-      <package id="networkingsrv" level="services" tech-domain="dc" href="../../../../os/networkingsrv/package_definition_3.0.xml"/>
-      <package id="wlan" level="services" tech-domain="dc" href="../../../../os/wlan/package_definition_3.0.xml"/>
-      <package id="cellularsrv" level="services" tech-domain="vc" href="../../../../os/cellularsrv/package_definition_3.0.xml"/>
-      <package id="bt" level="services" tech-domain="de" href="../../../../os/bt/package_definition_3.0.xml"/> 
-      <package id="usb" level="services" tech-domain="de" href="../../../../os/usb/package_definition_3.0.xml"/> 
-      <package id="mm" level="services" tech-domain="mm" href="../../../../os/mm/package_definition_3.0.xml"/>
-      <package id="imagingext" level="services" tech-domain="mm" href="../../../../os/imagingext/package_definition_3.0.xml"/>
-      <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition_3.0.xml"/>
-      <package id="textandloc" level="services" tech-domain="ui" href="../../../../os/textandloc/package_definition_3.0.xml"/>
-      <package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition_3.0.xml"/>
-      <package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition_3.0.xml"/>
-      <package id="osrndtools" level="services" tech-domain="to" href="../../../../os/osrndtools/package_definition_3.0.xml"/>
+      <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>
+      <package id="boardsupport" level="hw" tech-domain="hb" href="../../../../os/boardsupport/package_definition.xml"/>
+      <package id="buildtools" level="hw" tech-domain="to" href="../../../../os/buildtools/package_definition.xml"/>
+      <package id="ossrv" level="services" tech-domain="hb" href="../../../../os/ossrv/package_definition.xml"/>
+      <package id="persistentdata" level="services" tech-domain="hb" href="../../../../os/persistentdata/package_definition.xml"/>
+      <package id="devicesrv" level="services" tech-domain="hb" href="../../../../os/devicesrv/package_definition.xml"/>
+      <package id="security" level="services" tech-domain="se" href="../../../../os/security/package_definition.xml"/>
+      <package id="lbs" level="services" tech-domain="lo" href="../../../../os/lbs/package_definition.xml"/>
+      <package id="commsfw" level="services" tech-domain="dc" href="../../../../os/commsfw/package_definition.xml"/>
+      <package id="networkingsrv" level="services" tech-domain="dc" href="../../../../os/networkingsrv/package_definition.xml"/>
+      <package id="wlan" level="services" tech-domain="dc" href="../../../../os/wlan/package_definition.xml"/>
+      <package id="cellularsrv" level="services" tech-domain="vc" href="../../../../os/cellularsrv/package_definition.xml"/>
+      <package id="bt" level="services" tech-domain="de" href="../../../../os/bt/package_definition.xml"/> 
+      <package id="usb" level="services" tech-domain="de" href="../../../../os/usb/package_definition.xml"/> 
+      <package id="mm" level="services" tech-domain="mm" href="../../../../os/mm/package_definition.xml"/>
+      <package id="imagingext" level="services" tech-domain="mm" href="../../../../os/imagingext/package_definition.xml"/>
+      <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition.xml"/>
+      <package id="textandloc" level="services" tech-domain="ui" href="../../../../os/textandloc/package_definition.xml"/>
+      <package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition.xml"/>
+      <package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition.xml"/>
+      <package id="osrndtools" level="services" tech-domain="to" href="../../../../os/osrndtools/package_definition.xml"/>
     </layer>
     <layer id="mw" name="Middleware" levels="generic specific">
-      <package id="appsupport" level="generic" tech-domain="rt" href="../../../../mw/appsupport/package_definition_3.0.xml"/>
-      <package id="securitysrv" level="generic" tech-domain="se" href="../../../../mw/securitysrv/package_definition_3.0.xml"/>
-      <package id="drm" level="generic" tech-domain="se" href="../../../../mw/drm/package_definition_3.0.xml"/>
-      <package id="locationsrv" level="specific" tech-domain="lo" href="../../../../mw/locationsrv/package_definition_3.0.xml"/>
-      <package id="accesssec" level="generic" tech-domain="dc" href="../../../../mw/accesssec/package_definition_3.0.xml"/>
-      <package id="ipconnmgmt" level="generic" tech-domain="dc" href="../../../../mw/ipconnmgmt/package_definition_3.0.xml"/>
-      <package id="netprotocols" level="generic" tech-domain="dc" href="../../../../mw/netprotocols/package_definition_3.0.xml"/>
-      <package id="ipappprotocols" level="generic" tech-domain="dc" href="../../../../mw/ipappprotocols/package_definition_3.0.xml"/>
-      <package id="wirelessacc" level="specific" tech-domain="dc" href="../../../../mw/wirelessacc/package_definition_3.0.xml"/>
-      <package id="vpnclient" level="specific" tech-domain="dc" href="../../../../mw/vpnclient/package_definition_3.0.xml"/>
-      <package id="ipappsrv" level="specific" tech-domain="vc" href="../../../../mw/ipappsrv/package_definition_3.0.xml"/>
-      <package id="phonesrv" level="specific" tech-domain="vc" href="../../../../mw/phonesrv/package_definition_3.0.xml"/>
-      <package id="messagingmw" level="specific" tech-domain="pr" href="../../../../mw/messagingmw/package_definition_3.0.xml"/>
-      <package id="imsrv" level="specific" tech-domain="pr" href="../../../../mw/imsrv/package_definition_3.0.xml"/>
-      <package id="legacypresence" level="specific" tech-domain="pr" href="../../../../mw/legacypresence/package_definition_3.0.xml"/>
-      <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition_3.0.xml"/>
-      <package id="searchsrv" level="specific" tech-domain="pr" href="../../../../mw/searchsrv/package_definition_3.0.xml"/>
-      <package id="remotemgmt" level="specific" tech-domain="dm" href="../../../../mw/remotemgmt/package_definition_3.0.xml"/>
-      <package id="remoteconn" level="generic" tech-domain="de" href="../../../../mw/remoteconn/package_definition_3.0.xml"/>
-      <package id="srvdiscovery" level="generic" tech-domain="de" href="../../../../mw/srvdiscovery/package_definition_3.0.xml"/>
-      <package id="dlnasrv" level="specific" tech-domain="de" href="../../../../mw/dlnasrv/package_definition_3.0.xml"/>
-      <package id="btservices" level="generic" tech-domain="de" href="../../../../mw/btservices/package_definition_3.0.xml"/>
-      <package id="usbservices" level="generic" tech-domain="de" href="../../../../mw/usbservices/package_definition_3.0.xml"/>
-      <package id="shortlinkconn" level="generic" tech-domain="de" href="../../../../mw/shortlinkconn/package_definition_3.0.xml"/>
-      <package id="imghandling" level="specific" tech-domain="mm" href="../../../../mw/imghandling/package_definition_3.0.xml"/>
-      <package id="metadatasrv" level="specific" tech-domain="mm" href="../../../../mw/metadatasrv/package_definition_3.0.xml"/>
-      <package id="mds" level="specific" tech-domain="mm" href="../../../../mw/mds/package_definition_3.0.xml"/>
-      <package id="videoutils" level="specific" tech-domain="mm" href="../../../../mw/videoutils/package_definition_3.0.xml"/>
-      <package id="mmmw" level="generic" tech-domain="mm" href="../../../../mw/mmmw/package_definition_3.0.xml"/>
-      <package id="gstreamer" level="generic" tech-domain="mm" href="../../../../mw/gstreamer/package_definition_3.0.xml"/> 
-      <package id="helix" level="generic" tech-domain="mm" href="../../../../mw/helix/package_definition_3.0.xml"/>
-      <package id="camerasrv" level="specific" tech-domain="mm" href="../../../../mw/camerasrv/package_definition_3.0.xml"/>
-      <package id="mmappfw" level="specific" tech-domain="mm" href="../../../../mw/mmappfw/package_definition_3.0.xml"/>
-      <package id="hgwidgets" level="specific" tech-domain="mm" href="../../../../mw/hgwidgets/package_definition_3.0.xml"/>
-      <package id="inputmethods" level="generic" tech-domain="ui" href="../../../../mw/inputmethods/package_definition_3.0.xml"/>
-      <package id="qt" level="generic" tech-domain="ui" href="../../../../mw/qt/package_definition_3.0.xml"/>
-      <package id="qtextensions" level="generic" tech-domain="ui" href="../../../../mw/qtextensions/package_definition_3.0.xml"/>
-      <package id="hb" level="generic" tech-domain="ui" href="../../../../mw/hb/package_definition_3.0.xml"/>
-      <package id="classicui" level="generic" tech-domain="ui" href="../../../../mw/classicui/package_definition_3.0.xml"/>
-      <package id="svgt" level="generic" tech-domain="ui" href="../../../../mw/svgt/package_definition_3.0.xml"/>
-      <package id="uiaccelerator" level="generic" tech-domain="ui" href="../../../../mw/uiaccelerator/package_definition_3.0.xml"/>
-      <package id="uiresources" level="generic" tech-domain="ui" href="../../../../mw/uiresources/package_definition_3.0.xml"/>
-      <package id="hapticsservices" level="generic" tech-domain="ui" href="../../../../mw/hapticsservices/package_definition_3.0.xml"/>
-      <package id="platformthemes" level="specific" tech-domain="ui" href="../../../../mw/platformthemes/package_definition_3.0.xml"/>
-      <package id="gsprofilesrv" level="generic" tech-domain="ui" href="../../../../mw/gsprofilesrv/package_definition_3.0.xml"/>
-      <package id="homescreensrv" level="specific" tech-domain="ui" href="../../../../mw/homescreensrv/package_definition_3.0.xml"/>
-      <package id="homescreensrvlegacy" level="generic" tech-domain="ui" href="../../../../mw/homescreensrvlegacy/package_definition_3.0.xml"/>
-      <package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition_3.0.xml"/>
-      <package id="serviceapifw" level="specific" tech-domain="rt" href="../../../../mw/serviceapifw/package_definition_3.0.xml"/>
-      <package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition_3.0.xml"/>
-      <package id="browser" level="specific" tech-domain="rt" href="../../../../mw/browser/package_definition_3.0.xml"/>
-      <package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition_3.0.xml"/>
-      <package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition_3.0.xml"/>
-      <package id="webruntime" level="specific" tech-domain="rt" href="../../../../mw/webruntime/package_definition_3.0.xml"/>
-      <package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition_3.0.xml"/>
-      <package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition_3.0.xml"/>
+      <package id="appsupport" level="generic" tech-domain="rt" href="../../../../mw/appsupport/package_definition.xml"/>
+      <package id="securitysrv" level="generic" tech-domain="se" href="../../../../mw/securitysrv/package_definition.xml"/>
+      <package id="drm" level="generic" tech-domain="se" href="../../../../mw/drm/package_definition.xml"/>
+      <package id="locationsrv" level="specific" tech-domain="lo" href="../../../../mw/locationsrv/package_definition.xml"/>
+      <package id="accesssec" level="generic" tech-domain="dc" href="../../../../mw/accesssec/package_definition.xml"/>
+      <package id="ipconnmgmt" level="generic" tech-domain="dc" href="../../../../mw/ipconnmgmt/package_definition.xml"/>
+      <package id="netprotocols" level="generic" tech-domain="dc" href="../../../../mw/netprotocols/package_definition.xml"/>
+      <package id="ipappprotocols" level="generic" tech-domain="dc" href="../../../../mw/ipappprotocols/package_definition.xml"/>
+      <package id="wirelessacc" level="specific" tech-domain="dc" href="../../../../mw/wirelessacc/package_definition.xml"/>
+      <package id="vpnclient" level="specific" tech-domain="dc" href="../../../../mw/vpnclient/package_definition.xml"/>
+      <package id="ipappsrv" level="specific" tech-domain="vc" href="../../../../mw/ipappsrv/package_definition.xml"/>
+      <package id="phonesrv" level="specific" tech-domain="vc" href="../../../../mw/phonesrv/package_definition.xml"/>
+      <package id="messagingmw" level="specific" tech-domain="pr" href="../../../../mw/messagingmw/package_definition.xml"/>
+      <package id="imsrv" level="specific" tech-domain="pr" href="../../../../mw/imsrv/package_definition.xml"/>
+      <package id="legacypresence" level="specific" tech-domain="pr" href="../../../../mw/legacypresence/package_definition.xml"/>
+      <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/>
+      <package id="searchsrv" level="specific" tech-domain="pr" href="../../../../mw/searchsrv/package_definition.xml"/>
+      <package id="remotemgmt" level="specific" tech-domain="dm" href="../../../../mw/remotemgmt/package_definition.xml"/>
+      <package id="remoteconn" level="generic" tech-domain="de" href="../../../../mw/remoteconn/package_definition.xml"/>
+      <package id="srvdiscovery" level="generic" tech-domain="de" href="../../../../mw/srvdiscovery/package_definition.xml"/>
+      <package id="dlnasrv" level="specific" tech-domain="de" href="../../../../mw/dlnasrv/package_definition.xml"/>
+      <package id="btservices" level="generic" tech-domain="de" href="../../../../mw/btservices/package_definition.xml"/>
+      <package id="usbservices" level="generic" tech-domain="de" href="../../../../mw/usbservices/package_definition.xml"/>
+      <package id="shortlinkconn" level="generic" tech-domain="de" href="../../../../mw/shortlinkconn/package_definition.xml"/>
+      <package id="imghandling" level="specific" tech-domain="mm" href="../../../../mw/imghandling/package_definition.xml"/>
+      <package id="metadatasrv" level="specific" tech-domain="mm" href="../../../../mw/metadatasrv/package_definition.xml"/>
+      <package id="mds" level="specific" tech-domain="mm" href="../../../../mw/mds/package_definition.xml"/>
+      <package id="videoutils" level="specific" tech-domain="mm" href="../../../../mw/videoutils/package_definition.xml"/>
+      <package id="mmmw" level="generic" tech-domain="mm" href="../../../../mw/mmmw/package_definition.xml"/>
+      <package id="gstreamer" level="generic" tech-domain="mm" href="../../../../mw/gstreamer/package_definition.xml"/> 
+      <package id="helix" level="generic" tech-domain="mm" href="../../../../mw/helix/package_definition.xml"/>
+      <package id="camerasrv" level="specific" tech-domain="mm" href="../../../../mw/camerasrv/package_definition.xml"/>
+      <package id="mmappfw" level="specific" tech-domain="mm" href="../../../../mw/mmappfw/package_definition.xml"/>
+      <package id="hgwidgets" level="specific" tech-domain="mm" href="../../../../mw/hgwidgets/package_definition.xml"/>
+      <package id="inputmethods" level="generic" tech-domain="ui" href="../../../../mw/inputmethods/package_definition.xml"/>
+      <package id="qt" level="generic" tech-domain="ui" href="../../../../mw/qt/package_definition.xml"/>
+      <package id="qtextensions" level="generic" tech-domain="ui" href="../../../../mw/qtextensions/package_definition.xml"/>
+      <package id="hb" level="generic" tech-domain="ui" href="../../../../mw/hb/package_definition.xml"/>
+      <package id="classicui" level="generic" tech-domain="ui" href="../../../../mw/classicui/package_definition.xml"/>
+      <package id="svgt" level="generic" tech-domain="ui" href="../../../../mw/svgt/package_definition.xml"/>
+      <package id="uiaccelerator" level="generic" tech-domain="ui" href="../../../../mw/uiaccelerator/package_definition.xml"/>
+      <package id="uiresources" level="generic" tech-domain="ui" href="../../../../mw/uiresources/package_definition.xml"/>
+      <package id="hapticsservices" level="generic" tech-domain="ui" href="../../../../mw/hapticsservices/package_definition.xml"/>
+      <package id="platformthemes" level="specific" tech-domain="ui" href="../../../../mw/platformthemes/package_definition.xml"/>
+      <package id="gsprofilesrv" level="generic" tech-domain="ui" href="../../../../mw/gsprofilesrv/package_definition.xml"/>
+      <package id="homescreensrv" level="specific" tech-domain="ui" href="../../../../mw/homescreensrv/package_definition.xml"/>
+      <package id="homescreensrvlegacy" level="generic" tech-domain="ui" href="../../../../mw/homescreensrvlegacy/package_definition.xml"/>
+      <package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition.xml"/>
+      <package id="serviceapifw" level="specific" tech-domain="rt" href="../../../../mw/serviceapifw/package_definition.xml"/>
+      <package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition.xml"/>
+      <package id="browser" level="specific" tech-domain="rt" href="../../../../mw/browser/package_definition.xml"/>
+      <package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition.xml"/>
+      <package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition.xml"/>
+      <package id="webruntime" level="specific" tech-domain="rt" href="../../../../mw/webruntime/package_definition.xml"/>
+      <package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition.xml"/>
+      <package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition.xml"/>
     </layer>
     <layer id="app" name="Applications" levels="services apps">
-      <package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition_3.0.xml"/>  <!-- pending removal -->
-      <package id="phone" level="apps" span="2" tech-domain="vc" href="../../../../app/phone/package_definition_3.0.xml"/>
-      <package id="recents" level="apps" tech-domain="vc" href="../../../../app/recents/package_definition_3.0.xml"/>
-      <package id="settingsuis" level="services" tech-domain="dm" href="../../../../app/settingsuis/package_definition_3.0.xml"/>
-      <package id="contentcontrol" level="services" tech-domain="dm" href="../../../../app/contentcontrol/package_definition_3.0.xml"/>
-      <package id="firsttimeuse" level="apps" tech-domain="dm" href="../../../../app/firsttimeuse/package_definition_3.0.xml"/>
-      <package id="devicecontrol" level="services" tech-domain="dm" href="../../../../app/devicecontrol/package_definition_3.0.xml"/>
+      <package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition.xml"/>  <!-- pending removal -->
+      <package id="phone" level="apps" span="2" tech-domain="vc" href="../../../../app/phone/package_definition.xml"/>
+      <package id="recents" level="apps" tech-domain="vc" href="../../../../app/recents/package_definition.xml"/>
+      <package id="settingsuis" level="services" tech-domain="dm" href="../../../../app/settingsuis/package_definition.xml"/>
+      <package id="contentcontrol" level="services" tech-domain="dm" href="../../../../app/contentcontrol/package_definition.xml"/>
+      <package id="firsttimeuse" level="apps" tech-domain="dm" href="../../../../app/firsttimeuse/package_definition.xml"/>
+      <package id="devicecontrol" level="services" tech-domain="dm" href="../../../../app/devicecontrol/package_definition.xml"/>
       <package id="printing" level="services" tech-domain="de" name="Printing"/>
-      <package id="files" level="apps" tech-domain="pr" href="../../../../app/files/package_definition_3.0.xml"/>
-      <package id="search" level="apps" tech-domain="pr" href="../../../../app/search/package_definition_3.0.xml"/>
-      <package id="contacts" level="apps" span="2" tech-domain="pr" href="../../../../app/contacts/package_definition_3.0.xml"/>
-      <package id="organizer" level="apps" span="2" tech-domain="pr" href="../../../../app/organizer/package_definition_3.0.xml"/>
-      <package id="messaging" level="apps" span="2" tech-domain="pr" href="../../../../app/messaging/package_definition_3.0.xml"/>
-      <package id="commonemail" level="apps" span="2" tech-domain="pr" href="../../../../app/commonemail/package_definition_3.0.xml"/>
-      <package id="camera" level="apps" tech-domain="ma" href="../../../../app/camera/package_definition_3.0.xml"/>
-      <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition_3.0.xml"/>
-      <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition_3.0.xml"/>
-      <package id="videoplayer" level="apps" tech-domain="ma" href="../../../../app/videoplayer/package_definition_3.0.xml"/>
-      <package id="photos" level="apps" tech-domain="ma" href="../../../../app/photos/package_definition_3.0.xml"/>
-      <package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition_3.0.xml"/>
-      <package id="radio" level="apps" tech-domain="ma" href="../../../../app/radio/package_definition_3.0.xml"/>
-      <package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition_3.0.xml"/>
-      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition_3.0.xml"/>
-      <package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition_3.0.xml"/>
-      <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition_3.0.xml"/>
-      <package id="browserui" level="services" tech-domain="rt" href="../../../../app/browserui/package_definition_3.0.xml"/>
-      <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition_3.0.xml"/>
-      <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition_3.0.xml"/>
-      <package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition_3.0.xml"/>
-      <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition_3.0.xml"/>
+      <package id="files" level="apps" tech-domain="pr" href="../../../../app/files/package_definition.xml"/>
+      <package id="search" level="apps" tech-domain="pr" href="../../../../app/search/package_definition.xml"/>
+      <package id="contacts" level="apps" span="2" tech-domain="pr" href="../../../../app/contacts/package_definition.xml"/>
+      <package id="organizer" level="apps" span="2" tech-domain="pr" href="../../../../app/organizer/package_definition.xml"/>
+      <package id="messaging" level="apps" span="2" tech-domain="pr" href="../../../../app/messaging/package_definition.xml"/>
+      <package id="commonemail" level="apps" span="2" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
+      <package id="camera" level="apps" tech-domain="ma" href="../../../../app/camera/package_definition.xml"/>
+      <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/>
+      <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/>
+      <package id="videoplayer" level="apps" tech-domain="ma" href="../../../../app/videoplayer/package_definition.xml"/>
+      <package id="photos" level="apps" tech-domain="ma" href="../../../../app/photos/package_definition.xml"/>
+      <package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition.xml"/>
+      <package id="radio" level="apps" tech-domain="ma" href="../../../../app/radio/package_definition.xml"/>
+      <package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition.xml"/>
+      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition.xml"/>
+      <package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition.xml"/>
+      <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition.xml"/>
+      <package id="browserui" level="services" tech-domain="rt" href="../../../../app/browserui/package_definition.xml"/>
+      <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition.xml"/>
+      <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition.xml"/>
+      <package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition.xml"/>
+      <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition.xml"/>
     </layer>
   </systemModel>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/deviceplatformrelease/package_definition.xml
--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,133 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-        <collection name="s60extras" long-name="S60 Extras" level="mid">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/S60Extras/group"/>
-          </component>
-        </collection>
-        <collection name="version" long-name="Version" level="top">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/Version/group"/>
-          </component>
-        </collection>
-        <collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-            <unit bldFile="/sf/os/deviceplatformrelease/helps_loc2/group"/>
-          </component>
-        </collection>
-        <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-          <component name="cedarutils" long-name="Cedar Utils" purpose="development">
-            <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-          </component>
-          <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-            <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-          </component>
-        </collection>
-        <collection name="foundation_system" long-name="Foundation System" level="top">
-          <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-          </component>
-          <component name="sf_config" long-name="Foundation Config" introduced="^4">
-            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
-          </component>
-          <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
-          <component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-            <!-- will should give the id/path something more unique than cenrep -->
-            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
-          </component>
-          <component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
-          </component>
-          <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
-          </component>
-        </collection>
-        <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-          <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="deviceplatformrelease" name="Device Platform Release" levels="bld mid top">
+    <collection id="s60extras" name="S60 Extras" level="mid">
+    	<!-- collection is really a component. Need to move down a directory -->
+      <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
+        <unit bldFile="S60Extras/group"/>
+      </component>
+    </collection>
+    <collection id="version" name="Version" level="top">
+    	<!-- collection is really a component. Need to move down a directory -->    
+      <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
+        <unit bldFile="Version/group"/>
+      </component>
+    </collection>
+    
+   <collection id="helps_loc2" name="Helps Locale 2" level="top">
+    	<!-- collection is really a component. Need to move down a directory -->    
+      <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
+        <unit bldFile="helps_loc2/group"/>
+      </component>
+     </collection>
+    
+    <collection id="symbianosbld" name="Symbian OS Build" level="bld">
+      <component id="cedarutils" name="Cedar Utils" purpose="development">
+        <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+      </component>
+      <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+        <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+      </component>
+    </collection>
+    <collection id="foundation_system" name="Foundation System" level="top">
+      <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="foundation_system/system_model/system_model.mrp"/>
+      </component>
+      <component id="sf_config" name="Foundation Config" introduced="^4">
+        <unit bldFile="foundation_system/sf_config/CI_external/group"/>
+      </component>
+      <component id="config" filter="s60" name="Config" class="config" purpose="development">
+        <unit base="foundation_system/sf_config/config"/>
+      </component>
+      <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+		<!-- will should give the id/path something more unique than cenrep -->
+        <unit bldFile="foundation_system/sf_config/cenrep/group"/>
+      </component>
+      <component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
+        <unit bldFile="foundation_system/sf_config/rombuild/syborg/group"/>
+      </component>
+      <component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
+        <unit bldFile="foundation_system/sf_config/rombuild/zoom2/group"/>
+      </component>
+    </collection>
+    <collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+      <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="deviceplatformrelease" name="Device Platform Release" levels="bld mid top">
-    <collection id="s60extras" name="S60 Extras" level="mid">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
-        <unit bldFile="S60Extras/group"/>
-      </component>
-    </collection>
-    <collection id="version" name="Version" level="top">
-    	<!-- collection is really a component. Need to move down a directory -->    
-      <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
-        <unit bldFile="Version/group"/>
-      </component>
-    </collection>
-    
-   <collection id="helps_loc2" name="Helps Locale 2" level="top">
-    	<!-- collection is really a component. Need to move down a directory -->    
-      <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
-        <unit bldFile="helps_loc2/group"/>
-      </component>
-     </collection>
-    
-    <collection id="symbianosbld" name="Symbian OS Build" level="bld">
-      <component id="cedarutils" name="Cedar Utils" purpose="development">
-        <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-      </component>
-      <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-        <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-      </component>
-    </collection>
-    <collection id="foundation_system" name="Foundation System" level="top">
-      <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="foundation_system/system_model/system_model.mrp"/>
-      </component>
-      <component id="sf_config" name="Foundation Config" introduced="^4">
-        <unit bldFile="foundation_system/sf_config/CI_external/group"/>
-      </component>
-      <component id="config" filter="s60" name="Config" class="config" purpose="development">
-        <unit base="foundation_system/sf_config/config"/>
-      </component>
-      <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
-		<!-- will should give the id/path something more unique than cenrep -->
-        <unit bldFile="foundation_system/sf_config/cenrep/group"/>
-      </component>
-      <component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
-        <unit bldFile="foundation_system/sf_config/rombuild/syborg/group"/>
-      </component>
-      <component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
-        <unit bldFile="foundation_system/sf_config/rombuild/zoom2/group"/>
-      </component>
-    </collection>
-    <collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
-      <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,458 +1,459 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-          <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-          </component>
-          <component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-          </component>
-          <component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-          </component>
-          <component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-          </component>
-          <component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-          </component>
-          <component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-          </component>
-          <component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/version_info_api/group"/>
-          </component>
-          <component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-          </component>
-          <component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/haptics_api/group"/>
-          </component>
-          <component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-          </component>
-        </collection>
-        <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-          <component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-          </component>
-          <component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-          </component>
-          <component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-          </component>
-          <component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-          </component>
-          <component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-          </component>
-          <component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-          </component>
-          <component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-          </component>
-          <component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-          </component>
-          <component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-          </component>
-          <component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-          </component>
-          <component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_api/group"/>
-          </component>
-          <component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-          </component>
-          <component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-          </component>
-          <component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-          </component>
-          <component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-          </component>
-          <component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-          </component>
-          <component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-          </component>
-          <component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-          </component>
-          <component name="sae_api" long-name="SAE API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/sae_api/group"/>
-          </component>
-          <component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-          </component>
-          <component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-          </component>
-          <component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-          </component>
-          <component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-          </component>
-          <component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-          </component>
-          <component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-          </component>
-          <component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-          </component>
-          <component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-          </component>
-          <component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-          </component>
-          <component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-          </component>
-          <component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-          </component>
-          <component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-          </component>
-          <component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-          </component>
-          <component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-          </component>
-          <component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-          </component>
-          <component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-          </component>
-          <component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-          </component>
-          <component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-          </component>
-          <component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/powersave_api/group"/>
-          </component>
-          <component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-          </component>
-          <component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-          </component>
-          <component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-          </component>
-          <component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-          </component>
-          <component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-          </component>
-          <component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-          </component>
-          <component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-          </component>
-          <component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-          </component>
-          <component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-          </component>
-          <component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-          </component>
-          <component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-          </component>
-          <component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
-          </component>
-          <component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
-          </component>
-        </collection>
-        <collection name="accessoryservices" long-name="Accessory Services" level="framework">
-          <component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
-          </component>
-          <component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-          </component>
-          <component name="accessoryserver" filter="s60" long-name="Accessory Server">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
-          </component>
-          <component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-          </component>
-          <component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-          </component>
-          <component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
-          </component>
-          <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-          </component>
-          <component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-            <unit bldFile="/sf/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-          </component>
-        </collection>
-        <collection name="commonservices" long-name="Common Services" level="app-if">
-          <component name="commonengine" filter="s60" long-name="Common Engine">
-            <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
-          </component>
-          <component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-            <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
-          </component>
-          <component name="platformenv" filter="s60" long-name="Platform Environment">
-            <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
-          </component>
-          <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-            <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-          </component>
-          <component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-            <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-          </component>
-        </collection>
-        <collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-          <component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
-          </component>
-          <component name="dosserver" filter="s60" long-name="Domestic OS Server">
-            <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
-          </component>
-        </collection>
-        <collection name="sensorservices" long-name="Sensor Services" level="framework">
-          <component name="sensorserver" filter="s60" long-name="Sensor Server">
-            <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
-          </component>
-          <component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
-          </component>
-          <component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-          </component>
-          <component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-            <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
-          </component>
-        </collection>
-        <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-          <component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-          </component>
-          <component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-          </component>
-          <component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-          </component>
-          <component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-          </component>
-          <component name="hapticsserver" filter="s60" long-name="Haptics Server">
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-          </component>
-          <component name="hapticsclient" filter="s60" long-name="Haptics Client">
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-          </component>
-          <component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-            <!-- move these exports into the appropriate above components and delete this component-->
-            <unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
-          </component>
-        </collection>
-        <collection name="mediator" long-name="Mediator" level="app-if">
-          <!--collection is really a component. Move it down a directory -->
-          <component name="mediator_build" filter="s60" long-name="Mediator Build">
-            <unit bldFile="/sf/os/devicesrv/mediator/group"/>
-          </component>
-        </collection>
-        <collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-          <component name="psmserver" filter="s60" long-name="PSM Server">
-            <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
-          </component>
-        </collection>
-        <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-          <component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-          </component>
-          <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<SystemDefinition schema="3.0.0">
+ <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
+   <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
+    <meta rel="Api" href="devicesrv_pub/platform_path_definitions_api/platform_path_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/platform_path_definitions_api/group"/>
+   </component>
+   <component id="common_platform_security_definitions_api" name="Common Platform Security Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/common_platform_security_definitions_api/common_platform_security_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/common_platform_security_definitions_api/group"/>
+   </component>
+   <component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/feature_discovery_api/feature_discovery_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/feature_discovery_api/group"/>
+   </component>
+   <component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/platform_environment_api/platform_environment_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/platform_environment_api/group"/>
+   </component>
+   <component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/sensor_channel_api/sensor_channel_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/sensor_channel_api/group"/>
+   </component>
+   <component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/sensor_definitions_api/sensor_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/sensor_definitions_api/group"/>
+   </component>
+   <component id="version_info_api" name="Version Info API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/version_info_api/version_info_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/version_info_api/group"/>
+   </component>
+   <component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/accessory_monitoring_api/accessory_monitoring_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/accessory_monitoring_api/group"/>
+   </component>
+   <component id="haptics_api" name="Haptics API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/haptics_api/haptics_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/haptics_api/group"/>
+   </component>
+   <component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/sensor_data_compensator_api/sensor_data_compensator_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/sensor_data_compensator_api/group"/>
+   </component>
+  </collection>
+  <collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
+   <component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/configuration_file_parser_api/configuration_file_parser_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/configuration_file_parser_api/group"/>
+   </component>
+   <component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/dos_extension_plugin_api/dos_extension_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/dos_extension_plugin_api/group"/>
+   </component>
+   <component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_command_initiator_api/mediator_command_initiator_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_command_initiator_api/group"/>
+   </component>
+   <component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/syslangutil_api/syslangutil_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/syslangutil_api/group"/>
+   </component>
+   <component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/wakeup_alarm_api/wakeup_alarm_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/wakeup_alarm_api/group"/>
+   </component>
+   <component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/disk_and_memory_level_keys_api/disk_and_memory_level_keys_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+   </component>
+   <component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_plugin_api/mediator_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_plugin_api/group"/>
+   </component>
+   <component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/headset_status_api/headset_status_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/headset_status_api/group"/>
+   </component>
+   <component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/system_startup_extension_plugin_api/system_startup_extension_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/system_startup_extension_plugin_api/group"/>
+   </component>
+   <component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sensor_plugin_api/sensor_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_plugin_api/group"/>
+   </component>
+   <component id="accessory_api" name="Accessory API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_api/accessory_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_api/group"/>
+   </component>
+   <component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/display_language_definition_api/display_language_definition_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/display_language_definition_api/group"/>
+   </component>
+   <component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_command_responder_api/mediator_command_responder_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_command_responder_api/group"/>
+   </component>
+   <component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_policy_definitions_api/accessory_policy_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_policy_definitions_api/group"/>
+   </component>
+   <component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/hw_settings_api/hw_settings_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/hw_settings_api/group"/>
+   </component>
+   <component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_domain_definitions_api/mediator_domain_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_domain_definitions_api/group"/>
+   </component>
+   <component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sensor_extension_api/sensor_extension_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_extension_api/group"/>
+   </component>
+   <component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_plugin_api/accessory_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_plugin_api/group"/>
+   </component>
+   <component id="sae_api" name="SAE API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sae_api/sae_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sae_api/group"/>
+   </component>
+   <component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_control_api/accessory_control_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_control_api/group"/>
+   </component>
+   <component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_static_registration_api/mediator_static_registration_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_static_registration_api/group"/>
+   </component>
+   <component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_key_event_handling_api/accessory_key_event_handling_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_key_event_handling_api/group"/>
+   </component>
+   <component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_notification_api/mediator_notification_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_notification_api/group"/>
+   </component>
+   <component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_policy_utility_api/accessory_policy_utility_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_policy_utility_api/group"/>
+   </component>
+   <component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/common_dsy_plugin_api/common_dsy_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/common_dsy_plugin_api/group"/>
+   </component>
+   <component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/remote_control_extension_api/remote_control_extension_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/remote_control_extension_api/group"/>
+   </component>
+   <component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sensor_channel_filter_api/sensor_channel_filter_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_channel_filter_api/group"/>
+   </component>
+   <component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/dos_extension_api/dos_extension_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/dos_extension_api/group"/>
+   </component>
+   <component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_audio_control_api/accessory_audio_control_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_audio_control_api/group"/>
+   </component>
+   <component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_event_consumer_api/mediator_event_consumer_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_event_consumer_api/group"/>
+   </component>
+   <component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/shared_data_api/shared_data_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/shared_data_api/group"/>
+   </component>
+   <component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_settings_api/accessory_settings_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_settings_api/group"/>
+   </component>
+   <component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_bluetooth_control_api/accessory_bluetooth_control_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_bluetooth_control_api/group"/>
+   </component>
+   <component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/extended_version_info_api/extended_version_info_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/extended_version_info_api/group"/>
+   </component>
+   <component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/mediator_event_provider_api/mediator_event_provider_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_event_provider_api/group"/>
+   </component>
+   <component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/tv_out_config_api/tv_out_config_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tv_out_config_api/group"/>
+   </component>
+   <component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/tspclientmapper_api/tspclientmapper_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tspclientmapper_api/group"/>
+   </component>
+   <component id="powersave_api" name="Power Save API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/powersave_api/powersave_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/powersave_api/group"/>
+   </component>
+   <component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/powersave_definitions_api/powersave_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/powersave_definitions_api/group"/>
+   </component>
+   <component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/powersave_plugin_api/powersave_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/powersave_plugin_api/group"/>
+   </component>
+   <component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/extended_version_info_plugin_api/extended_version_info_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/extended_version_info_plugin_api/group"/>
+   </component>
+   <component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/haptics_plugin_api/haptics_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/haptics_plugin_api/group"/>
+   </component>
+   <component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/haptics_effect_data_getter_plugin_api/haptics_effect_data_getter_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+   </component>
+   <component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/haptics_packetizer_plugin_api/haptics_packetizer_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+   </component>
+   <component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/tiltcompensation_api/tilt_compensation_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tiltcompensation_api/group"/>
+   </component>
+   <component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/disk_notification_handler_api/disk_notification_handler_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/disk_notification_handler_api/group"/>
+   </component>
+   <component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_policy_usb_audio_api/accessory_policy_usb_audio_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+   </component>
+   <component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_policy_hdmi_audio_api/accessory_policy_hdmi_audio_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+   </component>
+   <component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sensor_data_compensator_plugin_api/sensor_data_compensator_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+   </component>
+   <component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/ddc_access_api/ddc_access_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/ddc_access_api/group"/>
+   </component>
+   <component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/tv_out_behaviour_api/tv_out_behaviour_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tv_out_behaviour_api/group"/>
+   </component>
+  </collection>
+  <collection id="accessoryservices" name="Accessory Services" level="framework">
+   <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+    <unit bldFile="accessoryservices/accessorymonitor/group"/>
+   </component>
+   <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+    <unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
+   </component>
+   <component id="accessoryserver" filter="s60" name="Accessory Server">
+    <unit bldFile="accessoryservices/accessoryserver/group"/>
+   </component>
+   <component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+    <unit bldFile="accessoryservices/pluggeddisplay/group"/>
+   </component>
+   <component id="headsetstatusapi" filter="s60" name="Headset Status API">
+    <unit bldFile="accessoryservices/headsetstatusapi/group"/>
+   </component>
+   <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+    <unit bldFile="accessoryservices/tspclientmapper/group"/>
+   </component>
+   <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+    <unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+   </component>
+   <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+    <unit bldFile="accessoryservices/gid_pc_tool/group"/>
+   </component>
+  </collection>
+  <collection id="commonservices" name="Common Services" level="app-if">
+   <component id="commonengine" filter="s60" name="Common Engine">
+    <unit bldFile="commonservices/commonengine/group"/>
+   </component>
+   <component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+    <unit bldFile="commonservices/commonengineresources/group"/>
+   </component>
+   <component id="platformenv" filter="s60" name="Platform Environment">
+    <unit bldFile="commonservices/platformenv/group"/>
+   </component>
+   <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+    <meta rel="config"> 
+      <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+    </meta>
+    <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
+   </component>
+   <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+    <meta rel="config"> 
+      <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+    </meta>
+    <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
+   </component>
+  </collection>
+  <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+   <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+    <unit bldFile="dosservices/commondsy/group"/>
+   </component>
+   <component id="dosserver" filter="s60" name="Domestic OS Server">
+    <unit bldFile="dosservices/dosserver/group"/>
+   </component>
+  </collection>
+  <collection id="sensorservices" name="Sensor Services" level="framework">
+   <component id="sensorserver" filter="s60" name="Sensor Server">
+    <unit bldFile="sensorservices/sensorserver/group"/>
+   </component>
+   <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+    <unit bldFile="sensorservices/orientationssy/group"/>
+   </component>
+   <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+    <unit bldFile="sensorservices/tiltcompensationssy/group"/>
+   </component>
+   <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+    <unit bldFile="sensorservices/sensordatacompensator/group"/>
+   </component>
+  </collection>
+  <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+   <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+    <unit bldFile="hwrmhaptics/hapticseffectdatagetterfw/group"/>
+   </component>
+   <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+    <unit bldFile="hwrmhaptics/hapticspluginservice/group"/>
+   </component>
+   <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+    <unit bldFile="hwrmhaptics/hapticspacketizer/group"/>
+   </component>
+   <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+    <unit bldFile="hwrmhaptics/hapticspluginmanager/group"/>
+   </component>
+   <component id="hapticsserver" filter="s60" name="Haptics Server">
+    <unit bldFile="hwrmhaptics/hapticsserver/group"/>
+   </component>
+   <component id="hapticsclient" filter="s60" name="Haptics Client">
+    <unit bldFile="hwrmhaptics/hapticsclient/group"/>
+   </component>
+   <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+    <!-- move these exports into the appropriate above components and delete this component-->
+    <unit bldFile="hwrmhaptics/group"/>
+   </component>
+  </collection>
+  <collection id="mediator" name="Mediator" level="app-if">
+   <!--collection is really a component. Move it down a directory -->
+   <component id="mediator_build" filter="s60" name="Mediator Build">
+    <unit bldFile="mediator/group"/>
+   </component>
+  </collection>
+  <collection id="psmservices" name="Power Save Mode Services" level="app-if">
+   <component id="psmserver" filter="s60" name="PSM Server">
+    <unit bldFile="psmservices/psmserver/group"/>
+   </component>
+  </collection>
+  <collection id="resourcemgmt" name="Resource Management" level="hw-if">
+   <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+    <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+   </component>
+   <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+    <meta rel="config">
+     <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
-            <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-          </component>
-          <component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-            <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
-          </component>
-          <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-          </component>
-          <component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-            <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-          </component>
-          <component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-            <!-- Move exports to a self-contained component.
+    <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+   </component>
+   <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+    <unit bldFile="resourcemgmt/vibractrl/group"/>
+   </component>
+   <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+    <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+   </component>
+   <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+    <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+   </component>
+   <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+    <!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
-            <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
-          </component>
-          <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-            <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-          </component>
-        </collection>
-        <collection name="sysstatemgmt" long-name="System State Management" level="server">
-          <component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-          </component>
-          <component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-          </component>
-          <component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-          </component>
-          <component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-          </component>
-          <component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-          </component>
-          <component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/syslangutil/group"/>
-          </component>
-          <component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysrestart/group"/>
-          </component>
-          <component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-          </component>
-          <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-          </component>
-          <component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-          </component>
-          <component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-          </component>
-          <component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-          </component>
-        </collection>
-        <collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-          <component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-          </component>
-        </collection>
-        <collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-          <component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-          </component>
-        </collection>
-        <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-          <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group"/>
-          </component>
-          <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group"/>
-          </component>
-        </collection>
-        <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-          <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="resourcemgmt/group"/>
+   </component>
+   <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+    <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+   </component>
+  </collection>
+  <collection id="sysstatemgmt" name="System State Management" level="server">
+   <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmmapperutility/group"/>
+   </component>
+   <component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmpolicyplugins/group"/>
+   </component>
+   <component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmutilityplugins/group"/>
+   </component>
+   <component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmcmdlists/group"/>
+   </component>
+   <component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmcustcmds/group"/>
+   </component>
+   <component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+    <unit bldFile="sysstatemgmt/syslangutil/group"/>
+   </component>
+   <component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+    <unit bldFile="sysstatemgmt/sysrestart/group"/>
+   </component>
+   <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+    <unit bldFile="sysstatemgmt/sysuiprovider/group"/>
+   </component>
+   <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+    <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+   </component>
+   <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+    <meta rel="config"> 
+      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+    </meta>
+    <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+   </component>
+   <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+    <meta rel="config">
+      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+    </meta>
+    <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+   </component>
+    <meta rel="config">
+      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+    </meta>
+   <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+   </component>
+  </collection>
+  <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+   <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+    <unit bldFile="resourceinterfaces/fmtransmittercontrol/group" mrp="resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+   </component>
+  </collection>
+  <collection id="systemhealthmanagement" name="System Health Management" level="server">
+   <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+    <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+   </component>
+  </collection>
+  <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+   <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="devicesrvapitest/accessorieshaitest/group"/>
+   </component>
+   <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="devicesrvapitest/hwrmhaitest/group"/>
+   </component>
+  </collection>
+  <collection id="devicesrv_info" name="Device Services Info" level="app-if">
+   <component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/devicesrv/package_definition_3.0.xml
--- a/symbian4/os/devicesrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-  <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
-   <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
-    <meta rel="Api" href="devicesrv_pub/platform_path_definitions_api/platform_path_definitions_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/platform_path_definitions_api/group"/>
-   </component>
-   <component id="common_platform_security_definitions_api" name="Common Platform Security Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/common_platform_security_definitions_api/common_platform_security_definitions_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/common_platform_security_definitions_api/group"/>
-   </component>
-   <component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/feature_discovery_api/feature_discovery_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/feature_discovery_api/group"/>
-   </component>
-   <component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/platform_environment_api/platform_environment_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/platform_environment_api/group"/>
-   </component>
-   <component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/sensor_channel_api/sensor_channel_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/sensor_channel_api/group"/>
-   </component>
-   <component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/sensor_definitions_api/sensor_definitions_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/sensor_definitions_api/group"/>
-   </component>
-   <component id="version_info_api" name="Version Info API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/version_info_api/version_info_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/version_info_api/group"/>
-   </component>
-   <component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/accessory_monitoring_api/accessory_monitoring_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/accessory_monitoring_api/group"/>
-   </component>
-   <component id="haptics_api" name="Haptics API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/haptics_api/haptics_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/haptics_api/group"/>
-   </component>
-   <component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_pub/sensor_data_compensator_api/sensor_data_compensator_api.metaxml"/>
-    <unit bldFile="devicesrv_pub/sensor_data_compensator_api/group"/>
-   </component>
-  </collection>
-  <collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
-   <component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/configuration_file_parser_api/configuration_file_parser_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/configuration_file_parser_api/group"/>
-   </component>
-   <component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/dos_extension_plugin_api/dos_extension_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/dos_extension_plugin_api/group"/>
-   </component>
-   <component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_command_initiator_api/mediator_command_initiator_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_command_initiator_api/group"/>
-   </component>
-   <component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/syslangutil_api/syslangutil_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/syslangutil_api/group"/>
-   </component>
-   <component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/wakeup_alarm_api/wakeup_alarm_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/wakeup_alarm_api/group"/>
-   </component>
-   <component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/disk_and_memory_level_keys_api/disk_and_memory_level_keys_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-   </component>
-   <component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_plugin_api/mediator_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_plugin_api/group"/>
-   </component>
-   <component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/headset_status_api/headset_status_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/headset_status_api/group"/>
-   </component>
-   <component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/system_startup_extension_plugin_api/system_startup_extension_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/system_startup_extension_plugin_api/group"/>
-   </component>
-   <component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/sensor_plugin_api/sensor_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/sensor_plugin_api/group"/>
-   </component>
-   <component id="accessory_api" name="Accessory API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_api/accessory_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_api/group"/>
-   </component>
-   <component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/display_language_definition_api/display_language_definition_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/display_language_definition_api/group"/>
-   </component>
-   <component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_command_responder_api/mediator_command_responder_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_command_responder_api/group"/>
-   </component>
-   <component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_policy_definitions_api/accessory_policy_definitions_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_policy_definitions_api/group"/>
-   </component>
-   <component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/hw_settings_api/hw_settings_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/hw_settings_api/group"/>
-   </component>
-   <component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_domain_definitions_api/mediator_domain_definitions_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_domain_definitions_api/group"/>
-   </component>
-   <component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/sensor_extension_api/sensor_extension_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/sensor_extension_api/group"/>
-   </component>
-   <component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_plugin_api/accessory_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_plugin_api/group"/>
-   </component>
-   <component id="sae_api" name="SAE API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/sae_api/sae_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/sae_api/group"/>
-   </component>
-   <component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_control_api/accessory_control_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_control_api/group"/>
-   </component>
-   <component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_static_registration_api/mediator_static_registration_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_static_registration_api/group"/>
-   </component>
-   <component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_key_event_handling_api/accessory_key_event_handling_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_key_event_handling_api/group"/>
-   </component>
-   <component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_notification_api/mediator_notification_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_notification_api/group"/>
-   </component>
-   <component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_policy_utility_api/accessory_policy_utility_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_policy_utility_api/group"/>
-   </component>
-   <component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/common_dsy_plugin_api/common_dsy_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/common_dsy_plugin_api/group"/>
-   </component>
-   <component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/remote_control_extension_api/remote_control_extension_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/remote_control_extension_api/group"/>
-   </component>
-   <component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/sensor_channel_filter_api/sensor_channel_filter_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/sensor_channel_filter_api/group"/>
-   </component>
-   <component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/dos_extension_api/dos_extension_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/dos_extension_api/group"/>
-   </component>
-   <component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_audio_control_api/accessory_audio_control_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_audio_control_api/group"/>
-   </component>
-   <component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_event_consumer_api/mediator_event_consumer_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_event_consumer_api/group"/>
-   </component>
-   <component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/shared_data_api/shared_data_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/shared_data_api/group"/>
-   </component>
-   <component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_settings_api/accessory_settings_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_settings_api/group"/>
-   </component>
-   <component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_bluetooth_control_api/accessory_bluetooth_control_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_bluetooth_control_api/group"/>
-   </component>
-   <component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/extended_version_info_api/extended_version_info_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/extended_version_info_api/group"/>
-   </component>
-   <component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/mediator_event_provider_api/mediator_event_provider_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/mediator_event_provider_api/group"/>
-   </component>
-   <component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/tv_out_config_api/tv_out_config_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/tv_out_config_api/group"/>
-   </component>
-   <component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/tspclientmapper_api/tspclientmapper_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/tspclientmapper_api/group"/>
-   </component>
-   <component id="powersave_api" name="Power Save API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/powersave_api/powersave_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/powersave_api/group"/>
-   </component>
-   <component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/powersave_definitions_api/powersave_definitions_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/powersave_definitions_api/group"/>
-   </component>
-   <component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/powersave_plugin_api/powersave_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/powersave_plugin_api/group"/>
-   </component>
-   <component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/extended_version_info_plugin_api/extended_version_info_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/extended_version_info_plugin_api/group"/>
-   </component>
-   <component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/haptics_plugin_api/haptics_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/haptics_plugin_api/group"/>
-   </component>
-   <component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/haptics_effect_data_getter_plugin_api/haptics_effect_data_getter_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-   </component>
-   <component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/haptics_packetizer_plugin_api/haptics_packetizer_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-   </component>
-   <component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/tiltcompensation_api/tilt_compensation_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/tiltcompensation_api/group"/>
-   </component>
-   <component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/disk_notification_handler_api/disk_notification_handler_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/disk_notification_handler_api/group"/>
-   </component>
-   <component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_policy_usb_audio_api/accessory_policy_usb_audio_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_policy_usb_audio_api/group"/>
-   </component>
-   <component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/accessory_policy_hdmi_audio_api/accessory_policy_hdmi_audio_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
-   </component>
-   <component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/sensor_data_compensator_plugin_api/sensor_data_compensator_plugin_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-   </component>
-   <component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/ddc_access_api/ddc_access_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/ddc_access_api/group"/>
-   </component>
-   <component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
-    <meta rel="Api" href="devicesrv_plat/tv_out_behaviour_api/tv_out_behaviour_api.metaxml"/>
-    <unit bldFile="devicesrv_plat/tv_out_behaviour_api/group"/>
-   </component>
-  </collection>
-  <collection id="accessoryservices" name="Accessory Services" level="framework">
-   <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
-    <unit bldFile="accessoryservices/accessorymonitor/group"/>
-   </component>
-   <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
-    <unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
-   </component>
-   <component id="accessoryserver" filter="s60" name="Accessory Server">
-    <unit bldFile="accessoryservices/accessoryserver/group"/>
-   </component>
-   <component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
-    <unit bldFile="accessoryservices/pluggeddisplay/group"/>
-   </component>
-   <component id="headsetstatusapi" filter="s60" name="Headset Status API">
-    <unit bldFile="accessoryservices/headsetstatusapi/group"/>
-   </component>
-   <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
-    <unit bldFile="accessoryservices/tspclientmapper/group"/>
-   </component>
-   <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
-    <unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-   </component>
-   <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
-    <unit bldFile="accessoryservices/gid_pc_tool/group"/>
-   </component>
-  </collection>
-  <collection id="commonservices" name="Common Services" level="app-if">
-   <component id="commonengine" filter="s60" name="Common Engine">
-    <unit bldFile="commonservices/commonengine/group"/>
-   </component>
-   <component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
-    <unit bldFile="commonservices/commonengineresources/group"/>
-   </component>
-   <component id="platformenv" filter="s60" name="Platform Environment">
-    <unit bldFile="commonservices/platformenv/group"/>
-   </component>
-   <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
-    <meta rel="config"> 
-      <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
-    </meta>
-    <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
-   </component>
-   <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
-    <meta rel="config"> 
-      <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
-    </meta>
-    <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
-   </component>
-  </collection>
-  <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
-   <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
-    <unit bldFile="dosservices/commondsy/group"/>
-   </component>
-   <component id="dosserver" filter="s60" name="Domestic OS Server">
-    <unit bldFile="dosservices/dosserver/group"/>
-   </component>
-  </collection>
-  <collection id="sensorservices" name="Sensor Services" level="framework">
-   <component id="sensorserver" filter="s60" name="Sensor Server">
-    <unit bldFile="sensorservices/sensorserver/group"/>
-   </component>
-   <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
-    <unit bldFile="sensorservices/orientationssy/group"/>
-   </component>
-   <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
-    <unit bldFile="sensorservices/tiltcompensationssy/group"/>
-   </component>
-   <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
-    <unit bldFile="sensorservices/sensordatacompensator/group"/>
-   </component>
-  </collection>
-  <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
-   <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
-    <unit bldFile="hwrmhaptics/hapticseffectdatagetterfw/group"/>
-   </component>
-   <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
-    <unit bldFile="hwrmhaptics/hapticspluginservice/group"/>
-   </component>
-   <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
-    <unit bldFile="hwrmhaptics/hapticspacketizer/group"/>
-   </component>
-   <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
-    <unit bldFile="hwrmhaptics/hapticspluginmanager/group"/>
-   </component>
-   <component id="hapticsserver" filter="s60" name="Haptics Server">
-    <unit bldFile="hwrmhaptics/hapticsserver/group"/>
-   </component>
-   <component id="hapticsclient" filter="s60" name="Haptics Client">
-    <unit bldFile="hwrmhaptics/hapticsclient/group"/>
-   </component>
-   <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
-    <!-- move these exports into the appropriate above components and delete this component-->
-    <unit bldFile="hwrmhaptics/group"/>
-   </component>
-  </collection>
-  <collection id="mediator" name="Mediator" level="app-if">
-   <!--collection is really a component. Move it down a directory -->
-   <component id="mediator_build" filter="s60" name="Mediator Build">
-    <unit bldFile="mediator/group"/>
-   </component>
-  </collection>
-  <collection id="psmservices" name="Power Save Mode Services" level="app-if">
-   <component id="psmserver" filter="s60" name="PSM Server">
-    <unit bldFile="psmservices/psmserver/group"/>
-   </component>
-  </collection>
-  <collection id="resourcemgmt" name="Resource Management" level="hw-if">
-   <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
-    <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-   </component>
-   <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
-    <meta rel="config">
-     <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
-    </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
-      		may need to  -->
-    <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-   </component>
-   <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
-    <unit bldFile="resourcemgmt/vibractrl/group"/>
-   </component>
-   <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
-    <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-   </component>
-   <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-    <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-   </component>
-   <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-    <!-- Move exports to a self-contained component.
-         	This needs to be kept around until configuration is in place -->
-    <unit bldFile="resourcemgmt/group"/>
-   </component>
-   <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-    <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-   </component>
-  </collection>
-  <collection id="sysstatemgmt" name="System State Management" level="server">
-   <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
-    <unit bldFile="sysstatemgmt/ssmmapperutility/group"/>
-   </component>
-   <component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
-    <unit bldFile="sysstatemgmt/ssmpolicyplugins/group"/>
-   </component>
-   <component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
-    <unit bldFile="sysstatemgmt/ssmutilityplugins/group"/>
-   </component>
-   <component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
-    <unit bldFile="sysstatemgmt/ssmcmdlists/group"/>
-   </component>
-   <component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
-    <unit bldFile="sysstatemgmt/ssmcustcmds/group"/>
-   </component>
-   <component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
-    <unit bldFile="sysstatemgmt/syslangutil/group"/>
-   </component>
-   <component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
-    <unit bldFile="sysstatemgmt/sysrestart/group"/>
-   </component>
-   <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
-    <unit bldFile="sysstatemgmt/sysuiprovider/group"/>
-   </component>
-   <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-    <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-   </component>
-   <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
-    <meta rel="config"> 
-      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
-    </meta>
-    <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-   </component>
-   <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
-    <meta rel="config">
-      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
-    </meta>
-    <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-   </component>
-    <meta rel="config">
-      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
-    </meta>
-   <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-   </component>
-  </collection>
-  <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
-   <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
-    <unit bldFile="resourceinterfaces/fmtransmittercontrol/group" mrp="resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-   </component>
-  </collection>
-  <collection id="systemhealthmanagement" name="System Health Management" level="server">
-   <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
-    <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-   </component>
-  </collection>
-  <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
-   <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="devicesrvapitest/accessorieshaitest/group"/>
-   </component>
-   <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="devicesrvapitest/hwrmhaitest/group"/>
-   </component>
-  </collection>
-  <collection id="devicesrv_info" name="Device Services Info" level="app-if">
-   <component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/graphics/package_definition.xml
--- a/symbian4/os/graphics/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,244 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-        <collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-          <component name="vgi" filter="s60" long-name="VGI">
-            <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
-          </component>
-        </collection>
-        <collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
-          <component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
-            <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
-          </component>
-        </collection>
-        <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-          <component name="graphicsresource" long-name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
-          </component>
-          <component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
-          </component>
-          <component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-          </component>
-          <component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceinterface/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-          <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/sf/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-          <!-- displayldd to be moved here -->
-          <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/sf/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
-          <component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/sf/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-          </component>
-          <component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-          </component>
-          <component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" mrp="/sf/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-          </component>
-          <component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/sf/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicstest" long-name="Graphics Test" level="app-if">
-          <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
-            <unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="/sf/os/graphics/graphicstest/graphicstestharness/group"/>
-          </component>
-          <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-            <unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-          <component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
-            <unit bldFile="/sf/os/graphics/graphics_plat/m3g_core_api/group"/>
-          </component>
-        </collection>
-        <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-          <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-          </component>
-          <component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-          </component>
-        </collection>
-        <collection name="windowing" long-name="Windowing" level="app-if">
-          <component name="windowserver" long-name="Window Server" purpose="mandatory">
-            <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-          </component>
-          <component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" mrp="/sf/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-          </component>
-        </collection>
-        <collection name="printingservices" long-name="Printing Services" level="app-if">
-          <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-            <unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-          </component>
-          <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-          </component>
-        </collection>
-        <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-          <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory">
-            <unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-          </component>
-        </collection>
-        <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-          <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
-            <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-          </component>
-          <component name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
-            <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
-          </component>
-        </collection>
-        <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-          <component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-          </component>
-          <component name="openvg11" filter="s60" long-name="OpenVG 1.1">
-            <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-            <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
-          </component>
-          <component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
-          </component>
-        </collection>
-        <collection name="egl" long-name="EGL" level="internal-adaptations">
-          <component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
-          </component>
-          <component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/egl/eglswitch/group" mrp="/sf/os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
-          </component>
-          <component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group" mrp="/sf/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-          </component>
-          <component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
-            <unit bldFile="/sf/os/graphics/egl/egltest/group" mrp="/sf/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-          <component name="gdi" long-name="GDI" purpose="mandatory">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-          </component>
-          <component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-          </component>
-          <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-          </component>
-          <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-          </component>
-          <component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-          </component>
-          <component name="directgdiinterface" long-name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
-          </component>
-          <component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-            <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-          <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-            <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="/sf/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-          </component>
-        </collection>
-        <collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if">
-          <component name="graphicssvs" long-name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/group"/>
-          </component>
-          <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="/sf/os/graphics/graphicsapitest/screendriverhaitest/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+      <component id="vgi" filter="s60" name="VGI">
+        <unit bldFile="graphicsaccelaration/vgi/group"/>
+      </component>
+    </collection>
+    <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+      <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
+        <unit bldFile="m3g/m3gcore11/group"/>
+      </component>
+    </collection>
+    <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
+      <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+        <unit bldFile="graphicsresourceservices/graphicsresource/group" mrp="graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+      </component>
+      <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+        <unit bldFile="graphicsresourceservices/graphicsresourceadaptation/group" mrp="graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+      </component>
+      <component id="graphicsresourceimplementation" name="Graphics Resource Implementation" introduced="^4" purpose="optional">
+        <unit bldFile="graphicsresourceservices/graphicsresourceimplementation/group" mrp="graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
+      </component>
+      <component id="graphicsresourceinterface" name="Graphics Resource Interface" introduced="^4" purpose="optional">
+        <unit bldFile="graphicsresourceservices/graphicsresourceinterface/group" mrp="graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
+      </component>
+    </collection>
+    <collection id="graphicsutils" name="Graphics Utils" level="engines">
+      <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+        <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+      </component>
+    </collection>
+    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+      <!-- displayldd to be moved here -->
+      <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
+        <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+      </component>
+    </collection>
+    <collection id="graphicscomposition" name="Graphics Composition" level="engines">
+      <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+        <unit bldFile="graphicscomposition/openwfcinterface/group" mrp="graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+      </component>
+      <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+        <unit bldFile="graphicscomposition/openwfcompositionengine/group" mrp="graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+      </component>
+      <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+        <unit bldFile="graphicscomposition/openwfsupport/group" mrp="graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+      </component>
+     <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+      <unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicstest" name="Graphics Test" level="app-if">
+      <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+        <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
+      </component>
+      <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+        <unit bldFile="graphicstest/uibench/group" mrp="graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+      </component>
+    </collection>
+  <collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+   <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+    <meta rel="Api" href="graphics_plat/m3g_core_api/m3g_core_api.metaxml"/>
+    <unit bldFile="graphics_plat/m3g_core_api/group"/>
+   </component>
+  </collection>
+  <collection id="graphics_info" name="Graphics Info" level="app-if">
+      <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+        <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+      </component>
+      <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+      </component>
+    </collection>
+    <collection id="windowing" name="Windowing" level="app-if">
+     <component id="windowserver" name="Window Server" purpose="mandatory">
+      <unit bldFile="windowing/windowserver/group" mrp="windowing/windowserver/group/graphics_wserv.mrp"/>
+     </component>
+     <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="windowing/windowserverplugins/group" mrp="windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+     </component>
+    </collection>
+    <collection id="printingservices" name="Printing Services" level="app-if">
+      <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+        <unit bldFile="printingservices/printerdriversupport/group" mrp="printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+      </component>
+      <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+        <unit bldFile="printingservices/printerdrivers/group" mrp="printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+      </component>
+    </collection>
+    <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
+      <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
+        <unit bldFile="fbs/fontandbitmapserver/group" mrp="fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+      </component>
+    </collection>
+    <collection id="opengles" name="OpenGLES" level="internal-adaptations">
+      <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+        <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+      </component>
+      <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
+        <unit bldFile="opengles/openglesinterface/group/opengles_stub"/>
+      </component>
+    </collection>
+    <collection id="openvg" name="OpenVG" level="internal-adaptations">
+      <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
+        <unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+      </component>
+      <component id="openvg11" filter="s60" name="OpenVG 1.1">
+     	<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+        <unit bldFile="openvg/openvginterface/group/openvg11"/>
+      </component>
+      <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+        <unit bldFile="openvg/openvgrefimplementation/sfopenvg/group"/>
+      </component>
+    </collection>
+    <collection id="egl" name="EGL" level="internal-adaptations">
+      <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
+        <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
+      </component>
+      <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
+        <unit bldFile="egl/eglswitch/group" mrp="egl/eglswitch/group/graphics_eglswitch.mrp"/>
+      </component>
+      <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+        <unit bldFile="egl/eglrefimpl/group" mrp="egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+      </component>
+      <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+        <unit bldFile="egl/egltest/group" mrp="egl/egltest/group/graphics_egltest.mrp"/>
+      </component>
+    </collection>
+    <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+      <component id="gdi" name="GDI" purpose="mandatory">
+        <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+      </component>
+      <component id="bitgdi" name="BitGDI" purpose="mandatory">
+        <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+      </component>
+      <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+        <unit bldFile="graphicsdeviceinterface/colourpalette/group" mrp="graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+      </component>
+      <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+        <unit bldFile="graphicsdeviceinterface/screendriver/group" mrp="graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+      </component>
+      <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+        <unit bldFile="graphicsdeviceinterface/directgdi/group" mrp="graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+      </component>
+      <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+        <unit bldFile="graphicsdeviceinterface/directgdiinterface/group" mrp="graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+      </component>
+      <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+        <unit bldFile="graphicsdeviceinterface/directgdiadaptation/group" mrp="graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+      </component>
+    </collection>
+    <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
+      <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
+        <unit bldFile="graphicstools/gdi_tools/group" mrp="graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+      </component>
+    </collection>
+    <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+      <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+        <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
+      </component>
+      <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+	<unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/graphics/package_definition_3.0.xml
--- a/symbian4/os/graphics/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
-      <component id="vgi" filter="s60" name="VGI">
-        <unit bldFile="graphicsaccelaration/vgi/group"/>
-      </component>
-    </collection>
-    <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
-      <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
-        <unit bldFile="m3g/m3gcore11/group"/>
-      </component>
-    </collection>
-    <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
-      <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsresourceservices/graphicsresource/group" mrp="graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
-      </component>
-      <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsresourceservices/graphicsresourceadaptation/group" mrp="graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
-      </component>
-      <component id="graphicsresourceimplementation" name="Graphics Resource Implementation" introduced="^4" purpose="optional">
-        <unit bldFile="graphicsresourceservices/graphicsresourceimplementation/group" mrp="graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
-      </component>
-      <component id="graphicsresourceinterface" name="Graphics Resource Interface" introduced="^4" purpose="optional">
-        <unit bldFile="graphicsresourceservices/graphicsresourceinterface/group" mrp="graphicsresourceservices/graphicsresourceinterface/group/graphics_graphicsresourceinterface.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicsutils" name="Graphics Utils" level="engines">
-      <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
-        <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
-      <!-- displayldd to be moved here -->
-      <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
-        <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicscomposition" name="Graphics Composition" level="engines">
-      <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-        <unit bldFile="graphicscomposition/openwfcinterface/group" mrp="graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-      </component>
-      <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
-        <unit bldFile="graphicscomposition/openwfcompositionengine/group" mrp="graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-      </component>
-      <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
-        <unit bldFile="graphicscomposition/openwfsupport/group" mrp="graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-      </component>
-     <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
-      <unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-     </component>
-    </collection>
-    <collection id="graphicstest" name="Graphics Test" level="app-if">
-      <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
-        <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
-      </component>
-      <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
-        <unit bldFile="graphicstest/uibench/group" mrp="graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-      </component>
-    </collection>
-  <collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
-   <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
-    <meta rel="Api" href="graphics_plat/m3g_core_api/m3g_core_api.metaxml"/>
-    <unit bldFile="graphics_plat/m3g_core_api/group"/>
-   </component>
-  </collection>
-  <collection id="graphics_info" name="Graphics Info" level="app-if">
-      <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
-        <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-      </component>
-      <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="windowing" name="Windowing" level="app-if">
-     <component id="windowserver" name="Window Server" purpose="mandatory">
-      <unit bldFile="windowing/windowserver/group" mrp="windowing/windowserver/group/graphics_wserv.mrp"/>
-     </component>
-     <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
-      <unit bldFile="windowing/windowserverplugins/group" mrp="windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-     </component>
-    </collection>
-    <collection id="printingservices" name="Printing Services" level="app-if">
-      <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
-        <unit bldFile="printingservices/printerdriversupport/group" mrp="printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-      </component>
-      <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
-        <unit bldFile="printingservices/printerdrivers/group" mrp="printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-      </component>
-    </collection>
-    <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
-      <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
-        <unit bldFile="fbs/fontandbitmapserver/group" mrp="fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-      </component>
-    </collection>
-    <collection id="opengles" name="OpenGLES" level="internal-adaptations">
-      <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
-        <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-      </component>
-      <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
-        <unit bldFile="opengles/openglesinterface/group/opengles_stub"/>
-      </component>
-    </collection>
-    <collection id="openvg" name="OpenVG" level="internal-adaptations">
-      <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
-        <unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-      </component>
-      <component id="openvg11" filter="s60" name="OpenVG 1.1">
-     	<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-        <unit bldFile="openvg/openvginterface/group/openvg11"/>
-      </component>
-      <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-        <unit bldFile="openvg/openvgrefimplementation/sfopenvg/group"/>
-      </component>
-    </collection>
-    <collection id="egl" name="EGL" level="internal-adaptations">
-      <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
-        <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
-      </component>
-      <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
-        <unit bldFile="egl/eglswitch/group" mrp="egl/eglswitch/group/graphics_eglswitch.mrp"/>
-      </component>
-      <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
-        <unit bldFile="egl/eglrefimpl/group" mrp="egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-      </component>
-      <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
-        <unit bldFile="egl/egltest/group" mrp="egl/egltest/group/graphics_egltest.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
-      <component id="gdi" name="GDI" purpose="mandatory">
-        <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-      </component>
-      <component id="bitgdi" name="BitGDI" purpose="mandatory">
-        <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-      </component>
-      <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/colourpalette/group" mrp="graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-      </component>
-      <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
-        <unit bldFile="graphicsdeviceinterface/screendriver/group" mrp="graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-      </component>
-      <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/directgdi/group" mrp="graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-      </component>
-      <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/directgdiinterface/group" mrp="graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
-      </component>
-      <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/directgdiadaptation/group" mrp="graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
-      <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
-        <unit bldFile="graphicstools/gdi_tools/group" mrp="graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
-      <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
-        <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
-      </component>
-      <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
-	<unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/imagingext/package_definition.xml
--- a/symbian4/os/imagingext/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/imagingext/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,130 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-          <component name="exif_api" long-name="Exif API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
-            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group" filter="test,api_test"/>
-          </component>
-        </collection>
-        <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-          <component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-          </component>
-          <component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
-          </component>
-          <component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-          </component>
-          <component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-          </component>
-          <component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-          </component>
-          <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
-          </component>
-          <component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" introduced="^4" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
-          </component>
-        </collection>
-        <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-          <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-            <unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-          </component>
-          <component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
-            <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-            <unit bldFile="/sf/os/imagingext/imageadaptationextensions/group"/>
-          </component>
-        </collection>
-        <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-          <component name="exiflib" filter="s60" long-name="Exif Library">
-            <unit bldFile="/sf/os/imagingext/imagingmodules/exiflib/group"/>
-          </component>
-          <component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-            <unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
+   <component id="exif_api" name="Exif API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_pub/exif_api/exif_api.metaxml"/>
+    <unit bldFile="imagingext_pub/exif_api/group" filter="!test"/>
+    <unit bldFile="imagingext_pub/exif_api/tsrc/group"  filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+   <component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/jpeg2000_icl_plugin_api/jpeg2000_icl_plugin_api.metaxml"/>
+    <unit bldFile="imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+   </component>
+   <component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/extended_icl_jpeg_api/extended_icl_jpeg_api.metaxml"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/h324_annex_k_custom_api/h324_annex_k_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/h324_annex_k_custom_api/group"/>
+   </component>
+   <component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_orientation_custom_api/ecam_orientation_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_orientation_custom_api/group"/>
+   </component>
+   <component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_ui_orientation_override_custom_api/ecam_ui_orientation_override_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+   </component>
+   <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
+   </component>
+   <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
+      <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
+      <unit bldFile="imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+   </component>
+  </collection>
+  <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+   <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+    <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
+   </component>
+   <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+    <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+    <unit bldFile="imageadaptationextensions/group"/>
+   </component>
+  </collection>
+  <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+   <component id="exiflib" filter="s60" name="Exif Library">
+    <unit bldFile="imagingmodules/exiflib/group"/>
+   </component>
+   <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+    <unit bldFile="imagingmodules/jp2kcodec/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/imagingext/package_definition_3.0.xml
--- a/symbian4/os/imagingext/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-  <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
-   <component id="exif_api" name="Exif API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_pub/exif_api/exif_api.metaxml"/>
-    <unit bldFile="imagingext_pub/exif_api/group" filter="!test"/>
-    <unit bldFile="imagingext_pub/exif_api/tsrc/group"  filter="test,api_test"/>
-   </component>
-  </collection>
-  <collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
-   <component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_plat/jpeg2000_icl_plugin_api/jpeg2000_icl_plugin_api.metaxml"/>
-    <unit bldFile="imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-   </component>
-   <component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_plat/extended_icl_jpeg_api/extended_icl_jpeg_api.metaxml"/>
-    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
-    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
-   </component>
-   <component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_plat/h324_annex_k_custom_api/h324_annex_k_custom_api.metaxml"/>
-    <unit bldFile="imagingext_plat/h324_annex_k_custom_api/group"/>
-   </component>
-   <component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_plat/ecam_orientation_custom_api/ecam_orientation_custom_api.metaxml"/>
-    <unit bldFile="imagingext_plat/ecam_orientation_custom_api/group"/>
-   </component>
-   <component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_plat/ecam_ui_orientation_override_custom_api/ecam_ui_orientation_override_custom_api.metaxml"/>
-    <unit bldFile="imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-   </component>
-   <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
-    <meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
-    <unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
-   </component>
-   <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
-      <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
-      <unit bldFile="imagingext_plat/ecam_use_case_hint_custom_api/group"/>
-   </component>
-  </collection>
-  <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
-   <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
-    <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
-   </component>
-   <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
-    <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-    <unit bldFile="imageadaptationextensions/group"/>
-   </component>
-  </collection>
-  <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
-   <component id="exiflib" filter="s60" name="Exif Library">
-    <unit bldFile="imagingmodules/exiflib/group"/>
-   </component>
-   <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
-    <unit bldFile="imagingmodules/jp2kcodec/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/kernelhwsrv/package_definition.xml
--- a/symbian4/os/kernelhwsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,224 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-        <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-          <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-          </component>
-        </collection>
-        <collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
-          <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
-            <unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
-          </component>
-        </collection>
-        <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
-          <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
-          </component>
-        </collection>
-        <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
-          <component name="e32utils" long-name="E32 Utilities" purpose="development">
-            <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-          </component>
-          <component name="e32test" long-name="E32 Tests" purpose="development">
-            <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-          </component>
-          <component name="f32test" long-name="File Server Tests" purpose="development">
-            <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
-          </component>
-        </collection>
-        <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
-          <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-          </component>
-          <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
-          </component>
-          <component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-          </component>
-          <component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-            <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-          </component>
-          <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-            <!-- these are LDDs for storage media-->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-          </component>
-          <component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-          </component>
-          <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-          </component>
-          <component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-          </component>
-          <component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
-            <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-          </component>
-          <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-          </component>
-          <component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-          </component>
-          <component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-          </component>
-        </collection>
-        <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-          <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-            <!-- these are for storage media-->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-          </component>
-          <component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-          </component>
-        </collection>
-        <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-          <component name="euser" long-name="User Library" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/euser" mrp="/sf/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-          </component>
-          <component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/compsupp" mrp="/sf/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-          </component>
-          <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-          </component>
-          <component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-          </component>
-          <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-          </component>
-        </collection>
-        <collection name="filesystems" long-name="File Systems" level="framework">
-          <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-            <unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-          </component>
-          <component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-          </component>
-          <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-          </component>
-          <component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-          </component>
-          <component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-          </component>
-          <component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-          </component>
-          <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-          </component>
-        </collection>
-        <collection name="halservices" long-name="HAL Services" level="framework">
-          <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/halservices/hal" mrp="/sf/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-          </component>
-        </collection>
-        <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-          <component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/sf/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-          </component>
-          <component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-            <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-          </component>
-        </collection>
-        <collection name="baseapitest" long-name="Base API Tests" level="test">
-          <component name="basesvs" long-name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp" bldFile="/sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
-          </component>
-        </collection>
-        <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-          <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+    <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
+      <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
+        <unit bldFile="brdbootldr/ubootldr" mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
+      </component>
+    </collection>
+    <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
+      <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
+        <unit bldFile="bsptemplate/asspandvariant/template_variant" mrp="bsptemplate/asspandvariant/base_template.mrp"/>
+      </component>
+    </collection>
+    <collection id="kernel" name="Kernel Architecture" level="adaptation">
+      <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
+        <unit bldFile="kernel/eka" mrp="kernel/eka/base_e32.mrp"/>
+      </component>
+    </collection>
+    <collection id="kerneltest" name="Kernel Test" level="hw-if">
+      <component id="e32utils" name="E32 Utilities" purpose="development">
+      <unit bldFile="kerneltest/e32utils/group" mrp="kerneltest/e32utils/group/base_e32utils.mrp"/>
+      </component>
+      <component id="e32test" name="E32 Tests" purpose="development">
+        <unit bldFile="kerneltest/e32test/group" mrp="kerneltest/e32test/group/base_e32test.mrp"/>
+      </component>
+      <component id="f32test" name="File Server Tests" purpose="development">
+        <unit bldFile="kerneltest/f32test/group" mrp="kerneltest/f32test/group/base_f32test.mrp"/>
+      </component>
+    </collection>
+    <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+      <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
+        <unit bldFile="kernel/eka/drivers/ethernet" mrp="kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+      </component>
+      <component id="audioldd" name="Audio Drivers" introduced="8.1b" purpose="optional">     
+        <unit bldFile="kernel/eka/drivers/soundsc" mrp="kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>       
+      </component>
+      <component id="serialldd" name="Serial Port Drivers" purpose="optional">
+        <unit bldFile="kernel/eka/drivers/ecomm" mrp="kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+      </component>
+      <component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+        <unit mrp="kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+      </component>
+      <component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+        <!-- these are LDDs for storage media-->
+        <unit bldFile="kernel/eka/drivers/locmedia" mrp="kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+      </component>
+      <component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+		<unit bldFile="kernel/eka/drivers/debug/group" mrp="kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>	    
+      </component>
+      <component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+        <unit bldFile="kernel/eka/drivers/trace" mrp="kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+      </component>
+      <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+        <unit bldFile="kernel/eka/drivers/camerasc" mrp="kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+      </component>
+      <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+        <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+        <unit bldFile="kernel/eka/drivers/display" mrp="kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+      </component>
+      <component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+        <unit bldFile="kernel/eka/drivers/usbc" mrp="kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+      </component>
+      <component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+        <unit bldFile="kernel/eka/drivers/usbho/usbdescriptors" mrp="kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+      </component>
+      <component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+        <unit bldFile="kernel/eka/drivers/usbho/usbdi_utils" mrp="kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+      </component>
+    </collection>
+    <collection id="driversupport" name="Generic Driver Support" level="hw-if">
+      <component id="mediadrivers" name="Media Drivers" purpose="optional">
+        <!-- these are for storage media-->
+        <unit bldFile="kernel/eka/drivers/media" mrp="kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+      </component>
+      <component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+        <unit bldFile="kernel/eka/drivers/bsp" mrp="kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+      </component>
+    </collection>
+    <collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+      <component id="euser" name="User Library" purpose="mandatory">
+        <unit bldFile="kernel/eka/euser" mrp="kernel/eka/euser/base_e32_euser.mrp"/>
+      </component>
+      <component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+        <unit bldFile="kernel/eka/compsupp" mrp="kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+      </component>
+      <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+        <unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
+      </component>
+      <component id="estart" name="Base Starter" filter="gt" purpose="optional">
+        <unit bldFile="userlibandfileserver/fileserver/estart" mrp="userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+      </component>
+      <component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+        <unit bldFile="userlibandfileserver/domainmgr/group" mrp="userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+      </component>
+    </collection>
+    <collection id="filesystems" name="File Systems" level="framework">
+      <component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+        <unit mrp="userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+      </component>
+      <component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+        <unit bldFile="userlibandfileserver/fileserver/srofs" mrp="userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+      </component>
+      <component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+        <unit bldFile="userlibandfileserver/fileserver/smassstorage" mrp="userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+      </component>
+      <component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="userlibandfileserver/fileserver/shostmassstorage" mrp="userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+      </component>
+      <component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+        <unit bldFile="userlibandfileserver/fileserver/sfat32" mrp="userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+      </component>
+      <component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+        <unit bldFile="userlibandfileserver/fileserver/sfat" mrp="userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+      </component>
+      <component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+        <unit bldFile="userlibandfileserver/fileserver/scomp" mrp="userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+      </component>
+    </collection>
+    <collection id="halservices" name="HAL Services" level="framework">
+      <component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+        <unit bldFile="halservices/hal" mrp="halservices/hal/base_hal.mrp"/>
+      </component>
+    </collection>
+    <collection id="textmodeshell" name="Text Mode Shell" level="test">
+      <component id="e32wsrv" name="Text Window Server" purpose="optional">
+        <unit bldFile="kernel/eka/ewsrv" mrp="kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+      </component>
+      <component id="textshell" name="Text Shell" filter="gt" purpose="development">
+        <unit bldFile="userlibandfileserver/fileserver/etshell" mrp="userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+      </component>
+    </collection>
+    <collection id="baseapitest" name="Base API Tests" level="test">
+      <component id="basesvs" name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
+        <unit mrp="baseapitest/basesvs/group/basesvs.mrp" bldFile="baseapitest/basesvs/group"/>
+      </component>
+    </collection>
+    <collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+      <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/kernelhwsrv/package_definition_3.0.xml
--- a/symbian4/os/kernelhwsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-    <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
-      <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
-        <unit bldFile="brdbootldr/ubootldr" mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
-      </component>
-    </collection>
-    <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
-      <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
-        <unit bldFile="bsptemplate/asspandvariant/template_variant" mrp="bsptemplate/asspandvariant/base_template.mrp"/>
-      </component>
-    </collection>
-    <collection id="kernel" name="Kernel Architecture" level="adaptation">
-      <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
-        <unit bldFile="kernel/eka" mrp="kernel/eka/base_e32.mrp"/>
-      </component>
-    </collection>
-    <collection id="kerneltest" name="Kernel Test" level="hw-if">
-      <component id="e32utils" name="E32 Utilities" purpose="development">
-      <unit bldFile="kerneltest/e32utils/group" mrp="kerneltest/e32utils/group/base_e32utils.mrp"/>
-      </component>
-      <component id="e32test" name="E32 Tests" purpose="development">
-        <unit bldFile="kerneltest/e32test/group" mrp="kerneltest/e32test/group/base_e32test.mrp"/>
-      </component>
-      <component id="f32test" name="File Server Tests" purpose="development">
-        <unit bldFile="kerneltest/f32test/group" mrp="kerneltest/f32test/group/base_f32test.mrp"/>
-      </component>
-    </collection>
-    <collection id="ldds" name="Logical Device Drivers" level="adaptation">
-      <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
-        <unit bldFile="kernel/eka/drivers/ethernet" mrp="kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-      </component>
-      <component id="audioldd" name="Audio Drivers" introduced="8.1b" purpose="optional">     
-        <unit bldFile="kernel/eka/drivers/soundsc" mrp="kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>       
-      </component>
-      <component id="serialldd" name="Serial Port Drivers" purpose="optional">
-        <unit bldFile="kernel/eka/drivers/ecomm" mrp="kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-      </component>
-      <component id="legacydrivers" name="Legacy Drivers" purpose="optional">
-        <unit mrp="kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-      </component>
-      <component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-        <!-- these are LDDs for storage media-->
-        <unit bldFile="kernel/eka/drivers/locmedia" mrp="kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-      </component>
-      <component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
-		<unit bldFile="kernel/eka/drivers/debug/group" mrp="kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>	    
-      </component>
-      <component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
-        <unit bldFile="kernel/eka/drivers/trace" mrp="kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-      </component>
-      <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
-        <unit bldFile="kernel/eka/drivers/camerasc" mrp="kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-      </component>
-      <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
-        <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
-        <unit bldFile="kernel/eka/drivers/display" mrp="kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-      </component>
-      <component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
-        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-        <unit bldFile="kernel/eka/drivers/usbc" mrp="kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-      </component>
-      <component id="usbdescriptors" name="USB Descriptors" purpose="optional">
-        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-        <unit bldFile="kernel/eka/drivers/usbho/usbdescriptors" mrp="kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-      </component>
-      <component id="usbdi_utils" name="USB DI Utils" purpose="optional">
-        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-        <unit bldFile="kernel/eka/drivers/usbho/usbdi_utils" mrp="kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-      </component>
-    </collection>
-    <collection id="driversupport" name="Generic Driver Support" level="hw-if">
-      <component id="mediadrivers" name="Media Drivers" purpose="optional">
-        <!-- these are for storage media-->
-        <unit bldFile="kernel/eka/drivers/media" mrp="kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-      </component>
-      <component id="genericboardsupport" name="Generic Board Support" purpose="optional">
-        <unit bldFile="kernel/eka/drivers/bsp" mrp="kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-      </component>
-    </collection>
-    <collection id="userlibandfileserver" name="User Library and File Server" level="framework">
-      <component id="euser" name="User Library" purpose="mandatory">
-        <unit bldFile="kernel/eka/euser" mrp="kernel/eka/euser/base_e32_euser.mrp"/>
-      </component>
-      <component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-        <unit bldFile="kernel/eka/compsupp" mrp="kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-      </component>
-      <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
-        <unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
-      </component>
-      <component id="estart" name="Base Starter" filter="gt" purpose="optional">
-        <unit bldFile="userlibandfileserver/fileserver/estart" mrp="userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-      </component>
-      <component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
-        <unit bldFile="userlibandfileserver/domainmgr/group" mrp="userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-      </component>
-    </collection>
-    <collection id="filesystems" name="File Systems" level="framework">
-      <component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
-        <unit mrp="userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-      </component>
-      <component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
-        <unit bldFile="userlibandfileserver/fileserver/srofs" mrp="userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-      </component>
-      <component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
-        <unit bldFile="userlibandfileserver/fileserver/smassstorage" mrp="userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-      </component>
-      <component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="userlibandfileserver/fileserver/shostmassstorage" mrp="userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-      </component>
-      <component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
-        <unit bldFile="userlibandfileserver/fileserver/sfat32" mrp="userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-      </component>
-      <component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
-        <unit bldFile="userlibandfileserver/fileserver/sfat" mrp="userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-      </component>
-      <component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
-        <unit bldFile="userlibandfileserver/fileserver/scomp" mrp="userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-      </component>
-    </collection>
-    <collection id="halservices" name="HAL Services" level="framework">
-      <component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-        <unit bldFile="halservices/hal" mrp="halservices/hal/base_hal.mrp"/>
-      </component>
-    </collection>
-    <collection id="textmodeshell" name="Text Mode Shell" level="test">
-      <component id="e32wsrv" name="Text Window Server" purpose="optional">
-        <unit bldFile="kernel/eka/ewsrv" mrp="kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-      </component>
-      <component id="textshell" name="Text Shell" filter="gt" purpose="development">
-        <unit bldFile="userlibandfileserver/fileserver/etshell" mrp="userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-      </component>
-    </collection>
-    <collection id="baseapitest" name="Base API Tests" level="test">
-      <component id="basesvs" name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
-        <unit mrp="baseapitest/basesvs/group/basesvs.mrp" bldFile="baseapitest/basesvs/group"/>
-      </component>
-    </collection>
-    <collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
-      <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/lbs/package_definition.xml
--- a/symbian4/os/lbs/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,172 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-        <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-          <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-          </component>
-          <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-          </component>
-          <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-          </component>
-          <component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-          </component>
-          <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
-          </component>
-          <component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
-          </component>
-        </collection>
-        <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-          <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-          </component>
-        </collection>
-        <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-          <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-          </component>
-          <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-          </component>
-        </collection>
-        <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-          <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
-            <unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="/sf/os/lbs/lbstest/lbstestproduct/group"/>
-          </component>
-          <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-            <unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-          </component>
-        </collection>
-        <collection name="locationmgmt" long-name="Location Management" level="management">
-          <component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-          </component>
-          <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-          </component>
-          <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-          </component>
-          <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-          </component>
-          <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-          <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-          </component>
-          <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-          </component>
-          <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
-            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-          </component>
-          <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-          </component>
-          <component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
-            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
-          </component>
-        </collection>
-        <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-          <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="/sf/os/lbs/lbsapitest/lbshaitest/group"/>
-          </component>
-        </collection>
-        <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-          <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+    <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
+      <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+      </component>
+      <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/bluetoothgpspositioningmodule/group" mrp="datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+      </component>
+      <component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+        <unit bldFile="datasourcemodules/simulationpositioningmodule/group" mrp="datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+      </component>
+      <component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/gpspositioningmodule/group" mrp="datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+      </component>
+      <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+      </component>
+      <component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
+      </component>
+    </collection>
+    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+      <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+      </component>
+    </collection>
+    <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
+      <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
+        <unit bldFile="locationrequestmgmt/locationserver/group" mrp="locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+      </component>
+      <component id="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+        <unit bldFile="locationrequestmgmt/networkrequesthandler/group" mrp="locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+      </component>
+    </collection>
+    <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+      <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+        <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
+      </component>
+      <component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+        <unit bldFile="lbstest/locationprotocoltest/group" mrp="lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+      </component>
+    </collection>
+    <collection id="locationmgmt" name="Location Management" level="management">
+      <component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+      <unit bldFile="locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+      </component>
+      <component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+        <unit bldFile="locationmgmt/agpslocationmgr/group" mrp="locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+      </component>
+      <component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+        <unit bldFile="locationmgmt/networklocationmgr/group" mrp="locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+      </component>
+      <component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+        <unit bldFile="locationmgmt/locationcore/group" mrp="locationmgmt/locationcore/group/lbs_admin.mrp"/>
+      </component>
+      <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
+        <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+      <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+      </component>
+      <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+      </component>
+      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+      </component>
+      <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
+      </component>
+      <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+      </component>
+    </collection>
+    <collection id="lbsapitest" name="Location API Tests" level="application-interface">
+      <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+        <unit mrp="lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="lbsapitest/lbshaitest/group"/>
+      </component>
+    </collection>
+    <collection id="lbs_info" name="Locating Services Info" level="application-interface">
+      <component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/lbs/package_definition_3.0.xml
--- a/symbian4/os/lbs/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
-      <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-      </component>
-      <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/bluetoothgpspositioningmodule/group" mrp="datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-      </component>
-      <component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
-        <unit bldFile="datasourcemodules/simulationpositioningmodule/group" mrp="datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-      </component>
-      <component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/gpspositioningmodule/group" mrp="datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-      </component>
-      <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
-      </component>
-      <component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
-      </component>
-    </collection>
-    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
-      <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-      </component>
-    </collection>
-    <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
-      <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
-        <unit bldFile="locationrequestmgmt/locationserver/group" mrp="locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-      </component>
-      <component id="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
-        <unit bldFile="locationrequestmgmt/networkrequesthandler/group" mrp="locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-      </component>
-    </collection>
-    <collection id="lbstest" name="Locating Services Tests" level="application-interface">
-      <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
-        <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
-      </component>
-      <component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
-        <unit bldFile="lbstest/locationprotocoltest/group" mrp="lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-      </component>
-    </collection>
-    <collection id="locationmgmt" name="Location Management" level="management">
-      <component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
-      <unit bldFile="locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-      </component>
-      <component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-        <unit bldFile="locationmgmt/agpslocationmgr/group" mrp="locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-      </component>
-      <component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
-        <unit bldFile="locationmgmt/networklocationmgr/group" mrp="locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-      </component>
-      <component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
-        <unit bldFile="locationmgmt/locationcore/group" mrp="locationmgmt/locationcore/group/lbs_admin.mrp"/>
-      </component>
-      <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
-        <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
-      <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-      </component>
-      <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-      </component>
-      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-      </component>
-      <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
-      </component>
-      <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
-      </component>
-    </collection>
-    <collection id="lbsapitest" name="Location API Tests" level="application-interface">
-      <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="lbsapitest/lbshaitest/group"/>
-      </component>
-    </collection>
-    <collection id="lbs_info" name="Locating Services Info" level="application-interface">
-      <component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,541 +1,542 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-        <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
-          <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_pub/audio_effects_api/group"/>
-          </component>
-          <component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_pub/audio_effects_presets_api/group"/>
-          </component>
-          <component name="drm_audio_player_api" long-name="DRM Audio Player API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_pub/drm_audio_player_api/group"/>
-          </component>
-          <component name="multimedia_extension_interfaces_api" long-name="Multimedia Extension Interfaces API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
-          </component>
-        </collection>
-        <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
-          <component name="aac_decoder_config_api" long-name="AAC Decoder Config API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_api/group"/>
-          </component>
-          <component name="aac_decoder_config_msg_hdlr_api" long-name="AAC Decoder Config Msg Hdlr API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-          </component>
-          <component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-          </component>
-          <component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/added_devsound_control_api/group"/>
-          </component>
-          <component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-          </component>
-          <component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-          </component>
-          <component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-          </component>
-          <component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/audio_effects_proxy_api/group"/>
-          </component>
-          <component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/audio_policy_header_api/group"/>
-          </component>
-          <component name="audio_routing_api" long-name="Audio Routing API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/audio_routing_api/group"/>
-          </component>
-          <component name="audio_routing_msg_hdlr_api" long-name="Audio Routing Msg Hdlr API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
-          </component>
-          <component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/audio_routing_proxy_api/group"/>
-          </component>
-          <component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/custom_interface_builder_api/group"/>
-          </component>
-          <component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-          </component>
-          <component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-          </component>
-          <component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/custom_interface_utility_api/group"/>
-          </component>
-          <component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/devsound_adaptation_api/group"/>
-          </component>
-          <component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/display_posting_api/group"/>
-          </component>
-          <component name="eaac_plus_decoder_interface_api" long-name="eAAC Plus Decoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
-          </component>
-          <component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eAAC Plus Decoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-          </component>
-          <component name="error_concealment_interface_api" long-name="Error Concealment Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_api/group"/>
-          </component>
-          <component name="error_concealment_interface_msg_hdlr_api" long-name="Error Concealment Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-          </component>
-          <component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
-          </component>
-          <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_api/group"/>
-          </component>
-          <component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
-          </component>
-          <component name="g711_encoder_interface_api" long-name="G711 Encoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_api/group"/>
-          </component>
-          <component name="g711_encoder_interface_msg_hdlr_api" long-name="G711 Encoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
-          </component>
-          <component name="g729_decoder_interface_api" long-name="G729 Decoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_api/group"/>
-          </component>
-          <component name="g729_decoder_interface_msg_hdlr_api" long-name="G729 Decoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
-          </component>
-          <component name="g729_encoder_interface_api" long-name="G729 Encoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_api/group"/>
-          </component>
-          <component name="g729_encoder_interface_proxy_api" long-name="G729 Encoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
-          </component>
-          <component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="global_audio_settings_api" long-name="Global Audio Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/global_audio_settings_api/group"/>
-          </component>
-          <component name="global_audio_settings_definition_api" long-name="Global Audio Settings Definition API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
-          </component>
-          <component name="ilbc_decoder_interface_api" long-name="Ilbc Decoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
-          </component>
-          <component name="ilbc_decoder_interface_msg_hdlr_api" long-name="Ilbc Decoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-          </component>
-          <component name="ilbc_encoder_interface_api" long-name="Ilbc Encoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
-          </component>
-          <component name="ilbc_encoder_interface_msg_hdlr_api" long-name="Ilbc Encoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-          </component>
-          <component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/mdf_plugin_uids/group"/>
-          </component>
-          <component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-          </component>
-          <component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-          </component>
-          <component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-          </component>
-          <component name="ra8_decoder_interface_api" long-name="RA8 Decoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
-          </component>
-          <component name="ra8_decoder_interface_msg_hdlr_api" long-name="RA8 Decoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-          </component>
-          <component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/rds_adaptation_api/group"/>
-          </component>
-          <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_api/group"/>
-          </component>
-          <component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-          </component>
-          <component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
-          </component>
-          <component name="sbc_encoder_interface_api" long-name="SBC Encoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
-          </component>
-          <component name="sbc_encoder_interface_msg_hdlr_api" long-name="SBC Encoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-          </component>
-          <component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
-          </component>
-          <component name="speech_encoder_config_api" long-name="Speech Encoder Config API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_api/group"/>
-          </component>
-          <component name="speech_encoder_config_msg_hdlr_api" long-name="Speech Encoder Config Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
-          </component>
-          <component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-          </component>
-          <component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-          </component>
-          <component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-          </component>
-          <component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-          </component>
-          <component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-          </component>
-          <component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-          </component>
-          <component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-          </component>
-          <component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/video_window_control_custom_interface/group"/>
-          </component>
-          <component name="wma_decoder_interface_api" long-name="WMA Decoder Interface API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_api/group"/>
-          </component>
-          <component name="wma_decoder_interface_msg_hdlr_api" long-name="WMA Decoder Interface Message Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-          </component>
-          <component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-          </component>
-          <component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/eaacplusutil_api/group"/>
-          </component>
-          <component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
-            <unit bldFile="/sf/os/mm/mm_plat/frametable_api/group"/>
-          </component>
-        </collection>
-        <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-          <component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
-            <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
-          </component>
-          <component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
-            <unit bldFile="/sf/os/mm/devsoundextensions/mmextfw/group"/>
-          </component>
-          <component name="audiorouting" filter="s60" long-name="Audio Routing">
-            <unit bldFile="/sf/os/mm/devsoundextensions/audiorouting/group"/>
-          </component>
-          <component name="effects" filter="s60" long-name="Effects">
-            <unit bldFile="/sf/os/mm/devsoundextensions/effects/group"/>
-          </component>
-          <component name="effectspresets" filter="s60" long-name="Effects Presets">
-            <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/group"/>
-          </component>
-          <component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-            <!-- need to #include the lot from a single bld.inf
+<SystemDefinition schema="3.0.0">
+ <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+  <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
+   <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
+    <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
+    <unit bldFile="mm_pub/audio_effects_api/group"/>
+   </component>
+   <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
+    <meta rel="Api" href="mm_pub/audio_effects_presets_api/audio_effects_presets_api.metaxml"/>
+    <unit bldFile="mm_pub/audio_effects_presets_api/group"/>
+   </component>
+   <component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
+    <meta rel="Api" href="mm_pub/drm_audio_player_api/drm_audio_player_api.metaxml"/>
+    <unit bldFile="mm_pub/drm_audio_player_api/group"/>
+   </component>
+   <component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
+    <meta rel="Api" href="mm_pub/multimedia_extension_interfaces_api/multimedia_extension_interfaces_api.metaxml"/>
+    <unit bldFile="mm_pub/multimedia_extension_interfaces_api/group"/>
+   </component>
+  </collection>
+  <collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
+   <component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/aac_decoder_config_api/aac_decoder_config_api.metaxml"/>
+    <unit bldFile="mm_plat/aac_decoder_config_api/group"/>
+   </component>
+   <component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/aac_decoder_config_msg_hdlr_api/aac_decoder_config_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+   </component>
+   <component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/aac_decoder_config_proxy_api/aac_decoder_config_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/aac_decoder_config_proxy_api/group"/>
+   </component>
+   <component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/added_devsound_control_api/added_devsound_control_api.metaxml"/>
+    <unit bldFile="mm_plat/added_devsound_control_api/group"/>
+   </component>
+   <component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/added_devsound_control_msg_hdlr_api/added_devsound_control_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+   </component>
+   <component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/added_devsound_control_proxy_api/added_devsound_control_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/added_devsound_control_proxy_api/group"/>
+   </component>
+   <component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_effects_msg_hdlr_api/audio_effects_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_effects_msg_hdlr_api/group"/>
+   </component>
+   <component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_effects_proxy_api/audio_effects_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_effects_proxy_api/group"/>
+   </component>
+   <component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_policy_header_api/audio_policy_header_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_policy_header_api/group"/>
+   </component>
+   <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_routing_api/audio_routing_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_routing_api/group"/>
+   </component>
+   <component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_routing_msg_hdlr_api/audio_routing_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_routing_msg_hdlr_api/group"/>
+   </component>
+   <component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_routing_proxy_api/audio_routing_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_routing_proxy_api/group"/>
+   </component>
+   <component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/custom_interface_builder_api/custom_interface_builder_api.metaxml"/>
+    <unit bldFile="mm_plat/custom_interface_builder_api/group"/>
+   </component>
+   <component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/custom_interface_message_handler_factory_api/custom_interface_message_handler_factory_api.metaxml"/>
+    <unit bldFile="mm_plat/custom_interface_message_handler_factory_api/group"/>
+   </component>
+   <component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/custom_interface_proxy_factory_api/custom_interface_proxy_factory_api.metaxml"/>
+    <unit bldFile="mm_plat/custom_interface_proxy_factory_api/group"/>
+   </component>
+   <component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/custom_interface_utility_api/custom_interface_utility_api.metaxml"/>
+    <unit bldFile="mm_plat/custom_interface_utility_api/group"/>
+   </component>
+   <component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/devsound_adaptation_api/devsound_adaptation_api.metaxml"/>
+    <unit bldFile="mm_plat/devsound_adaptation_api/group"/>
+   </component>
+   <component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/display_posting_api/display_posting_api.metaxml"/>
+    <unit bldFile="mm_plat/display_posting_api/group"/>
+   </component>
+   <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_api/eaac_plus_decoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group"/>
+   </component>
+   <component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/eaac_plus_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_proxy_api/eaac_plus_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+   </component>
+   <component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/error_concealment_interface_api/error_concealment_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/error_concealment_interface_api/group"/>
+   </component>
+   <component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/error_concealment_interface_msg_hdlr_api/error_concealment_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/error_concealment_interface_proxy_api/error_concealment_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/error_concealment_interface_proxy_api/group"/>
+   </component>
+   <component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/fm_radio_adaptation_api/fm_radio_adaptation_api.metaxml"/>
+    <unit bldFile="mm_plat/fm_radio_adaptation_api/group"/>
+   </component>
+   <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g711_decoder_interface_api/g711_decoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_api/group"/>
+   </component>
+   <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g711_decoder_interface_msg_hdlr_api/g711_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g711_decoder_interface_proxy_api/g711_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_proxy_api/group"/>
+   </component>
+   <component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g711_encoder_interface_api/g711_encoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_api/group"/>
+   </component>
+   <component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g711_encoder_interface_msg_hdlr_api/g711_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g711_encoder_interface_proxy_api/g711_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_proxy_api/group"/>
+   </component>
+   <component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g729_decoder_interface_api/g729_decoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_api/group"/>
+   </component>
+   <component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g729_decoder_interface_msg_hdlr_api/g729_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g729_decoder_interface_proxy_api/g729_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_proxy_api/group"/>
+   </component>
+   <component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g729_encoder_interface_api/g729_encoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_api/group"/>
+   </component>
+   <component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g729_encoder_interface_proxy_api/g729_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_proxy_api/group"/>
+   </component>
+   <component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/g729_encoder_interface_msg_hdlr_api/g729_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/global_audio_settings_api/global_audio_settings_api.metaxml"/>
+    <unit bldFile="mm_plat/global_audio_settings_api/group"/>
+   </component>
+   <component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/global_audio_settings_definition_api/global_audio_settings_definition_api.metaxml"/>
+    <unit bldFile="mm_plat/global_audio_settings_definition_api/group"/>
+   </component>
+   <component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_api/ilbc_decoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group"/>
+   </component>
+   <component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_msg_hdlr_api/ilbc_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_proxy_api/ilbc_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+   </component>
+   <component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_api/ilbc_encoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group"/>
+   </component>
+   <component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_msg_hdlr_api/ilbc_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_proxy_api/ilbc_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+   </component>
+   <component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/mdf_plugin_uids/mdf_plugin_uids.metaxml"/>
+    <unit bldFile="mm_plat/mdf_plugin_uids/group"/>
+   </component>
+   <component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/multimedia_fourcc_definitions_api/multimedia_fourcc_definitions_api.metaxml"/>
+    <unit bldFile="mm_plat/multimedia_fourcc_definitions_api/group"/>
+   </component>
+   <component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/nokia_audio_policy_header_api/nokia_audio_policy_header_api.metaxml"/>
+    <unit bldFile="mm_plat/nokia_audio_policy_header_api/group"/>
+   </component>
+   <component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/nokia_multimedia_fourcc_definitions_api/nokia_multimedia_fourcc_definitions_api.metaxml"/>
+    <unit bldFile="mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+   </component>
+   <component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ra8_decoder_interface_api/ra8_decoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_api/group"/>
+   </component>
+   <component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ra8_decoder_interface_msg_hdlr_api/ra8_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/ra8_decoder_interface_proxy_api/ra8_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_proxy_api/group"/>
+   </component>
+   <component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/rds_adaptation_api/rds_adaptation_api.metaxml"/>
+    <unit bldFile="mm_plat/rds_adaptation_api/group"/>
+   </component>
+   <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/restricted_audio_output_api/restricted_audio_output_api.metaxml"/>
+    <unit bldFile="mm_plat/restricted_audio_output_api/group"/>
+   </component>
+   <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/restricted_audio_output_msg_hdlr_api/restricted_audio_output_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+   </component>
+   <component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/restricted_audio_output_proxy_api/restricted_audio_output_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/restricted_audio_output_proxy_api/group"/>
+   </component>
+   <component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/sbc_encoder_interface_api/sbc_encoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_api/group"/>
+   </component>
+   <component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/sbc_encoder_interface_msg_hdlr_api/sbc_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/sbc_encoder_interface_proxy_api/sbc_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_proxy_api/group"/>
+   </component>
+   <component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/secure_output_mdf_custom_interface/secure_output_mdf_custom_interface.metaxml"/>
+    <unit bldFile="mm_plat/secure_output_mdf_custom_interface/group"/>
+   </component>
+   <component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/speech_encoder_config_api/speech_encoder_config_api.metaxml"/>
+    <unit bldFile="mm_plat/speech_encoder_config_api/group"/>
+   </component>
+   <component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/speech_encoder_config_msg_hdlr_api/speech_encoder_config_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+   </component>
+   <component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/speech_encoder_config_proxy_api/speech_encoder_config_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/speech_encoder_config_proxy_api/group"/>
+   </component>
+   <component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/telephony_audio_routing_client_api/telephony_audio_routing_client_api.metaxml"/>
+    <unit bldFile="mm_plat/telephony_audio_routing_client_api/group"/>
+   </component>
+   <component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/telephony_audio_routing_manager_api/telephony_audio_routing_manager_api.metaxml"/>
+    <unit bldFile="mm_plat/telephony_audio_routing_manager_api/group"/>
+   </component>
+   <component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/video_buffer_management_mdf_custom_interface/video_buffer_management_mdf_custom_interface.metaxml"/>
+    <unit bldFile="mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+   </component>
+   <component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/video_decoder_rotation_mdf_custom_interface/video_decoder_rotation_mdf_custom_interface.metaxml"/>
+    <unit bldFile="mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+   </component>
+   <component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/video_decoder_scaling_mdf_custom_interface/video_decoder_scaling_mdf_custom_interface.metaxml"/>
+    <unit bldFile="mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+   </component>
+   <component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/video_reclaim_extbuffers_ci/video_reclaim_extbuffers_ci.metaxml"/>
+    <unit bldFile="mm_plat/video_reclaim_extbuffers_ci/group"/>
+   </component>
+   <component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/video_window_control_custom_interface/video_window_control_custom_interface.metaxml"/>
+    <unit bldFile="mm_plat/video_window_control_custom_interface/group"/>
+   </component>
+   <component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/wma_decoder_interface_api/wma_decoder_interface_api.metaxml"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_api/group"/>
+   </component>
+   <component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/wma_decoder_interface_msg_hdlr_api/wma_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+   </component>
+   <component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/wma_decoder_interface_proxy_api/wma_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_proxy_api/group"/>
+   </component>
+   <component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml"/>
+    <unit bldFile="mm_plat/eaacplusutil_api/group"/>
+   </component>
+   <component id="frametable_api" name="Frametable API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/frametable_api/frametable_api.metaxml"/>
+    <unit bldFile="mm_plat/frametable_api/group"/>
+   </component>
+  </collection>
+  <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+   <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+    <unit bldFile="devsoundextensions/drmaudioplayer/group"/>
+   </component>
+   <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+    <unit bldFile="devsoundextensions/mmextfw/group"/>
+   </component>
+   <component id="audiorouting" filter="s60" name="Audio Routing">
+    <unit bldFile="devsoundextensions/audiorouting/group"/>
+   </component>
+   <component id="effects" filter="s60" name="Effects">
+    <unit bldFile="devsoundextensions/effects/group"/>
+   </component>
+   <component id="effectspresets" filter="s60" name="Effects Presets">
+    <unit bldFile="devsoundextensions/effectspresets/group"/>
+   </component>
+   <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+    <!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
-            <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-            <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-          </component>
-          <component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
-            <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-          </component>
-          <component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
-            <unit bldFile="/sf/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-          </component>
-          <component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
-            <unit bldFile="/sf/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-          </component>
-          <component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
-            <unit bldFile="/sf/os/mm/devsoundextensions/globalaudiosettings/group"/>
-          </component>
-          <component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
-            <unit bldFile="/sf/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-          </component>
-          <component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
-            <unit bldFile="/sf/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-          </component>
-        </collection>
-        <collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-          <component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
-            <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-          </component>
-        </collection>
-        <collection name="audio" long-name="Audio Codecs" level="middleware">
-          <component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
-            <unit bldFile="/sf/os/mm/audio/arm_cmmf_codecs/group"/>
-          </component>
-        </collection>
-        <collection name="video" long-name="Video Codecs" level="middleware">
-          <!-- empty -->
-        </collection>
-        <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-          <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-          </component>
-          <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imagingunittest/group"/>
-          </component>
-          <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imaginginttest/group"/>
-          </component>
-          <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-          </component>
-          <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/cameraunittest/group"/>
-          </component>
-        </collection>
-        <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-          <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/mmlibs/mmutilitylib/group" mrp="/sf/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-          </component>
-          <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/mmlibs/mmfw/group" mrp="/sf/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-          <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/mm/mmplugins/imagingplugins/group" mrp="/sf/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-          </component>
-          <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/mm/mmplugins/cameraplugins/group" mrp="/sf/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-          </component>
-          <component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-          </component>
-          <component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/sf/os/mm/mmplugins/lib3gpunittest/group"/>
-          </component>
-          <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/mm/mmplugins/mmfwplugins/group" mrp="/sf/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-          </component>
-        </collection>
-        <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-          <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-          </component>
-          <component name="mm_tsrc" long-name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
-            <unit bldFile="/sf/os/mm/tsrc/group"/>
-          </component>
-          <component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-          <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
-            <unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-          <component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/mmdevicefw/mdf/group" mrp="/sf/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-          </component>
-          <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="/sf/os/mm/mmdevicefw/mdfunittest/group"/>
-          </component>
-          <component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/sf/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-          <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/mm/mmswadaptation/videorenderer/group" mrp="/sf/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-          <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfw/group"/>
-          </component>
-          <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfwunittest/group"/>
-          </component>
-          <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestagent/group"/>
-          </component>
-          <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtesttools/Group"/>
-          </component>
-        </collection>
-        <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-          <component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/mm/omxil/omxilapi/group" mrp="/sf/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-          </component>
-          <component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/mm/omxil/omxilcore/group" mrp="/sf/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-          </component>
-          <component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/mm/omxil/omxilcomponentcommon/group" mrp="/sf/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
-          </component>
-          <component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/sf/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-          </component>
-          <component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/sf/os/mm/omxil/omxilunittest/group"/>
-          </component>
-          <component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/sf/os/mm/omxil/omxilcoreconftest/group"/>
-          </component>
-          <component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-            <unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-          </component>
-        </collection>
-        <collection name="devsound" long-name="Sound Device" level="devices">
-          <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/devsound/devsoundapi/group" mrp="/sf/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-          </component>
-          <component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-          </component>
-          <component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-          </component>
-          <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/mm/devsound/devsoundpluginsupport/group" mrp="/sf/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-          </component>
-          <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/mm/devsound/devsoundrefplugin/group" mrp="/sf/os/mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
-          </component>
-          <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" deprecated="^4" plugin="Y">
-            <unit bldFile="/sf/os/mm/devsound/sounddevbt/group" mrp="/sf/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-          </component>
-          <component name="a3ftrace" long-name="A3F Trace Utility" introduced="^2" purpose="development">
-            <unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-          </component>
-          <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/sf/os/mm/devsound/a3fintegrationtest/group"/>
-          </component>
-          <component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-          </component>
-        </collection>
-        <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-          <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/mm/devsound/hwdevapi/group" mrp="/sf/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
-          </component>
-          <component name="a3facl" long-name="A3F Audio Component Library" introduced="^2" purpose="development">
-            <unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-          </component>
-          <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-          </component>
-          <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/mm/mmhais/refacladapt/group" mrp="/sf/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-          </component>
-          <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/mm/mmhais/videohai/group" mrp="/sf/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
-          </component>
-          <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
-            <unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-          </component>
-          <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+    <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+   </component>
+   <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+    <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
+   </component>
+   <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+    <unit bldFile="devsoundextensions/mmfcustominterfaces/group"/>
+   </component>
+   <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+    <unit bldFile="devsoundextensions/addeddevsoundcontrol/group"/>
+   </component>
+   <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+    <unit bldFile="devsoundextensions/globalaudiosettings/group"/>
+   </component>
+   <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+    <unit bldFile="devsoundextensions/restrictedaudiooutput/group"/>
+   </component>
+   <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+    <unit bldFile="devsoundextensions/ciextnfactoryplugins/group"/>
+   </component>
+  </collection>
+  <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+   <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
+    <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+   </component>
+  </collection>
+  <collection id="audio" name="Audio Codecs" level="middleware">
+   <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+    <unit bldFile="audio/arm_cmmf_codecs/group"/>
+   </component>
+  </collection>
+  <collection id="video" name="Video Codecs" level="middleware">
+   <!-- empty -->
+  </collection>
+  <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+   <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+   </component>
+   <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
+   </component>
+   <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
+   </component>
+   <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+    <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+   </component>
+   <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+    <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
+   </component>
+  </collection>
+  <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+   <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+    <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+   </component>
+   <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+   <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+   </component>
+   <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+   </component>
+   <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+    <unit bldFile="mmplugins/lib3gp/group" mrp="mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+   </component>
+   <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
+   </component>
+   <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+   </component>
+  </collection>
+  <collection id="mm_info" name="Multimedia Info" level="app-if">
+   <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+    <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
+   </component>
+   <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+   <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+    <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+   <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+    <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+   </component>
+   <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+    <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
+   </component>
+   <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+   <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
+    <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+   <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
+   </component>
+   <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
+   </component>
+   <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
+   </component>
+   <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
+   </component>
+  </collection>
+  <collection id="omxil" name="OpenMAX IL" level="hw-if">
+   <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+   </component>
+   <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+   </component>
+   <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+   </component>
+   <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+   </component>
+   <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+    <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
+   </component>
+   <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+    <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
+   </component>
+   <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+    <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
+   </component>
+  </collection>
+  <collection id="devsound" name="Sound Device" level="devices">
+   <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+   </component>
+   <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+    <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+   </component>
+   <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+    <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+   </component>
+   <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+    <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+   </component>
+   <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+    <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+   </component>
+   <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
+    <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+   </component>
+   <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+    <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+   </component>
+   <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
+   </component>
+   <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+   <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+    <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+   </component>
+   <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
+    <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+   </component>
+   <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+    <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+   </component>
+   <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+    <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+   </component>
+   <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>
+   </component>
+   <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+    <unit bldFile="mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+   </component>
+   <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/mm/package_definition_3.0.xml
--- a/symbian4/os/mm/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,542 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-  <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
-   <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_api/group"/>
-   </component>
-   <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/audio_effects_presets_api/audio_effects_presets_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_presets_api/group"/>
-   </component>
-   <component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/drm_audio_player_api/drm_audio_player_api.metaxml"/>
-    <unit bldFile="mm_pub/drm_audio_player_api/group"/>
-   </component>
-   <component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
-    <meta rel="Api" href="mm_pub/multimedia_extension_interfaces_api/multimedia_extension_interfaces_api.metaxml"/>
-    <unit bldFile="mm_pub/multimedia_extension_interfaces_api/group"/>
-   </component>
-  </collection>
-  <collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
-   <component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/aac_decoder_config_api/aac_decoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_api/group"/>
-   </component>
-   <component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/aac_decoder_config_msg_hdlr_api/aac_decoder_config_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-   </component>
-   <component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/aac_decoder_config_proxy_api/aac_decoder_config_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_proxy_api/group"/>
-   </component>
-   <component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/added_devsound_control_api/added_devsound_control_api.metaxml"/>
-    <unit bldFile="mm_plat/added_devsound_control_api/group"/>
-   </component>
-   <component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/added_devsound_control_msg_hdlr_api/added_devsound_control_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-   </component>
-   <component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/added_devsound_control_proxy_api/added_devsound_control_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/added_devsound_control_proxy_api/group"/>
-   </component>
-   <component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_effects_msg_hdlr_api/audio_effects_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_effects_msg_hdlr_api/group"/>
-   </component>
-   <component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_effects_proxy_api/audio_effects_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_effects_proxy_api/group"/>
-   </component>
-   <component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_policy_header_api/audio_policy_header_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_policy_header_api/group"/>
-   </component>
-   <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_routing_api/audio_routing_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_api/group"/>
-   </component>
-   <component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_routing_msg_hdlr_api/audio_routing_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_msg_hdlr_api/group"/>
-   </component>
-   <component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/audio_routing_proxy_api/audio_routing_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_proxy_api/group"/>
-   </component>
-   <component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_builder_api/custom_interface_builder_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_builder_api/group"/>
-   </component>
-   <component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_message_handler_factory_api/custom_interface_message_handler_factory_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_message_handler_factory_api/group"/>
-   </component>
-   <component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_proxy_factory_api/custom_interface_proxy_factory_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_proxy_factory_api/group"/>
-   </component>
-   <component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/custom_interface_utility_api/custom_interface_utility_api.metaxml"/>
-    <unit bldFile="mm_plat/custom_interface_utility_api/group"/>
-   </component>
-   <component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/devsound_adaptation_api/devsound_adaptation_api.metaxml"/>
-    <unit bldFile="mm_plat/devsound_adaptation_api/group"/>
-   </component>
-   <component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/display_posting_api/display_posting_api.metaxml"/>
-    <unit bldFile="mm_plat/display_posting_api/group"/>
-   </component>
-   <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_api/eaac_plus_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group"/>
-   </component>
-   <component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/eaac_plus_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_proxy_api/eaac_plus_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/error_concealment_interface_api/error_concealment_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_api/group"/>
-   </component>
-   <component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/error_concealment_interface_msg_hdlr_api/error_concealment_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/error_concealment_interface_proxy_api/error_concealment_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_proxy_api/group"/>
-   </component>
-   <component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/fm_radio_adaptation_api/fm_radio_adaptation_api.metaxml"/>
-    <unit bldFile="mm_plat/fm_radio_adaptation_api/group"/>
-   </component>
-   <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_decoder_interface_api/g711_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_api/group"/>
-   </component>
-   <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_decoder_interface_msg_hdlr_api/g711_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_decoder_interface_proxy_api/g711_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_encoder_interface_api/g711_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_api/group"/>
-   </component>
-   <component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_encoder_interface_msg_hdlr_api/g711_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g711_encoder_interface_proxy_api/g711_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_decoder_interface_api/g729_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_api/group"/>
-   </component>
-   <component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_decoder_interface_msg_hdlr_api/g729_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_decoder_interface_proxy_api/g729_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_encoder_interface_api/g729_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_api/group"/>
-   </component>
-   <component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_encoder_interface_proxy_api/g729_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/g729_encoder_interface_msg_hdlr_api/g729_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/global_audio_settings_api/global_audio_settings_api.metaxml"/>
-    <unit bldFile="mm_plat/global_audio_settings_api/group"/>
-   </component>
-   <component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/global_audio_settings_definition_api/global_audio_settings_definition_api.metaxml"/>
-    <unit bldFile="mm_plat/global_audio_settings_definition_api/group"/>
-   </component>
-   <component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_api/ilbc_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group"/>
-   </component>
-   <component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_msg_hdlr_api/ilbc_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_decoder_interface_proxy_api/ilbc_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_api/ilbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group"/>
-   </component>
-   <component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_msg_hdlr_api/ilbc_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ilbc_encoder_interface_proxy_api/ilbc_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/mdf_plugin_uids/mdf_plugin_uids.metaxml"/>
-    <unit bldFile="mm_plat/mdf_plugin_uids/group"/>
-   </component>
-   <component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/multimedia_fourcc_definitions_api/multimedia_fourcc_definitions_api.metaxml"/>
-    <unit bldFile="mm_plat/multimedia_fourcc_definitions_api/group"/>
-   </component>
-   <component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/nokia_audio_policy_header_api/nokia_audio_policy_header_api.metaxml"/>
-    <unit bldFile="mm_plat/nokia_audio_policy_header_api/group"/>
-   </component>
-   <component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/nokia_multimedia_fourcc_definitions_api/nokia_multimedia_fourcc_definitions_api.metaxml"/>
-    <unit bldFile="mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-   </component>
-   <component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ra8_decoder_interface_api/ra8_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_api/group"/>
-   </component>
-   <component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ra8_decoder_interface_msg_hdlr_api/ra8_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/ra8_decoder_interface_proxy_api/ra8_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/rds_adaptation_api/rds_adaptation_api.metaxml"/>
-    <unit bldFile="mm_plat/rds_adaptation_api/group"/>
-   </component>
-   <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/restricted_audio_output_api/restricted_audio_output_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_api/group"/>
-   </component>
-   <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/restricted_audio_output_msg_hdlr_api/restricted_audio_output_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-   </component>
-   <component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/restricted_audio_output_proxy_api/restricted_audio_output_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_proxy_api/group"/>
-   </component>
-   <component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/sbc_encoder_interface_api/sbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_api/group"/>
-   </component>
-   <component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/sbc_encoder_interface_msg_hdlr_api/sbc_encoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/sbc_encoder_interface_proxy_api/sbc_encoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_proxy_api/group"/>
-   </component>
-   <component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/secure_output_mdf_custom_interface/secure_output_mdf_custom_interface.metaxml"/>
-    <unit bldFile="mm_plat/secure_output_mdf_custom_interface/group"/>
-   </component>
-   <component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/speech_encoder_config_api/speech_encoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_api/group"/>
-   </component>
-   <component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/speech_encoder_config_msg_hdlr_api/speech_encoder_config_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
-   </component>
-   <component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/speech_encoder_config_proxy_api/speech_encoder_config_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_proxy_api/group"/>
-   </component>
-   <component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/telephony_audio_routing_client_api/telephony_audio_routing_client_api.metaxml"/>
-    <unit bldFile="mm_plat/telephony_audio_routing_client_api/group"/>
-   </component>
-   <component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/telephony_audio_routing_manager_api/telephony_audio_routing_manager_api.metaxml"/>
-    <unit bldFile="mm_plat/telephony_audio_routing_manager_api/group"/>
-   </component>
-   <component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/video_buffer_management_mdf_custom_interface/video_buffer_management_mdf_custom_interface.metaxml"/>
-    <unit bldFile="mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-   </component>
-   <component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/video_decoder_rotation_mdf_custom_interface/video_decoder_rotation_mdf_custom_interface.metaxml"/>
-    <unit bldFile="mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-   </component>
-   <component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/video_decoder_scaling_mdf_custom_interface/video_decoder_scaling_mdf_custom_interface.metaxml"/>
-    <unit bldFile="mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-   </component>
-   <component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/video_reclaim_extbuffers_ci/video_reclaim_extbuffers_ci.metaxml"/>
-    <unit bldFile="mm_plat/video_reclaim_extbuffers_ci/group"/>
-   </component>
-   <component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/video_window_control_custom_interface/video_window_control_custom_interface.metaxml"/>
-    <unit bldFile="mm_plat/video_window_control_custom_interface/group"/>
-   </component>
-   <component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/wma_decoder_interface_api/wma_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_api/group"/>
-   </component>
-   <component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/wma_decoder_interface_msg_hdlr_api/wma_decoder_interface_msg_hdlr_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-   </component>
-   <component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/wma_decoder_interface_proxy_api/wma_decoder_interface_proxy_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_proxy_api/group"/>
-   </component>
-   <component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml"/>
-    <unit bldFile="mm_plat/eaacplusutil_api/group"/>
-   </component>
-   <component id="frametable_api" name="Frametable API" class="api" filter="s60">
-    <meta rel="Api" href="mm_plat/frametable_api/frametable_api.metaxml"/>
-    <unit bldFile="mm_plat/frametable_api/group"/>
-   </component>
-  </collection>
-  <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
-   <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
-    <unit bldFile="devsoundextensions/drmaudioplayer/group"/>
-   </component>
-   <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
-    <unit bldFile="devsoundextensions/mmextfw/group"/>
-   </component>
-   <component id="audiorouting" filter="s60" name="Audio Routing">
-    <unit bldFile="devsoundextensions/audiorouting/group"/>
-   </component>
-   <component id="effects" filter="s60" name="Effects">
-    <unit bldFile="devsoundextensions/effects/group"/>
-   </component>
-   <component id="effectspresets" filter="s60" name="Effects Presets">
-    <unit bldFile="devsoundextensions/effectspresets/group"/>
-   </component>
-   <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-    <!-- need to #include the lot from a single bld.inf
-      		Also move to a standard component location, not under effectspresets -->
-    <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-    <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-   </component>
-   <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
-    <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
-   </component>
-   <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
-    <unit bldFile="devsoundextensions/mmfcustominterfaces/group"/>
-   </component>
-   <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
-    <unit bldFile="devsoundextensions/addeddevsoundcontrol/group"/>
-   </component>
-   <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
-    <unit bldFile="devsoundextensions/globalaudiosettings/group"/>
-   </component>
-   <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
-    <unit bldFile="devsoundextensions/restrictedaudiooutput/group"/>
-   </component>
-   <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
-    <unit bldFile="devsoundextensions/ciextnfactoryplugins/group"/>
-   </component>
-  </collection>
-  <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
-   <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
-    <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-   </component>
-  </collection>
-  <collection id="audio" name="Audio Codecs" level="middleware">
-   <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
-    <unit bldFile="audio/arm_cmmf_codecs/group"/>
-   </component>
-  </collection>
-  <collection id="video" name="Video Codecs" level="middleware">
-   <!-- empty -->
-  </collection>
-  <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
-   <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-   </component>
-   <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
-   </component>
-   <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
-   </component>
-   <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
-    <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-   </component>
-   <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
-    <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
-   </component>
-  </collection>
-  <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
-   <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-    <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-   </component>
-   <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
-   <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-   </component>
-   <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-   </component>
-   <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
-    <unit bldFile="mmplugins/lib3gp/group" mrp="mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-   </component>
-   <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
-   </component>
-   <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-   </component>
-  </collection>
-  <collection id="mm_info" name="Multimedia Info" level="app-if">
-   <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
-    <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
-   </component>
-   <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
-    <unit bldFile="tsrc/group"/>
-   </component>
-   <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
-   <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
-    <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
-   <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
-    <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-   </component>
-   <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
-    <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
-   </component>
-   <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
-   <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
-    <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
-   <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
-   </component>
-   <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
-   </component>
-   <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
-   </component>
-   <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
-    <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
-   </component>
-  </collection>
-  <collection id="omxil" name="OpenMAX IL" level="hw-if">
-   <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
-   </component>
-   <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
-   </component>
-   <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
-   </component>
-   <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
-   </component>
-   <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
-    <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
-   </component>
-   <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
-    <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
-   </component>
-   <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-    <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
-   </component>
-  </collection>
-  <collection id="devsound" name="Sound Device" level="devices">
-   <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-   </component>
-   <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
-    <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-   </component>
-   <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-    <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-   </component>
-   <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-    <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-   </component>
-   <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-    <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
-   </component>
-   <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
-    <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-   </component>
-   <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
-    <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-   </component>
-   <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
-   </component>
-   <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
-    <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-   </component>
-  </collection>
-  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-   <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-    <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
-   </component>
-   <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
-    <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-   </component>
-   <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-    <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-   </component>
-   <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-    <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-   </component>
-   <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>
-   </component>
-   <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
-    <unit bldFile="mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-   </component>
-   <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/networkingsrv/package_definition.xml
--- a/symbian4/os/networkingsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/networkingsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,244 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-          <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
-          </component>
-        </collection>
-        <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-          <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-          </component>
-          <component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" filter="test" class="config">
-            <unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="/sf/os/networkingsrv/tcpiputils/dnd/data"/>
-          </component>
-          <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-            <unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-          </component>
-          <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-          </component>
-          <component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-          </component>
-        </collection>
-        <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-          <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-          </component>
-          <component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-          </component>
-          <component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-          </component>
-          <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-          </component>
-        </collection>
-        <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-          <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-          </component>
-          <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" filter="test" plugin="Y">
-            <unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group"/>
-          </component>
-          <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-          </component>
-          <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" filter="test" class="config">
-            <unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/data" version="2"/>
-          </component>
-          <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-          </component>
-          <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-          </component>
-        </collection>
-        <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-          <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-            <unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkcontrol" long-name="Network Control" level="plugin">
-          <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" filter="test" deprecated="^4" class="config">
-            <unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/data"/>
-          </component>
-          <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-          </component>
-          <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-          </component>
-          <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-          </component>
-          <component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-          </component>
-          <component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-          </component>
-          <component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-          </component>
-          <component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-          <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" filter="test" class="config">
-            <unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/data"/>
-          </component>
-          <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-          </component>
-          <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-          </component>
-          <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-          </component>
-          <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-          </component>
-          <component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-          </component>
-        </collection>
-        <collection name="networksecurity" long-name="Network Security" level="framework">
-          <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-          </component>
-          <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-            <unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-          </component>
-          <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-            <unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-          <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
-            <unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group"/>
-          </component>
-          <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
-            <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
-          </component>
-          <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
-            <unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group"/>
-          </component>
-          <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" filter="test" plugin="Y">
-            <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group"/>
-          </component>
-          <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" filter="test" plugin="Y">
-            <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group"/>
-          </component>
-          <component name="ipanalyzer" long-name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-            <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group"/>
-          </component>
-          <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-            <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-          </component>
-          <component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
-            <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-          </component>
-        </collection>
-        <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-          <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
-            <!--  production component: contains the IBY files -->
-            <unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-          </component>
-          <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-          </component>
-          <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-          </component>
-        </collection>
-        <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-          <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
+      <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
+        <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+      </component>
+    </collection>
+    <collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+      <component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+        <unit bldFile="tcpiputils/dnd/group" mrp="tcpiputils/dnd/group/networking_dnd.mrp"/>
+      </component>
+      <component id="dndconfig" name="DND Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+        <unit mrp="tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="tcpiputils/dnd/data"/>
+      </component>
+      <component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+        <unit bldFile="tcpiputils/dhcp/group" mrp="tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+      </component>
+      <component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+        <unit bldFile="tcpiputils/networkaddressandporttranslation/group" mrp="tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+      </component>
+      <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+        <unit bldFile="tcpiputils/punycodeconv/group" mrp="tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+      </component>
+    </collection>
+    <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+      <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="linklayercontrol/nullagt/group" mrp="linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+      </component>
+      <component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+        <unit bldFile="linklayercontrol/genericscprparameters/group" mrp="linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+      </component>
+      <component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="linklayercontrol/mbmsparameters/group" mrp="linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+      </component>
+      <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+        <unit version="2" bldFile="linklayercontrol/networkinterfacemgr/group" mrp="linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+      </component>
+    </collection>
+    <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+      <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+        <unit bldFile="linklayerprotocols/ethernetnif/group" mrp="linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+      </component>
+      <component id="ethernetpacketdriver" name="Ethernet Packet Driver" introduced="7.0" purpose="optional" class="plugin" filter="test">
+        <unit mrp="linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="linklayerprotocols/ethernetpacketdriver/group"/>
+      </component>
+      <component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+        <unit version="2" bldFile="linklayerprotocols/pppnif/group" mrp="linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+      </component>
+      <component id="pppconfig" name="PPP Config" introduced="ER5" purpose="optional" class="config" filter="test">
+        <unit version="2" mrp="linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="linklayerprotocols/pppnif/data"/>
+      </component>
+      <component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+        <unit bldFile="linklayerprotocols/slipnif/group" mrp="linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+      </component>
+      <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="linklayerprotocols/tunnelnif/group" mrp="linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+      </component>
+    </collection>
+    <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+      <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+        <unit bldFile="linklayerutils/packetlogger/group" mrp="linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkcontrol" name="Network Control" level="plugin">
+      <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test" deprecated="^4">
+        <unit mrp="networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="networkcontrol/qosfwconfig/qos/data"/>
+      </component>
+      <component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+        <unit bldFile="networkcontrol/qoslib/group" mrp="networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+      </component>
+      <component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+        <unit bldFile="networkcontrol/pfqoslib/group" mrp="networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+      </component>
+      <component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="networkcontrol/qosfwconfig/qos/group" mrp="networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+      </component>
+      <component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+        <unit bldFile="networkcontrol/qosipscpr/group" mrp="networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+      </component>
+      <component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkcontrol/ipnetworklayer/group" mrp="networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+      </component>
+      <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+      </component>
+      <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+        <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkprotocols" name="Network Protocols" level="plugin">
+      <component id="tcpipv4config" name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+        <unit mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="networkprotocols/tcpipv4v6prt/data"/>
+      </component>
+      <component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+        <unit bldFile="networkprotocols/ipeventnotifier/group" mrp="networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+      </component>
+      <component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+        <unit bldFile="networkprotocols/tcpipv4v6prt/group" mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+      </component>
+      <component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+        <unit bldFile="networkprotocols/iphook/inhook6/group" mrp="networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+      </component>
+      <component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocols/mobileip/group" mrp="networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+      </component>
+      <component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+        <unit bldFile="networkprotocols/dnsproxy/group" mrp="networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+      </component>
+    </collection>
+    <collection id="networksecurity" name="Network Security" level="framework">
+      <component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+        <unit bldFile="networksecurity/tls/group" mrp="networksecurity/tls/group/networking_tls.mrp"/>
+      </component>
+      <component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+        <unit bldFile="networksecurity/tlsprovider/group" mrp="networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+      </component>
+      <component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+        <unit bldFile="networksecurity/ipsec/group" mrp="networksecurity/ipsec/group/networking_ipsec.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+      <component id="networkingunittest" name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="networkingtestandutils/networkingunittest/group"/>
+      </component>
+      <component id="networkingexamples" name="Networking Examples" introduced="7.0" purpose="development">
+        <unit bldFile="networkingtestandutils/networkingexamples/examplecode/group" mrp="networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+      </component>
+      <component id="exampleinternetutilities" name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
+        <unit mrp="networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="networkingtestandutils/exampleinternetutilities/group"/>
+      </component>
+      <component id="ipprobe" name="IP Probe" introduced="7.0s" purpose="development" class="plugin" filter="test">
+        <unit mrp="networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="networkingtestandutils/ipprobe/group"/>
+      </component>
+      <component id="ipv6to4tunnel" name="IPv6 to 4 Tunnel" purpose="development" class="plugin" filter="test">
+        <unit mrp="networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="networkingtestandutils/ipv6to4tunnel/group"/>
+      </component>
+      <component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="networkingtestandutils/ipanalyzer/group"/>
+      </component>
+      <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+        <unit bldFile="networkingtestandutils/networkingintegrationtest/Group" mrp="networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+      </component>
+      <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+        <unit bldFile="networkingtestandutils/networkingperformancemeasurementtools/group" mrp="networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+      <component id="networkingrom" name="Networking ROM" purpose="mandatory">
+        <!--  production component: contains the IBY files -->
+        <unit bldFile="networkingsrv_info/networkingrom/group" mrp="networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+      </component>
+      <component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+        <unit mrp="networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+      </component>
+      <component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+      </component>
+    </collection>
+    <collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+      <component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+        <unit bldFile="pppcompressionplugins/predictorcompression/group" mrp="pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/networkingsrv/package_definition_3.0.xml
--- a/symbian4/os/networkingsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
-      <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
-        <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
-      </component>
-    </collection>
-    <collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
-      <component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
-        <unit bldFile="tcpiputils/dnd/group" mrp="tcpiputils/dnd/group/networking_dnd.mrp"/>
-      </component>
-      <component id="dndconfig" name="DND Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
-        <unit mrp="tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="tcpiputils/dnd/data"/>
-      </component>
-      <component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
-        <unit bldFile="tcpiputils/dhcp/group" mrp="tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-      </component>
-      <component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
-        <unit bldFile="tcpiputils/networkaddressandporttranslation/group" mrp="tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-      </component>
-      <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
-        <unit bldFile="tcpiputils/punycodeconv/group" mrp="tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-      </component>
-    </collection>
-    <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
-      <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="linklayercontrol/nullagt/group" mrp="linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-      </component>
-      <component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
-        <unit bldFile="linklayercontrol/genericscprparameters/group" mrp="linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-      </component>
-      <component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="linklayercontrol/mbmsparameters/group" mrp="linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-      </component>
-      <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-        <unit version="2" bldFile="linklayercontrol/networkinterfacemgr/group" mrp="linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
-      </component>
-    </collection>
-    <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
-      <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
-        <unit bldFile="linklayerprotocols/ethernetnif/group" mrp="linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-      </component>
-      <component id="ethernetpacketdriver" name="Ethernet Packet Driver" introduced="7.0" purpose="optional" class="plugin" filter="test">
-        <unit mrp="linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="linklayerprotocols/ethernetpacketdriver/group"/>
-      </component>
-      <component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
-        <unit version="2" bldFile="linklayerprotocols/pppnif/group" mrp="linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
-      </component>
-      <component id="pppconfig" name="PPP Config" introduced="ER5" purpose="optional" class="config" filter="test">
-        <unit version="2" mrp="linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="linklayerprotocols/pppnif/data"/>
-      </component>
-      <component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
-        <unit bldFile="linklayerprotocols/slipnif/group" mrp="linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-      </component>
-      <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="linklayerprotocols/tunnelnif/group" mrp="linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-      </component>
-    </collection>
-    <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
-      <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
-        <unit bldFile="linklayerutils/packetlogger/group" mrp="linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkcontrol" name="Network Control" level="plugin">
-      <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test" deprecated="^4">
-        <unit mrp="networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="networkcontrol/qosfwconfig/qos/data"/>
-      </component>
-      <component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
-        <unit bldFile="networkcontrol/qoslib/group" mrp="networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-      </component>
-      <component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
-        <unit bldFile="networkcontrol/pfqoslib/group" mrp="networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-      </component>
-      <component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="networkcontrol/qosfwconfig/qos/group" mrp="networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-      </component>
-      <component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
-        <unit bldFile="networkcontrol/qosipscpr/group" mrp="networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-      </component>
-      <component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="networkcontrol/ipnetworklayer/group" mrp="networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-      </component>
-      <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-      </component>
-      <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
-        <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkprotocols" name="Network Protocols" level="plugin">
-      <component id="tcpipv4config" name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
-        <unit mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="networkprotocols/tcpipv4v6prt/data"/>
-      </component>
-      <component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
-        <unit bldFile="networkprotocols/ipeventnotifier/group" mrp="networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-      </component>
-      <component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
-        <unit bldFile="networkprotocols/tcpipv4v6prt/group" mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-      </component>
-      <component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
-        <unit bldFile="networkprotocols/iphook/inhook6/group" mrp="networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-      </component>
-      <component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
-        <unit bldFile="networkprotocols/mobileip/group" mrp="networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-      </component>
-      <component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
-        <unit bldFile="networkprotocols/dnsproxy/group" mrp="networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-      </component>
-    </collection>
-    <collection id="networksecurity" name="Network Security" level="framework">
-      <component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
-        <unit bldFile="networksecurity/tls/group" mrp="networksecurity/tls/group/networking_tls.mrp"/>
-      </component>
-      <component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
-        <unit bldFile="networksecurity/tlsprovider/group" mrp="networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-      </component>
-      <component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
-        <unit bldFile="networksecurity/ipsec/group" mrp="networksecurity/ipsec/group/networking_ipsec.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
-      <component id="networkingunittest" name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="networkingtestandutils/networkingunittest/group"/>
-      </component>
-      <component id="networkingexamples" name="Networking Examples" introduced="7.0" purpose="development">
-        <unit bldFile="networkingtestandutils/networkingexamples/examplecode/group" mrp="networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
-      </component>
-      <component id="exampleinternetutilities" name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
-        <unit mrp="networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="networkingtestandutils/exampleinternetutilities/group"/>
-      </component>
-      <component id="ipprobe" name="IP Probe" introduced="7.0s" purpose="development" class="plugin" filter="test">
-        <unit mrp="networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="networkingtestandutils/ipprobe/group"/>
-      </component>
-      <component id="ipv6to4tunnel" name="IPv6 to 4 Tunnel" purpose="development" class="plugin" filter="test">
-        <unit mrp="networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="networkingtestandutils/ipv6to4tunnel/group"/>
-      </component>
-      <component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="networkingtestandutils/ipanalyzer/group"/>
-      </component>
-      <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
-        <unit bldFile="networkingtestandutils/networkingintegrationtest/Group" mrp="networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-      </component>
-      <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
-        <unit bldFile="networkingtestandutils/networkingperformancemeasurementtools/group" mrp="networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
-      <component id="networkingrom" name="Networking ROM" purpose="mandatory">
-        <!--  production component: contains the IBY files -->
-        <unit bldFile="networkingsrv_info/networkingrom/group" mrp="networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-      </component>
-      <component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
-        <unit mrp="networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-      </component>
-      <component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
-      <component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
-        <unit bldFile="pppcompressionplugins/predictorcompression/group" mrp="pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/osrndtools/package_definition.xml
--- a/symbian4/os/osrndtools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,197 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
-        <collection name="stif" long-name="STIF" level="fw">
-          <component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
-            <unit bldFile="/sf/os/osrndtools/stif/stif_plat/group"/>
-          </component>
-          <component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/testinterface/group"/>
-          </component>
-          <component name="testserver" filter="s60" long-name="Test Server" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/testserver/group"/>
-          </component>
-          <component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/testengine/group"/>
-          </component>
-          <component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/testserverstarter/group"/>
-          </component>
-          <component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/stiftfwif/group"/>
-          </component>
-          <component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/consoleui/group"/>
-          </component>
-          <component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/testcombiner/group"/>
-          </component>
-          <component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/demomodule/group"/>
-          </component>
-          <component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/atslogger/group"/>
-          </component>
-          <component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/atsinterface/group"/>
-          </component>
-          <component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/testscripter/group"/>
-          </component>
-          <component name="suevent" filter="s60" long-name="SU Event" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/stif/suevent/group"/>
-          </component>
-          <component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-            <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-          </component>
-          <component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-            <!--  move exports into self-contained component. Remove this when configuration is in place-->
-            <unit bldFile="/sf/os/osrndtools/stif/group"/>
-          </component>
-        </collection>
-        <collection name="memspy" long-name="Memspy" level="trace">
-          <component name="memspy_plat" filter="s60" long-name="Memspy Platform Interfaces" purpose="development" class="api">
-            <unit bldFile="/sf/os/osrndtools/memspy/memspy_plat/group"/>
-          </component>
-          <component name="driver" filter="s60" long-name="Memspy Driver" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/memspy/driver/group"/>
-          </component>
-          <component name="memspy_engine" filter="s60" long-name="Memspy Engine" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/memspy/engine/group"/>
-          </component>
-          <component name="commandline" filter="s60" long-name="Memspy Command Line" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/memspy/commandline/group"/>
-          </component>
-          <component name="console" filter="s60" long-name="Memspy Console" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/memspy/console/group"/>
-          </component>
-          <component name="memspy_build" filter="s60" long-name="Memspy Build" purpose="development">
-            <!--  move exports into self-contained component.-->
-            <unit bldFile="/sf/os/osrndtools/memspy/group"/>
-          </component>
-        </collection>
-        <collection name="hti" long-name="Harmonized Test Interface" level="trace">
-          <component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
-            <unit bldFile="/sf/os/osrndtools/hti/hti_plat/group"/>
-          </component>
-          <component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/hti/hticfg/group"/>
-          </component>
-          <component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/hti/htiautostart/group"/>
-          </component>
-          <component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/hti/htiframework/group"/>
-          </component>
-          <component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
-            <!-- need to #include these from a single unit or separate into component at the right directory level -->
-            <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-          </component>
-          <component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-            <!-- need to #include these from a single unit or separate into component at the right directory level -->
-            <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-            <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-          </component>
-          <component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/hti/htifilehlp/group"/>
-          </component>
-          <component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
-            <unit bldFile="/sf/os/osrndtools/hti/htiwatchdog/group"/>
-          </component>
-          <component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
-            <!--  move exports into self-contained component.-->
-            <unit bldFile="/sf/os/osrndtools/hti/group"/>
-          </component>
-        </collection>
-        <collection name="osrndtools_info" long-name="OS R&amp;D tools Info" level="trace">
-          <component name="osrndtools_metadata" long-name="OS R&amp;D tools Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace">
+  <collection id="stif" name="STIF" level="fw">
+    <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="stif/stif_plat/group"/>
+    </component>
+   <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
+    <unit bldFile="stif/testinterface/group"/>
+   </component>
+   <component id="testserver" filter="s60" name="Test Server" purpose="development">
+    <unit bldFile="stif/testserver/group"/>
+   </component>
+   <component id="testengine" filter="s60" name="Test Engine" purpose="development">
+    <unit bldFile="stif/testengine/group"/>
+   </component>
+   <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+    <unit bldFile="stif/testserverstarter/group"/>
+   </component>
+   <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+    <unit bldFile="stif/stiftfwif/group"/>
+   </component>
+   <component id="consoleui" filter="s60" name="Console UI" purpose="development">
+    <unit bldFile="stif/consoleui/group"/>
+   </component>
+   <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+    <unit bldFile="stif/testcombiner/group"/>
+   </component>
+   <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+    <unit bldFile="stif/demomodule/group"/>
+   </component>
+   <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+    <unit bldFile="stif/atslogger/group"/>
+   </component>
+   <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+    <unit bldFile="stif/atsinterface/group"/>
+   </component>
+   <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+    <unit bldFile="stif/testscripter/group"/>
+   </component>
+   <component id="suevent" filter="s60" name="SU Event" purpose="development">
+    <unit bldFile="stif/suevent/group"/>
+   </component>
+   <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+    <meta rel="config">
+     <defined condition="__S60_"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+    <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+   </component>
+   <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+    <!--  move exports into self-contained component. Remove this when configuration is in place-->
+    <unit bldFile="stif/group"/>
+   </component>
+  </collection>
+  <collection id="memspy" name="Memspy" level="trace">
+    <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+    <meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
+      <unit bldFile="memspy/memspy_plat/group"/>
+    </component>
+   <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+    <unit bldFile="memspy/driver/group"/>
+   </component>
+   <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+    <unit bldFile="memspy/engine/group"/>
+   </component>
+   <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+    <unit bldFile="memspy/commandline/group"/>
+   </component>
+   <component id="console" filter="s60" name="Memspy Console" purpose="development">
+    <unit bldFile="memspy/console/group"/>
+   </component>
+   <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+    <!--  move exports into self-contained component.-->
+    <unit bldFile="memspy/group"/>
+   </component>
+  </collection>
+  <collection id="hti" name="Harmonized Test Interface" level="trace">
+    <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+    <meta rel="Api" href="hti/hti_plat/hti_api/hti_api.metaxml"/>
+      <unit bldFile="hti/hti_plat/group"/>
+    </component>
+   <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
+    <unit bldFile="hti/hticfg/group"/>
+   </component>
+   <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
+    <unit bldFile="hti/htiautostart/group"/>
+   </component>
+   <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+    <unit bldFile="hti/htiframework/group"/>
+   </component>
+   <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+    <!-- need to #include these from a single unit or separate into component at the right directory level -->
+    <unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+    <unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+    <unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+    <unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+   </component>
+   <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+    <!-- need to #include these from a single unit or separate into component at the right directory level -->
+    <unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+   </component>
+   <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
+    <unit bldFile="hti/htifilehlp/group"/>
+   </component>
+   <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+    <unit bldFile="hti/htiwatchdog/group"/>
+   </component>
+   <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+    <!--  move exports into self-contained component.-->
+    <unit bldFile="hti/group"/>
+   </component>
+  </collection>
+  <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
+   <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/osrndtools/package_definition_3.0.xml
--- a/symbian4/os/osrndtools/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace">
-  <collection id="stif" name="STIF" level="fw">
-    <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
-      <unit bldFile="stif/stif_plat/group"/>
-    </component>
-   <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
-    <unit bldFile="stif/testinterface/group"/>
-   </component>
-   <component id="testserver" filter="s60" name="Test Server" purpose="development">
-    <unit bldFile="stif/testserver/group"/>
-   </component>
-   <component id="testengine" filter="s60" name="Test Engine" purpose="development">
-    <unit bldFile="stif/testengine/group"/>
-   </component>
-   <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
-    <unit bldFile="stif/testserverstarter/group"/>
-   </component>
-   <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
-    <unit bldFile="stif/stiftfwif/group"/>
-   </component>
-   <component id="consoleui" filter="s60" name="Console UI" purpose="development">
-    <unit bldFile="stif/consoleui/group"/>
-   </component>
-   <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
-    <unit bldFile="stif/testcombiner/group"/>
-   </component>
-   <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
-    <unit bldFile="stif/demomodule/group"/>
-   </component>
-   <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
-    <unit bldFile="stif/atslogger/group"/>
-   </component>
-   <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
-    <unit bldFile="stif/atsinterface/group"/>
-   </component>
-   <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
-    <unit bldFile="stif/testscripter/group"/>
-   </component>
-   <component id="suevent" filter="s60" name="SU Event" purpose="development">
-    <unit bldFile="stif/suevent/group"/>
-   </component>
-   <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
-    <meta rel="config">
-     <defined condition="__S60_"/>
-    </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-    <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-   </component>
-   <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
-    <!--  move exports into self-contained component. Remove this when configuration is in place-->
-    <unit bldFile="stif/group"/>
-   </component>
-  </collection>
-  <collection id="memspy" name="Memspy" level="trace">
-    <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
-    <meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
-      <unit bldFile="memspy/memspy_plat/group"/>
-    </component>
-   <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
-    <unit bldFile="memspy/driver/group"/>
-   </component>
-   <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
-    <unit bldFile="memspy/engine/group"/>
-   </component>
-   <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
-    <unit bldFile="memspy/commandline/group"/>
-   </component>
-   <component id="console" filter="s60" name="Memspy Console" purpose="development">
-    <unit bldFile="memspy/console/group"/>
-   </component>
-   <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
-    <!--  move exports into self-contained component.-->
-    <unit bldFile="memspy/group"/>
-   </component>
-  </collection>
-  <collection id="hti" name="Harmonized Test Interface" level="trace">
-    <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
-    <meta rel="Api" href="hti/hti_plat/hti_api/hti_api.metaxml"/>
-      <unit bldFile="hti/hti_plat/group"/>
-    </component>
-   <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
-    <unit bldFile="hti/hticfg/group"/>
-   </component>
-   <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
-    <unit bldFile="hti/htiautostart/group"/>
-   </component>
-   <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
-    <unit bldFile="hti/htiframework/group"/>
-   </component>
-   <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
-    <!-- need to #include these from a single unit or separate into component at the right directory level -->
-    <unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-    <unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-    <unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-    <unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
-   </component>
-   <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
-    <!-- need to #include these from a single unit or separate into component at the right directory level -->
-    <unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-    <unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-    <unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-    <unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-    <unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
-   </component>
-   <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
-    <unit bldFile="hti/htifilehlp/group"/>
-   </component>
-   <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
-    <unit bldFile="hti/htiwatchdog/group"/>
-   </component>
-   <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
-    <!--  move exports into self-contained component.-->
-    <unit bldFile="hti/group"/>
-   </component>
-  </collection>
-  <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
-   <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/ossrv/package_definition.xml
--- a/symbian4/os/ossrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,492 +1,501 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-        <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-          <component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/boost_apis/group"/>
-          </component>
-          <component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-          </component>
-          <component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/character_type_apis/group"/>
-          </component>
-          <component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-          </component>
-          <component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/configuration/group"/>
-          </component>
-          <component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-          </component>
-          <component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-          </component>
-          <component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-          </component>
-          <component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-          </component>
-          <component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-          </component>
-          <component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-          </component>
-          <component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-          </component>
-          <component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-          </component>
-          <component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/debug/group"/>
-          </component>
-          <component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/exceptions/group"/>
-          </component>
-          <component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/gboxed/group"/>
-          </component>
-          <component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_arrays/group"/>
-          </component>
-          <component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-          </component>
-          <component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-          </component>
-          <component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-          </component>
-          <component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-          </component>
-          <component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_basic_types/group"/>
-          </component>
-          <component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_caches/group"/>
-          </component>
-          <component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-          </component>
-          <component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_closures/group"/>
-          </component>
-          <component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-          </component>
-          <component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_datasets/group"/>
-          </component>
-          <component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-          </component>
-          <component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-          </component>
-          <component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-          </component>
-          <component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-          </component>
-          <component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-          </component>
-          <component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-          </component>
-          <component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-          </component>
-          <component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_generic_values/group"/>
-          </component>
-          <component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-          </component>
-          <component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-          </component>
-          <component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-          </component>
-          <component name="glib_internationalization" long-name="Glib  Internationalization API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_internationalization/group"/>
-          </component>
-          <component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_io_channels/group"/>
-          </component>
-          <component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-          </component>
-          <component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-          </component>
-          <component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-          </component>
-          <component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-          </component>
-          <component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-          </component>
-          <component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_message_logging/group"/>
-          </component>
-          <component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-          </component>
-          <component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-          </component>
-          <component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-          </component>
-          <component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_quarks/group"/>
-          </component>
-          <component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-          </component>
-          <component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-          </component>
-          <component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-          </component>
-          <component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_signals/group"/>
-          </component>
-          <component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-          </component>
-          <component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-          </component>
-          <component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-          </component>
-          <component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-          </component>
-          <component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-          </component>
-          <component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_strings/group"/>
-          </component>
-          <component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-          </component>
-          <component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_threads/group"/>
-          </component>
-          <component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_timers/group"/>
-          </component>
-          <component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-          </component>
-          <component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-          </component>
-          <component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-          </component>
-          <component name="gobject" long-name="GObject API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/gobject/group"/>
-          </component>
-          <component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/gparamspec/group"/>
-          </component>
-          <component name="gtype" long-name="GType API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/gtype/group"/>
-          </component>
-          <component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/gtypemodule/group"/>
-          </component>
-          <component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/gtypeplugin/group"/>
-          </component>
-          <component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/io_stream_api/group"/>
-          </component>
-          <component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/localization_function_api/group"/>
-          </component>
-          <component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/math_operations_api/group"/>
-          </component>
-          <component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/memory/group"/>
-          </component>
-          <component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-          </component>
-          <component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/openc_headers/group"/>
-          </component>
-          <component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/openc_wrappers/group"/>
-          </component>
-          <component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/ssl_general_api/group"/>
-          </component>
-          <component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-          </component>
-          <component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-          </component>
-          <component name="stl" long-name="STL API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/stl/group"/>
-          </component>
-          <component name="thread_api" long-name="Thread API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/thread_api/group"/>
-          </component>
-          <component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/type_attributes/group"/>
-          </component>
-          <component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/typeinfo/group"/>
-          </component>
-          <component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/utility_apis/group"/>
-          </component>
-          <component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-          </component>
-          <component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/dbus/group"/>
-          </component>
-          <component name="dbus-glib_api" long-name="D-Bus GLib API" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/dbus-glib/group"/>
-          </component>
-        </collection>
-        <collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-          <component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
-          </component>
-        </collection>
-        <collection name="stdlibs" long-name="Standard Libraries" level="translation">
-          <component name="libz" filter="s60" long-name="Z Compression Library">
-            <unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
-          </component>
-          <component name="libcrypt" filter="s60" long-name="Crypt Library">
-            <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
-          </component>
-        </collection>
-        <collection name="ssl" long-name="SSL" level="data-services">
-          <component name="libcrypto" filter="s60" long-name="Crypto Library">
-            <unit bldFile="/sf/os/ossrv/ssl/libcrypto/group"/>
-          </component>
-          <component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
-            <unit bldFile="/sf/os/ossrv/ssl/libssl/group"/>
-          </component>
-        </collection>
-        <collection name="glib" long-name="GLib" level="utilities">
-          <component name="glibbackend" filter="s60" long-name="GLib Backend">
-            <unit bldFile="/sf/os/ossrv/glib/build/symbian/glibbackend/group"/>
-            <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-          </component>
-          <component name="libglib" filter="s60" long-name="GLib Library">
-            <unit bldFile="/sf/os/ossrv/glib/build/symbian/glib/group"/>
-            <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-          </component>
-          <component name="libgthread" filter="s60" long-name="Libg Thread">
-            <unit bldFile="/sf/os/ossrv/glib/build/symbian/gthread/group"/>
-            <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
-          </component>
-          <component name="libgmodule" filter="s60" long-name="Libg Module">
-            <unit bldFile="/sf/os/ossrv/glib/build/symbian/gmodule/group"/>
-            <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
-          </component>
-          <component name="libgobject" filter="s60" long-name="Libg Object">
-            <unit bldFile="/sf/os/ossrv/glib/build/symbian/gobject/group"/>
-            <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
-          </component>
-        </collection>
-        <collection name="stdcpp" long-name="C++ Standard Library" level="translation">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <component name="stdcpp_build" filter="s60" long-name="Stdcpp">
-            <unit bldFile="/sf/os/ossrv/stdcpp/group"/>
-          </component>
-        </collection>
-        <collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-          <component name="dbus" filter="s60" long-name="D-Bus">
-            <unit bldFile="/sf/os/ossrv/ofdbus/dbus/group"/>
-          </component>
-          <component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
-            <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/group"/>
-          </component>
-          <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-            <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<SystemDefinition schema="3.0.0">
+ <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+  <collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
+   <component id="boost_apis" name="Boost APIs" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/boost_apis/boost_apis.metaxml"/>
+    <unit bldFile="ossrv_pub/boost_apis/group"/>
+   </component>
+   <component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/cpp_wrappers/cpp_wrappers.metaxml"/>
+    <unit bldFile="ossrv_pub/cpp_wrappers/group"/>
+   </component>
+   <component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/character_type_apis/character_type_apis.metaxml"/>
+    <unit bldFile="ossrv_pub/character_type_apis/group"/>
+   </component>
+   <component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/compiler_specific_runtime_support/compiler_specific_runtime_support.metaxml"/>
+    <unit bldFile="ossrv_pub/compiler_specific_runtime_support/group"/>
+   </component>
+   <component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/configuration/configuration.metaxml"/>
+    <unit bldFile="ossrv_pub/configuration/group"/>
+   </component>
+   <component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_authentication_codes_and_hash_functions_api/crypto_authentication_codes_and_hash_functions_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+   </component>
+   <component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_auxillary_functions_api/crypto_auxillary_functions_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_auxillary_functions_api/group"/>
+   </component>
+   <component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_certificates_api/crypto_certificates_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_certificates_api/group"/>
+   </component>
+   <component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_inputoutput_and_data_encoding_api/crypto_inputoutput_and_data_encoding_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+   </component>
+   <component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/crypto_public_key_cryptography_and_key_agreement_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+   </component>
+   <component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_symmetric_ciphers_api/crypto_symmetric_ciphers_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+   </component>
+   <component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_utility_functions_api/crypto_utility_functions_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_utility_functions_api/group"/>
+   </component>
+   <component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/cryptogaphy_related_api/cryptogaphy_related_api.metaxml"/>
+    <unit bldFile="ossrv_pub/cryptogaphy_related_api/group"/>
+   </component>
+   <component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/debug/debug.metaxml"/>
+    <unit bldFile="ossrv_pub/debug/group"/>
+   </component>
+   <component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/exceptions/exceptions.metaxml"/>
+    <unit bldFile="ossrv_pub/exceptions/group"/>
+   </component>
+   <component id="gboxed" name="GBoxed API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gboxed/gboxed.metaxml"/>
+    <unit bldFile="ossrv_pub/gboxed/group"/>
+   </component>
+   <component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_arrays/glib_arrays.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_arrays/group"/>
+   </component>
+   <component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_asynchronous_queues/glib_asynchronous_queues.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_asynchronous_queues/group"/>
+   </component>
+   <component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_atomic_operations/glib_atomic_operations.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_atomic_operations/group"/>
+   </component>
+   <component id="glib_automatic_string_completion" name="Glib Automatic String Completion API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_automatic_string_completion/glib_automatic_string_completion.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_automatic_string_completion/group"/>
+   </component>
+   <component id="glib_balanced_binary_trees" name="Glib Balanced Binary Trees API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_balanced_binary_trees/glib_balanced_binary_trees.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_balanced_binary_trees/group"/>
+   </component>
+   <component id="glib_basic_types" name="Glib Basic Types API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_basic_types/glib_basic_types.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_basic_types/group"/>
+   </component>
+   <component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_caches/glib_caches.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_caches/group"/>
+   </component>
+   <component id="glib_character_set_conversion" name="Glib Character Set Conversion API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_character_set_conversion/glib_character_set_conversion.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_character_set_conversion/group"/>
+   </component>
+   <component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_closures/glib_closures.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_closures/group"/>
+   </component>
+   <component id="glib_commandline_option_parser" name="Glib Command Line Option Parser API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_commandline_option_parser/glib_commandline_option_parser.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_commandline_option_parser/group"/>
+   </component>
+   <component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_datasets/glib_datasets.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_datasets/group"/>
+   </component>
+   <component id="glib_date_and_time_functions" name="Glib Date and Time Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_date_and_time_functions/glib_date_and_time_functions.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_date_and_time_functions/group"/>
+   </component>
+   <component id="glib_doubleended_queues" name="Glib Double-ended Queues API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_doubleended_queues/glib_doubleended_queues.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_doubleended_queues/group"/>
+   </component>
+   <component id="glib_doublylinked_lists" name="Glib Doubly-Linked Lists API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_doublylinked_lists/glib_doublylinked_lists.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_doublylinked_lists/group"/>
+   </component>
+   <component id="glib_dynamic_loading_of_modules" name="Glib Dynamic Loading of Modules API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_dynamic_loading_of_modules/glib_dynamic_loading_of_modules.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+   </component>
+   <component id="glib_enums_and_flags" name="Glib Enums and Flags API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_enums_and_flags/glib_enums_and_flags.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_enums_and_flags/group"/>
+   </component>
+   <component id="glib_error_reporting" name="Glib Error Reporting API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_error_reporting/glib_error_reporting.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_error_reporting/group"/>
+   </component>
+   <component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_file_utilities/glib_file_utilities.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_file_utilities/group"/>
+   </component>
+   <component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_generic_values/glib_generic_values.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_generic_values/group"/>
+   </component>
+   <component id="glib_globstyle_pattern_matching" name="Glib Glob-Style Pattern Matching API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_globstyle_pattern_matching/glib_globstyle_pattern_matching.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_globstyle_pattern_matching/group"/>
+   </component>
+   <component id="glib_hash_tables" name="Glib Hash Tables API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_hash_tables/glib_hash_tables.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_hash_tables/group"/>
+   </component>
+   <component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_hook_functions/glib_hook_functions.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_hook_functions/group"/>
+   </component>
+   <component id="glib_internationalization" name="Glib  Internationalization API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_internationalization/glib_internationalization.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_internationalization/group"/>
+   </component>
+   <component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_io_channels/glib_io_channels.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_io_channels/group"/>
+   </component>
+   <component id="glib_keyvalue_file_parser" name="Glib Key-Value File Parser API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_keyvalue_file_parser/glib_keyvalue_file_parser.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_keyvalue_file_parser/group"/>
+   </component>
+   <component id="glib_lexical_scanner" name="Glib Lexical Scanner API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_lexical_scanner/glib_lexical_scanner.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_lexical_scanner/group"/>
+   </component>
+   <component id="glib_main_event_loop" name="Glib Main Event Loop API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_main_event_loop/glib_main_event_loop.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_main_event_loop/group"/>
+   </component>
+   <component id="glib_memory_allocation" name="Glib Memory Allocation API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_memory_allocation/glib_memory_allocation.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_memory_allocation/group"/>
+   </component>
+   <component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_memory_slices/glib_memory_slices.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_memory_slices/group"/>
+   </component>
+   <component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_message_logging/glib_message_logging.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_message_logging/group"/>
+   </component>
+   <component id="glib_miscellaneous_utility_functions" name="Glib Miscellaneous Utility Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_miscellaneous_utility_functions/glib_miscellaneous_utility_functions.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+   </component>
+   <component id="glib_nary_trees" name="Glib N-ary Trees API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_nary_trees/glib_nary_trees.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_nary_trees/group"/>
+   </component>
+   <component id="glib_parameters_and_values" name="Glib Parameters and Values API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_parameters_and_values/glib_parameters_and_values.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_parameters_and_values/group"/>
+   </component>
+   <component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_quarks/glib_quarks.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_quarks/group"/>
+   </component>
+   <component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_random_numbers/glib_random_numbers.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_random_numbers/group"/>
+   </component>
+   <component id="glib_relations_and_tuples" name="Glib Relations and Tuples API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_relations_and_tuples/glib_relations_and_tuples.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_relations_and_tuples/group"/>
+   </component>
+   <component id="glib_shellrelated_utilities" name="Glib Shell-related Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_shellrelated_utilities/glib_shellrelated_utilities.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_shellrelated_utilities/group"/>
+   </component>
+   <component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_signals/glib_signals.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_signals/group"/>
+   </component>
+   <component id="glib_simple_xml_subset_parser" name="Glib Simple XML Subset Parser API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_simple_xml_subset_parser/glib_simple_xml_subset_parser.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_simple_xml_subset_parser/group"/>
+   </component>
+   <component id="glib_singlylinked_lists" name="Glib Singly-Linked Lists API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_singlylinked_lists/glib_singlylinked_lists.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_singlylinked_lists/group"/>
+   </component>
+   <component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_spawning_processes/glib_spawning_processes.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_spawning_processes/group"/>
+   </component>
+   <component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_standard_macros/glib_standard_macros.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_standard_macros/group"/>
+   </component>
+   <component id="glib_string_utility_functions" name="Glib String Utility Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_string_utility_functions/glib_string_utility_functions.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_string_utility_functions/group"/>
+   </component>
+   <component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_strings/glib_strings.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_strings/group"/>
+   </component>
+   <component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_thread_pools/glib_thread_pools.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_thread_pools/group"/>
+   </component>
+   <component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_threads/glib_threads.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_threads/group"/>
+   </component>
+   <component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_timers/glib_timers.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_timers/group"/>
+   </component>
+   <component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_unicode_manipulation/glib_unicode_manipulation.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_unicode_manipulation/group"/>
+   </component>
+   <component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_value_arrays/glib_value_arrays.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_value_arrays/group"/>
+   </component>
+   <component id="glib_varargs_value_collection" name="Glib Varargs Value Collection API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_varargs_value_collection/glib_varargs_value_collection.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_varargs_value_collection/group"/>
+   </component>
+   <component id="gobject" name="GObject API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gobject/gobject.metaxml"/>
+    <unit bldFile="ossrv_pub/gobject/group"/>
+   </component>
+   <component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gparamspec/gparamspec.metaxml"/>
+    <unit bldFile="ossrv_pub/gparamspec/group"/>
+   </component>
+   <component id="gtype" name="GType API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gtype/gtype.metaxml"/>
+    <unit bldFile="ossrv_pub/gtype/group"/>
+   </component>
+   <component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gtypemodule/gtypemodule.metaxml"/>
+    <unit bldFile="ossrv_pub/gtypemodule/group"/>
+   </component>
+   <component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gtypeplugin/gtypeplugin.metaxml"/>
+    <unit bldFile="ossrv_pub/gtypeplugin/group"/>
+   </component>
+   <component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/io_stream_api/io_stream_api.metaxml"/>
+    <unit bldFile="ossrv_pub/io_stream_api/group"/>
+   </component>
+   <component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/localization_function_api/localization_function_api.metaxml"/>
+    <unit bldFile="ossrv_pub/localization_function_api/group"/>
+   </component>
+   <component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/math_operations_api/math_operations_api.metaxml"/>
+    <unit bldFile="ossrv_pub/math_operations_api/group"/>
+   </component>
+   <component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/memory/memory.metaxml"/>
+    <unit bldFile="ossrv_pub/memory/group"/>
+   </component>
+   <component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/no_namespace_headers/no_namespace_headers.metaxml"/>
+    <unit bldFile="ossrv_pub/no_namespace_headers/group"/>
+   </component>
+   <component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/openc_headers/openc_headers.metaxml"/>
+    <unit bldFile="ossrv_pub/openc_headers/group"/>
+   </component>
+   <component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/openc_wrappers/openc_wrappers.metaxml"/>
+    <unit bldFile="ossrv_pub/openc_wrappers/group"/>
+   </component>
+   <component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/ssl_general_api/ssl_general_api.metaxml"/>
+    <unit bldFile="ossrv_pub/ssl_general_api/group"/>
+   </component>
+   <component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/ssl_protocol_methods_api/ssl_protocol_methods_api.metaxml"/>
+    <unit bldFile="ossrv_pub/ssl_protocol_methods_api/group"/>
+   </component>
+   <component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/standard_compressiondecompression_api/standard_compressiondecompression_api.metaxml"/>
+    <unit bldFile="ossrv_pub/standard_compressiondecompression_api/group"/>
+   </component>
+   <component id="stl" name="STL API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/stl/stl.metaxml"/>
+    <unit bldFile="ossrv_pub/stl/group"/>
+   </component>
+   <component id="thread_api" name="Thread API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/thread_api/thread_api.metaxml"/>
+    <unit bldFile="ossrv_pub/thread_api/group"/>
+   </component>
+   <component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/type_attributes/type_attributes.metaxml"/>
+    <unit bldFile="ossrv_pub/type_attributes/group"/>
+   </component>
+   <component id="typeinfo" name="Type Info API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/typeinfo/typeinfo.metaxml"/>
+    <unit bldFile="ossrv_pub/typeinfo/group"/>
+   </component>
+   <component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/utility_apis/utility_apis.metaxml"/>
+    <unit bldFile="ossrv_pub/utility_apis/group"/>
+   </component>
+   <component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/wide_character_classapis/wide_character_classapis.metaxml"/>
+    <unit bldFile="ossrv_pub/wide_character_classapis/group"/>
+   </component>
+   <component id="dbus_api" name="Dbus API" class="api" filter="s60">
+    <unit bldFile="ossrv_pub/dbus/group"/>
+   </component>
+   <component id="dbus-glib_api" name="D-Bus GLib API" class="api" filter="s60">
+    <unit bldFile="ossrv_pub/dbus-glib/group"/>
+   </component>
+  </collection>
+  <collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
+   <component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
+    <unit bldFile="ossrv_plat/libutils/group"/>
+   </component>
+  </collection>
+  <collection id="stdlibs" name="Standard Libraries" level="translation">
+   <component id="libz" filter="s60" name="Z Compression Library">
+    <unit bldFile="stdlibs/libz/group"/>
+   </component>
+   <component id="libcrypt" filter="s60" name="Crypt Library">
+    <unit bldFile="stdlibs/libcrypt/group"/>
+   </component>
+  </collection>
+  <collection id="ssl" name="SSL" level="data-services">
+   <component id="libcrypto" filter="s60" name="Crypto Library">
+    <unit bldFile="ssl/libcrypto/group"/>
+   </component>
+   <component id="libssl" filter="s60" purpose="development" name="SSL Library">
+    <unit bldFile="ssl/libssl/group"/>
+   </component>
+  </collection>
+  <collection id="glib" name="GLib" level="utilities">
+   <component id="glibbackend" filter="s60" name="GLib Backend">
+    <unit bldFile="glib/build/symbian/glibbackend/group"/>
+    <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+   </component>
+   <component id="libglib" filter="s60" name="GLib Library">
+    <unit bldFile="glib/build/symbian/glib/group"/>
+    <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+   </component>
+   <component id="libgthread" filter="s60" name="Libg Thread">
+    <unit bldFile="glib/build/symbian/gthread/group"/>
+    <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
+   </component>
+   <component id="libgmodule" filter="s60" name="Libg Module">
+    <unit bldFile="glib/build/symbian/gmodule/group"/>
+    <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
+   </component>
+   <component id="libgobject" filter="s60" name="Libg Object">
+    <unit bldFile="glib/build/symbian/gobject/group"/>
+    <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
+   </component>
+  </collection>
+  <collection id="stdcpp" name="C++ Standard Library" level="translation">
+   <!-- collection is really a component. Needs to be moved down a directory -->
+   <component id="stdcpp_build" filter="s60" name="Stdcpp">
+    <unit bldFile="stdcpp/group"/>
+   </component>
+  </collection>
+  <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+   <component id="dbus" filter="s60" name="D-Bus">
+    <unit bldFile="ofdbus/dbus/group"/>
+   </component>
+   <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+    <unit bldFile="ofdbus/dbus-glib/group"/>
+   </component>
+   <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
-            <unit bldFile="/sf/os/ossrv/ofdbus/group"/>
-          </component>
-        </collection>
-        <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-          <component name="libutils" filter="s60" long-name="Utility Library">
-            <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/group"/>
-          </component>
-        </collection>
-        <collection name="genericservices" long-name="Generic Services" level="utilities">
-          <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-          </component>
-          <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/sf/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-          </component>
-          <component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/genericservices/systemagent/group" mrp="/sf/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-          </component>
-          <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericservices/taskscheduler/group" mrp="/sf/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-          </component>
-          <component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericservices/activebackupclient/group" mrp="/sf/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-          </component>
-          <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-          </component>
-          <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericservices/httputils/group" mrp="/sf/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-          </component>
-        </collection>
-        <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-          <component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="/sf/os/ossrv/syslibsapitest/syslibssvs/group"/>
-          </component>
-        </collection>
-        <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-          <component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/compressionlibs/ziplib/group" mrp="/sf/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-          </component>
-        </collection>
-        <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-          <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericopenlibs/cstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-          </component>
-          <component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-          </component>
-          <component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/genericopenlibs/openenvcore/group" mrp="/sf/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-          </component>
-          <component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="/sf/os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-          </component>
-          <component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-          </component>
-          <component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/os/ossrv/genericopenlibs/liboil/group" mrp="/sf/os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-          </component>
-        </collection>
-        <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-          <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-          </component>
-          <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/sf/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-          </component>
-          <component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-          </component>
-        </collection>
-        <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-          <component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
-            <!-- exports should be moved to individual components -->
-            <unit bldFile="/sf/os/ossrv/group"/>
-          </component>
-          <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="ofdbus/group"/>
+   </component>
+  </collection>
+  <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+   <component id="libutils" filter="s60" name="Utility Library">
+    <unit bldFile="utilitylibraries/libutils/group"/>
+   </component>
+  </collection>
+  <collection id="genericservices" name="Generic Services" level="utilities">
+   <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+    <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+   </component>
+   <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+    <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+   </component>
+   <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+    <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+   </component>
+   <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+    <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+   </component>
+   <component id="activebackupclient" name="Active Backup Client" purpose="optional">
+    <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+   </component>
+   <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+    <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+   </component>
+   <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+    <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+   </component>
+  </collection>
+  <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+   <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+    <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
+   </component>
+  </collection>
+  <collection id="compressionlibs" name="Compression Libraries" level="data-services">
+   <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+    <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+   </component>
+  </collection>
+  <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+   <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+    <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+   </component>
+   <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+    <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+   </component>
+   <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+    <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
+   </component>
+   <component id="pluggableauthenticationmodulefw" name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
+    <unit bldFile="genericopenlibs/pluggableauthenticationmodulefw/group" mrp="genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
+   </component>
+   <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+    <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+   </component>
+   <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+    <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+   </component>
+  </collection>
+  <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+   <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+    <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+   </component>
+   <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+    <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+   </component>
+   <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+    <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+   </component>
+  </collection>
+  <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+   <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+    <!-- exports should be moved to individual components -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/ossrv/package_definition_3.0.xml
--- a/symbian4/os/ossrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,501 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-  <collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
-   <component id="boost_apis" name="Boost APIs" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/boost_apis/boost_apis.metaxml"/>
-    <unit bldFile="ossrv_pub/boost_apis/group"/>
-   </component>
-   <component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/cpp_wrappers/cpp_wrappers.metaxml"/>
-    <unit bldFile="ossrv_pub/cpp_wrappers/group"/>
-   </component>
-   <component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/character_type_apis/character_type_apis.metaxml"/>
-    <unit bldFile="ossrv_pub/character_type_apis/group"/>
-   </component>
-   <component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/compiler_specific_runtime_support/compiler_specific_runtime_support.metaxml"/>
-    <unit bldFile="ossrv_pub/compiler_specific_runtime_support/group"/>
-   </component>
-   <component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/configuration/configuration.metaxml"/>
-    <unit bldFile="ossrv_pub/configuration/group"/>
-   </component>
-   <component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_authentication_codes_and_hash_functions_api/crypto_authentication_codes_and_hash_functions_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-   </component>
-   <component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_auxillary_functions_api/crypto_auxillary_functions_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_auxillary_functions_api/group"/>
-   </component>
-   <component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_certificates_api/crypto_certificates_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_certificates_api/group"/>
-   </component>
-   <component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_inputoutput_and_data_encoding_api/crypto_inputoutput_and_data_encoding_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-   </component>
-   <component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/crypto_public_key_cryptography_and_key_agreement_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-   </component>
-   <component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_symmetric_ciphers_api/crypto_symmetric_ciphers_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-   </component>
-   <component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/crypto_utility_functions_api/crypto_utility_functions_api.metaxml"/>
-    <unit bldFile="ossrv_pub/crypto_utility_functions_api/group"/>
-   </component>
-   <component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/cryptogaphy_related_api/cryptogaphy_related_api.metaxml"/>
-    <unit bldFile="ossrv_pub/cryptogaphy_related_api/group"/>
-   </component>
-   <component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/debug/debug.metaxml"/>
-    <unit bldFile="ossrv_pub/debug/group"/>
-   </component>
-   <component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/exceptions/exceptions.metaxml"/>
-    <unit bldFile="ossrv_pub/exceptions/group"/>
-   </component>
-   <component id="gboxed" name="GBoxed API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gboxed/gboxed.metaxml"/>
-    <unit bldFile="ossrv_pub/gboxed/group"/>
-   </component>
-   <component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_arrays/glib_arrays.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_arrays/group"/>
-   </component>
-   <component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_asynchronous_queues/glib_asynchronous_queues.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_asynchronous_queues/group"/>
-   </component>
-   <component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_atomic_operations/glib_atomic_operations.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_atomic_operations/group"/>
-   </component>
-   <component id="glib_automatic_string_completion" name="Glib Automatic String Completion API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_automatic_string_completion/glib_automatic_string_completion.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_automatic_string_completion/group"/>
-   </component>
-   <component id="glib_balanced_binary_trees" name="Glib Balanced Binary Trees API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_balanced_binary_trees/glib_balanced_binary_trees.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_balanced_binary_trees/group"/>
-   </component>
-   <component id="glib_basic_types" name="Glib Basic Types API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_basic_types/glib_basic_types.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_basic_types/group"/>
-   </component>
-   <component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_caches/glib_caches.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_caches/group"/>
-   </component>
-   <component id="glib_character_set_conversion" name="Glib Character Set Conversion API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_character_set_conversion/glib_character_set_conversion.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_character_set_conversion/group"/>
-   </component>
-   <component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_closures/glib_closures.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_closures/group"/>
-   </component>
-   <component id="glib_commandline_option_parser" name="Glib Command Line Option Parser API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_commandline_option_parser/glib_commandline_option_parser.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_commandline_option_parser/group"/>
-   </component>
-   <component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_datasets/glib_datasets.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_datasets/group"/>
-   </component>
-   <component id="glib_date_and_time_functions" name="Glib Date and Time Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_date_and_time_functions/glib_date_and_time_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_date_and_time_functions/group"/>
-   </component>
-   <component id="glib_doubleended_queues" name="Glib Double-ended Queues API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_doubleended_queues/glib_doubleended_queues.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_doubleended_queues/group"/>
-   </component>
-   <component id="glib_doublylinked_lists" name="Glib Doubly-Linked Lists API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_doublylinked_lists/glib_doublylinked_lists.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_doublylinked_lists/group"/>
-   </component>
-   <component id="glib_dynamic_loading_of_modules" name="Glib Dynamic Loading of Modules API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_dynamic_loading_of_modules/glib_dynamic_loading_of_modules.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-   </component>
-   <component id="glib_enums_and_flags" name="Glib Enums and Flags API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_enums_and_flags/glib_enums_and_flags.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_enums_and_flags/group"/>
-   </component>
-   <component id="glib_error_reporting" name="Glib Error Reporting API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_error_reporting/glib_error_reporting.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_error_reporting/group"/>
-   </component>
-   <component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_file_utilities/glib_file_utilities.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_file_utilities/group"/>
-   </component>
-   <component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_generic_values/glib_generic_values.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_generic_values/group"/>
-   </component>
-   <component id="glib_globstyle_pattern_matching" name="Glib Glob-Style Pattern Matching API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_globstyle_pattern_matching/glib_globstyle_pattern_matching.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_globstyle_pattern_matching/group"/>
-   </component>
-   <component id="glib_hash_tables" name="Glib Hash Tables API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_hash_tables/glib_hash_tables.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_hash_tables/group"/>
-   </component>
-   <component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_hook_functions/glib_hook_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_hook_functions/group"/>
-   </component>
-   <component id="glib_internationalization" name="Glib  Internationalization API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_internationalization/glib_internationalization.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_internationalization/group"/>
-   </component>
-   <component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_io_channels/glib_io_channels.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_io_channels/group"/>
-   </component>
-   <component id="glib_keyvalue_file_parser" name="Glib Key-Value File Parser API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_keyvalue_file_parser/glib_keyvalue_file_parser.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_keyvalue_file_parser/group"/>
-   </component>
-   <component id="glib_lexical_scanner" name="Glib Lexical Scanner API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_lexical_scanner/glib_lexical_scanner.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_lexical_scanner/group"/>
-   </component>
-   <component id="glib_main_event_loop" name="Glib Main Event Loop API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_main_event_loop/glib_main_event_loop.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_main_event_loop/group"/>
-   </component>
-   <component id="glib_memory_allocation" name="Glib Memory Allocation API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_memory_allocation/glib_memory_allocation.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_memory_allocation/group"/>
-   </component>
-   <component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_memory_slices/glib_memory_slices.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_memory_slices/group"/>
-   </component>
-   <component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_message_logging/glib_message_logging.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_message_logging/group"/>
-   </component>
-   <component id="glib_miscellaneous_utility_functions" name="Glib Miscellaneous Utility Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_miscellaneous_utility_functions/glib_miscellaneous_utility_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-   </component>
-   <component id="glib_nary_trees" name="Glib N-ary Trees API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_nary_trees/glib_nary_trees.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_nary_trees/group"/>
-   </component>
-   <component id="glib_parameters_and_values" name="Glib Parameters and Values API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_parameters_and_values/glib_parameters_and_values.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_parameters_and_values/group"/>
-   </component>
-   <component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_quarks/glib_quarks.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_quarks/group"/>
-   </component>
-   <component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_random_numbers/glib_random_numbers.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_random_numbers/group"/>
-   </component>
-   <component id="glib_relations_and_tuples" name="Glib Relations and Tuples API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_relations_and_tuples/glib_relations_and_tuples.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_relations_and_tuples/group"/>
-   </component>
-   <component id="glib_shellrelated_utilities" name="Glib Shell-related Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_shellrelated_utilities/glib_shellrelated_utilities.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_shellrelated_utilities/group"/>
-   </component>
-   <component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_signals/glib_signals.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_signals/group"/>
-   </component>
-   <component id="glib_simple_xml_subset_parser" name="Glib Simple XML Subset Parser API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_simple_xml_subset_parser/glib_simple_xml_subset_parser.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_simple_xml_subset_parser/group"/>
-   </component>
-   <component id="glib_singlylinked_lists" name="Glib Singly-Linked Lists API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_singlylinked_lists/glib_singlylinked_lists.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_singlylinked_lists/group"/>
-   </component>
-   <component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_spawning_processes/glib_spawning_processes.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_spawning_processes/group"/>
-   </component>
-   <component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_standard_macros/glib_standard_macros.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_standard_macros/group"/>
-   </component>
-   <component id="glib_string_utility_functions" name="Glib String Utility Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_string_utility_functions/glib_string_utility_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_string_utility_functions/group"/>
-   </component>
-   <component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_strings/glib_strings.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_strings/group"/>
-   </component>
-   <component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_thread_pools/glib_thread_pools.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_thread_pools/group"/>
-   </component>
-   <component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_threads/glib_threads.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_threads/group"/>
-   </component>
-   <component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_timers/glib_timers.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_timers/group"/>
-   </component>
-   <component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_unicode_manipulation/glib_unicode_manipulation.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_unicode_manipulation/group"/>
-   </component>
-   <component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_value_arrays/glib_value_arrays.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_value_arrays/group"/>
-   </component>
-   <component id="glib_varargs_value_collection" name="Glib Varargs Value Collection API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_varargs_value_collection/glib_varargs_value_collection.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_varargs_value_collection/group"/>
-   </component>
-   <component id="gobject" name="GObject API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gobject/gobject.metaxml"/>
-    <unit bldFile="ossrv_pub/gobject/group"/>
-   </component>
-   <component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gparamspec/gparamspec.metaxml"/>
-    <unit bldFile="ossrv_pub/gparamspec/group"/>
-   </component>
-   <component id="gtype" name="GType API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gtype/gtype.metaxml"/>
-    <unit bldFile="ossrv_pub/gtype/group"/>
-   </component>
-   <component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gtypemodule/gtypemodule.metaxml"/>
-    <unit bldFile="ossrv_pub/gtypemodule/group"/>
-   </component>
-   <component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gtypeplugin/gtypeplugin.metaxml"/>
-    <unit bldFile="ossrv_pub/gtypeplugin/group"/>
-   </component>
-   <component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/io_stream_api/io_stream_api.metaxml"/>
-    <unit bldFile="ossrv_pub/io_stream_api/group"/>
-   </component>
-   <component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/localization_function_api/localization_function_api.metaxml"/>
-    <unit bldFile="ossrv_pub/localization_function_api/group"/>
-   </component>
-   <component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/math_operations_api/math_operations_api.metaxml"/>
-    <unit bldFile="ossrv_pub/math_operations_api/group"/>
-   </component>
-   <component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/memory/memory.metaxml"/>
-    <unit bldFile="ossrv_pub/memory/group"/>
-   </component>
-   <component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/no_namespace_headers/no_namespace_headers.metaxml"/>
-    <unit bldFile="ossrv_pub/no_namespace_headers/group"/>
-   </component>
-   <component id="openc_headers" name="OpenC headers" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/openc_headers/openc_headers.metaxml"/>
-    <unit bldFile="ossrv_pub/openc_headers/group"/>
-   </component>
-   <component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/openc_wrappers/openc_wrappers.metaxml"/>
-    <unit bldFile="ossrv_pub/openc_wrappers/group"/>
-   </component>
-   <component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/ssl_general_api/ssl_general_api.metaxml"/>
-    <unit bldFile="ossrv_pub/ssl_general_api/group"/>
-   </component>
-   <component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/ssl_protocol_methods_api/ssl_protocol_methods_api.metaxml"/>
-    <unit bldFile="ossrv_pub/ssl_protocol_methods_api/group"/>
-   </component>
-   <component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/standard_compressiondecompression_api/standard_compressiondecompression_api.metaxml"/>
-    <unit bldFile="ossrv_pub/standard_compressiondecompression_api/group"/>
-   </component>
-   <component id="stl" name="STL API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/stl/stl.metaxml"/>
-    <unit bldFile="ossrv_pub/stl/group"/>
-   </component>
-   <component id="thread_api" name="Thread API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/thread_api/thread_api.metaxml"/>
-    <unit bldFile="ossrv_pub/thread_api/group"/>
-   </component>
-   <component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/type_attributes/type_attributes.metaxml"/>
-    <unit bldFile="ossrv_pub/type_attributes/group"/>
-   </component>
-   <component id="typeinfo" name="Type Info API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/typeinfo/typeinfo.metaxml"/>
-    <unit bldFile="ossrv_pub/typeinfo/group"/>
-   </component>
-   <component id="utility_apis" name="Utility APIs" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/utility_apis/utility_apis.metaxml"/>
-    <unit bldFile="ossrv_pub/utility_apis/group"/>
-   </component>
-   <component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/wide_character_classapis/wide_character_classapis.metaxml"/>
-    <unit bldFile="ossrv_pub/wide_character_classapis/group"/>
-   </component>
-   <component id="dbus_api" name="Dbus API" class="api" filter="s60">
-    <unit bldFile="ossrv_pub/dbus/group"/>
-   </component>
-   <component id="dbus-glib_api" name="D-Bus GLib API" class="api" filter="s60">
-    <unit bldFile="ossrv_pub/dbus-glib/group"/>
-   </component>
-  </collection>
-  <collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
-   <component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
-    <unit bldFile="ossrv_plat/libutils/group"/>
-   </component>
-  </collection>
-  <collection id="stdlibs" name="Standard Libraries" level="translation">
-   <component id="libz" filter="s60" name="Z Compression Library">
-    <unit bldFile="stdlibs/libz/group"/>
-   </component>
-   <component id="libcrypt" filter="s60" name="Crypt Library">
-    <unit bldFile="stdlibs/libcrypt/group"/>
-   </component>
-  </collection>
-  <collection id="ssl" name="SSL" level="data-services">
-   <component id="libcrypto" filter="s60" name="Crypto Library">
-    <unit bldFile="ssl/libcrypto/group"/>
-   </component>
-   <component id="libssl" filter="s60" purpose="development" name="SSL Library">
-    <unit bldFile="ssl/libssl/group"/>
-   </component>
-  </collection>
-  <collection id="glib" name="GLib" level="utilities">
-   <component id="glibbackend" filter="s60" name="GLib Backend">
-    <unit bldFile="glib/build/symbian/glibbackend/group"/>
-    <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-   </component>
-   <component id="libglib" filter="s60" name="GLib Library">
-    <unit bldFile="glib/build/symbian/glib/group"/>
-    <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-   </component>
-   <component id="libgthread" filter="s60" name="Libg Thread">
-    <unit bldFile="glib/build/symbian/gthread/group"/>
-    <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
-   </component>
-   <component id="libgmodule" filter="s60" name="Libg Module">
-    <unit bldFile="glib/build/symbian/gmodule/group"/>
-    <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
-   </component>
-   <component id="libgobject" filter="s60" name="Libg Object">
-    <unit bldFile="glib/build/symbian/gobject/group"/>
-    <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
-   </component>
-  </collection>
-  <collection id="stdcpp" name="C++ Standard Library" level="translation">
-   <!-- collection is really a component. Needs to be moved down a directory -->
-   <component id="stdcpp_build" filter="s60" name="Stdcpp">
-    <unit bldFile="stdcpp/group"/>
-   </component>
-  </collection>
-  <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
-   <component id="dbus" filter="s60" name="D-Bus">
-    <unit bldFile="ofdbus/dbus/group"/>
-   </component>
-   <component id="dbus-glib" filter="s60" name="D-Bus GLib">
-    <unit bldFile="ofdbus/dbus-glib/group"/>
-   </component>
-   <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
-            Consider moving IBY file to one of the above as well and removing this component entirely -->
-    <unit bldFile="ofdbus/group"/>
-   </component>
-  </collection>
-  <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
-   <component id="libutils" filter="s60" name="Utility Library">
-    <unit bldFile="utilitylibraries/libutils/group"/>
-   </component>
-  </collection>
-  <collection id="genericservices" name="Generic Services" level="utilities">
-   <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
-    <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
-   </component>
-   <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
-    <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-   </component>
-   <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
-    <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-   </component>
-   <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
-    <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-   </component>
-   <component id="activebackupclient" name="Active Backup Client" purpose="optional">
-    <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-   </component>
-   <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
-    <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-   </component>
-   <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-    <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-   </component>
-  </collection>
-  <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
-   <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
-    <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
-   </component>
-  </collection>
-  <collection id="compressionlibs" name="Compression Libraries" level="data-services">
-   <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-    <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-   </component>
-  </collection>
-  <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
-   <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
-    <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-   </component>
-   <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
-    <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-   </component>
-   <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
-    <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
-   </component>
-   <component id="pluggableauthenticationmodulefw" name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-    <unit bldFile="genericopenlibs/pluggableauthenticationmodulefw/group" mrp="genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-   </component>
-   <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-    <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-   </component>
-   <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
-    <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-   </component>
-  </collection>
-  <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
-   <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
-    <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
-   </component>
-   <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
-    <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-   </component>
-   <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
-    <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-   </component>
-  </collection>
-  <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
-   <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
-    <!-- exports should be moved to individual components -->
-    <unit bldFile="group"/>
-   </component>
-   <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/persistentdata/package_definition.xml
--- a/symbian4/os/persistentdata/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,132 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="featuremgmt" long-name="Feature Management" level="framework">
-          <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
-          </component>
-          <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/persistentdata/featuremgmt/featureregistry/group" mrp="/sf/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-          </component>
-        </collection>
-        <collection name="loggingservices" long-name="Logging Services" level="server">
-          <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
-          </component>
-          <component name="filelogger" long-name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
-          </component>
-          <component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
-            <unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-          </component>
-        </collection>
-        <collection name="traceservices" long-name="Trace Services" level="server">
-          <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/traceservices/commsdebugutility/group" mrp="/sf/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-          </component>
-          <component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-            <unit bldFile="/sf/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/sf/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-          </component>
-        </collection>
-        <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-          <component name="store" long-name="Store" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/persistentstorage/store/group" mrp="/sf/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-          </component>
-          <component name="dbms" long-name="DBMS" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/persistentstorage/dbms/group" mrp="/sf/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-          </component>
-          <component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-            <unit bldFile="/sf/os/persistentdata/persistentstorage/centralrepository/group" mrp="/sf/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-          </component>
-          <component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/persistentstorage/sql/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-          </component>
-          <component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-          </component>
-        </collection>
-        <collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-          <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="persistentdata" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="featuremgmt" name="Feature Management" level="framework">
+      <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
+        <unit bldFile="featuremgmt/featuremgr/group" mrp="featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
+      </component>
+      <component id="featureregistry" name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+        <unit bldFile="featuremgmt/featureregistry/group" mrp="featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+      </component>
+    </collection>
+    <collection id="loggingservices" name="Logging Services" level="server">
+      <component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
+        <unit bldFile="loggingservices/eventlogger/group" mrp="loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+      </component>
+      <component id="filelogger" name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
+        <unit bldFile="loggingservices/filelogger/group" mrp="loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+      </component>
+      <component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+        <unit bldFile="loggingservices/rfilelogger/group" mrp="loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+      </component>
+    </collection>
+    <collection id="traceservices" name="Trace Services" level="server">
+      <component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+        <unit bldFile="traceservices/commsdebugutility/group" mrp="traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+      </component>
+      <component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+        <unit bldFile="traceservices/tracefw/ulogger/group" mrp="traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+      </component>
+    </collection>
+    <collection id="persistentstorage" name="Persistent Storage" level="framework">
+      <component id="store" name="Store" purpose="optional">
+        <unit bldFile="persistentstorage/store/group" mrp="persistentstorage/store/group/syslibs_store.mrp"/>
+      </component>
+      <component id="dbms" name="DBMS" purpose="optional">
+        <unit bldFile="persistentstorage/dbms/group" mrp="persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+      </component>
+      <component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+        <unit bldFile="persistentstorage/centralrepository/group" mrp="persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+      </component>
+      <component id="sql" name="SQL" introduced="9.3" purpose="optional">
+        <unit bldFile="persistentstorage/sql/GROUP" mrp="persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+      </component>
+      <component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+        <unit bldFile="persistentstorage/sqlite3api/GROUP" mrp="persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+      </component>
+    </collection>
+    <collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+      <component id="persistentdata_metadata" name="Persistent Data Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/persistentdata/package_definition_3.0.xml
--- a/symbian4/os/persistentdata/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="persistentdata" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="featuremgmt" name="Feature Management" level="framework">
-      <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
-        <unit bldFile="featuremgmt/featuremgr/group" mrp="featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
-      </component>
-      <component id="featureregistry" name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
-        <unit bldFile="featuremgmt/featureregistry/group" mrp="featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-      </component>
-    </collection>
-    <collection id="loggingservices" name="Logging Services" level="server">
-      <component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
-        <unit bldFile="loggingservices/eventlogger/group" mrp="loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
-      </component>
-      <component id="filelogger" name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
-        <unit bldFile="loggingservices/filelogger/group" mrp="loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
-      </component>
-      <component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
-        <unit bldFile="loggingservices/rfilelogger/group" mrp="loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-      </component>
-    </collection>
-    <collection id="traceservices" name="Trace Services" level="server">
-      <component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-        <unit bldFile="traceservices/commsdebugutility/group" mrp="traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-      </component>
-      <component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
-        <unit bldFile="traceservices/tracefw/ulogger/group" mrp="traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-      </component>
-    </collection>
-    <collection id="persistentstorage" name="Persistent Storage" level="framework">
-      <component id="store" name="Store" purpose="optional">
-        <unit bldFile="persistentstorage/store/group" mrp="persistentstorage/store/group/syslibs_store.mrp"/>
-      </component>
-      <component id="dbms" name="DBMS" purpose="optional">
-        <unit bldFile="persistentstorage/dbms/group" mrp="persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-      </component>
-      <component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
-        <unit bldFile="persistentstorage/centralrepository/group" mrp="persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-      </component>
-      <component id="sql" name="SQL" introduced="9.3" purpose="optional">
-        <unit bldFile="persistentstorage/sql/GROUP" mrp="persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-      </component>
-      <component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
-        <unit bldFile="persistentstorage/sqlite3api/GROUP" mrp="persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-      </component>
-    </collection>
-    <collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
-      <component id="persistentdata_metadata" name="Persistent Data Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/security/package_definition.xml
--- a/symbian4/os/security/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/security/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,167 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-        <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-          <component name="authenticationserver" long-name="Authentication Server" introduced="^4" purpose="optional">
-            <unit bldFile="/sf/os/security/authenticationservices/authenticationserver/group" mrp="/sf/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-          </component>
-        </collection>
-        <collection name="authorisation" long-name="Authorisation" level="utilities">
-          <component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
-            <unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-          </component>
-          <component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-          </component>
-        </collection>
-        <collection name="contentmgmt" long-name="Content Management" level="utilities">
-          <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-            <unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-          </component>
-          <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
-            <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-          </component>
-          <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
-            <unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
-          </component>
-          <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/security/contentmgmt/cafstreamingsupport/group" mrp="/sf/os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
-          </component>
-        </collection>
-        <collection name="crypto" long-name="Crypto Libraries" level="libraries">
-          <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-          </component>
-          <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-          </component>
-        </collection>
-        <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-          <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-            <unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-          </component>
-          <component name="securitytestfw" long-name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-            <unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="/sf/os/security/cryptomgmtlibs/securitytestfw/group"/>
-          </component>
-          <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-          </component>
-          <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-            <unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-          </component>
-          <component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-            <unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-          </component>
-        </collection>
-        <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-          <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-            <unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-          </component>
-          <component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
-            <unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-          </component>
-        </collection>
-        <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-          <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-          </component>
-        </collection>
-        <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-          <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-          </component>
-          <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-            <unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-          </component>
-          <component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-            <unit mrp="/sf/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-          </component>
-          <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-            <unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-          </component>
-        </collection>
-        <collection name="security_info" long-name="OS Security Info" level="utilities">
-          <component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="security" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+	<collection id="authenticationservices" name="Authentication Services" level="utilities">
+      <component id="authenticationserver" name="Authentication Server" introduced="^4" purpose="optional">
+        <unit bldFile="authenticationservices/authenticationserver/group" mrp="authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+      </component>
+    </collection>
+    <collection id="authorisation" name="Authorisation" level="utilities">
+      <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+        <unit bldFile="authorisation/userpromptservice/group" mrp="authorisation/userpromptservice/group/security_ups.mrp"/>
+      </component>
+      <component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+        <unit bldFile="authorisation/userpromptutils/group" mrp="authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+      </component>
+    </collection>
+    <collection id="contentmgmt" name="Content Management" level="utilities">
+      <component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+        <unit bldFile="contentmgmt/contentaccessfwfordrm/group" mrp="contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+      </component>
+      <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+        <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+      </component>
+      <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">      
+        <unit bldFile="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+      </component>
+      <component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
+        <unit bldFile="contentmgmt/cafstreamingsupport/group" mrp="contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
+      </component>      
+    </collection>
+    <collection id="crypto" name="Crypto Libraries" level="libraries">
+      <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+        <unit bldFile="crypto/weakcryptospi/group" mrp="crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+      </component>
+      <component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+        <unit bldFile="crypto/weakcryptospi/strong" mrp="crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+      </component>
+    </collection>
+    <collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+      <component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+        <unit bldFile="cryptomgmtlibs/securityutils/group" mrp="cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+      </component>
+      <component id="securitytestfw" name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="cryptomgmtlibs/securitytestfw/group"/>
+      </component>
+      <component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+        <unit mrp="cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+      </component>
+      <component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+        <unit bldFile="cryptomgmtlibs/cryptotokenfw/group" mrp="cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+      </component>
+      <component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+        <unit bldFile="cryptomgmtlibs/securitycommonutils/group" mrp="cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+      </component>
+    </collection>
+    <collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+      <component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+        <unit bldFile="securityanddataprivacytools/securityconfig/group" mrp="securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+      </component>
+      <component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+        <unit bldFile="securityanddataprivacytools/securitytools/group" mrp="securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+      </component>
+    </collection>
+    <collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+      <component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="cryptoplugins/cryptospiplugins/group" mrp="cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+      </component>
+    </collection>
+    <collection id="cryptoservices" name="Crypto Services" level="plugins">
+      <component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+        <unit bldFile="cryptoservices/certificateandkeymgmt/group" mrp="cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+      </component>
+      <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+        <unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+      </component>
+      <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+        <unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+      </component>
+      <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
+        <unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+      </component>
+    </collection>
+    <collection id="security_info" name="OS Security Info" level="utilities">
+      <component id="security_metadata" name="OS Security Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="security_info/security_metadata/security_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/security/package_definition_3.0.xml
--- a/symbian4/os/security/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="security" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-	<collection id="authenticationservices" name="Authentication Services" level="utilities">
-      <component id="authenticationserver" name="Authentication Server" introduced="^4" purpose="optional">
-        <unit bldFile="authenticationservices/authenticationserver/group" mrp="authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-      </component>
-    </collection>
-    <collection id="authorisation" name="Authorisation" level="utilities">
-      <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
-        <unit bldFile="authorisation/userpromptservice/group" mrp="authorisation/userpromptservice/group/security_ups.mrp"/>
-      </component>
-      <component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
-        <unit bldFile="authorisation/userpromptutils/group" mrp="authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-      </component>
-    </collection>
-    <collection id="contentmgmt" name="Content Management" level="utilities">
-      <component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-        <unit bldFile="contentmgmt/contentaccessfwfordrm/group" mrp="contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-      </component>
-      <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
-        <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-      </component>
-      <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">      
-        <unit bldFile="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
-      </component>
-      <component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
-        <unit bldFile="contentmgmt/cafstreamingsupport/group" mrp="contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
-      </component>      
-    </collection>
-    <collection id="crypto" name="Crypto Libraries" level="libraries">
-      <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-        <unit bldFile="crypto/weakcryptospi/group" mrp="crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-      </component>
-      <component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
-        <unit bldFile="crypto/weakcryptospi/strong" mrp="crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-      </component>
-    </collection>
-    <collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
-      <component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
-        <unit bldFile="cryptomgmtlibs/securityutils/group" mrp="cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-      </component>
-      <component id="securitytestfw" name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="cryptomgmtlibs/securitytestfw/group"/>
-      </component>
-      <component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
-        <unit mrp="cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-      </component>
-      <component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
-        <unit bldFile="cryptomgmtlibs/cryptotokenfw/group" mrp="cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-      </component>
-      <component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
-        <unit bldFile="cryptomgmtlibs/securitycommonutils/group" mrp="cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-      </component>
-    </collection>
-    <collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
-      <component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
-        <unit bldFile="securityanddataprivacytools/securityconfig/group" mrp="securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-      </component>
-      <component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
-        <unit bldFile="securityanddataprivacytools/securitytools/group" mrp="securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-      </component>
-    </collection>
-    <collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
-      <component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="cryptoplugins/cryptospiplugins/group" mrp="cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-      </component>
-    </collection>
-    <collection id="cryptoservices" name="Crypto Services" level="plugins">
-      <component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
-        <unit bldFile="cryptoservices/certificateandkeymgmt/group" mrp="cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-      </component>
-      <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-        <unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-      </component>
-      <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
-        <unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
-      </component>
-      <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
-        <unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-      </component>
-    </collection>
-    <collection id="security_info" name="OS Security Info" level="utilities">
-      <component id="security_metadata" name="OS Security Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="security_info/security_metadata/security_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/textandloc/package_definition.xml
--- a/symbian4/os/textandloc/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/textandloc/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,179 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-        <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-          <component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
-            <unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/group"/>
-          </component>
-          <component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-            <unit bldFile="/sf/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-          </component>
-          <component name="sortutil_api" long-name="Sort Util API" filter="s60" class="api">
-            <unit bldFile="/sf/os/textandloc/textandloc_plat/sortutil_api/group"/>
-          </component>
-        </collection>
-        <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-          <component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-            <unit bldFile="/sf/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-          </component>
-        </collection>
-        <collection name="charconvfw" long-name="Character Conversion" level="encoding">
-          <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-            <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-          </component>
-          <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-          </component>
-          <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-          </component>
-        </collection>
-        <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-          <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" deprecated="^4" plugin="Y">
-            <unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-          </component>
-          <component name="fontstore" long-name="Font Store" purpose="mandatory">
-            <unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-          </component>
-          <component name="textbase" long-name="Text Base" purpose="mandatory" class="placeholder">
-            <!-- placeholder for text code from GDI -->
-          </component>
-          <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-          </component>
-          <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-            <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-          </component>
-        </collection>
-        <collection name="textlayout" long-name="Text Layout" level="text">
-          <component name="texthandling" long-name="Text Handling" purpose="optional">
-            <unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-          </component>
-          <component name="textformatting" long-name="Text Formatting" purpose="optional">
-            <unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-          </component>
-          <component name="word" long-name="Word" purpose="development" filter="test">
-            <unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp" bldFile="/sf/os/textandloc/textrendering/word/group"/>
-          </component>
-        </collection>
-        <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-          <component name="numbergrouping" long-name="Number Grouping">
-            <unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
-          </component>
-          <component name="jplangutil" long-name="Japanese Language Utilities">
-            <unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
-          </component>
-          <component name="sortutil" long-name="Sorting Utility">
-            <unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
-          </component>
-          <component name="inlinetext" long-name="Inline Text">
-            <unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
-          </component>
-          <component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-            <!-- placeholder for split from bafl -->
-          </component>
-          <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-          </component>
-        </collection>
-        <collection name="localesupport" long-name="Locale Support" level="util">
-          <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/textandloc/localisation/localesupport" mrp="/sf/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-          </component>
-          <component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-            <!-- placeholder for split from bafl -->
-          </component>
-        </collection>
-        <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-          <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-            <!-- placeholder for split from GDI Tools -->
-          </component>
-          <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-            <unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-          </component>
-        </collection>
-        <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-          <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
+    <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+     <component id="findutil_api" class="api" name="Find Util API" filter="s60">
+      <meta rel="Api" href="textandloc_plat/findutil_api/findutil_api.metaxml"/>
+      <unit bldFile="textandloc_plat/findutil_api/group"/>
+     </component>
+     <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
+      <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
+      <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
+     </component>
+     <component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
+      <meta rel="Api" href="textandloc_plat/sortutil_api/sortutil_api.metaxml"/>
+      <unit bldFile="textandloc_plat/sortutil_api/group"/>
+     </component>
+    </collection>
+    <collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+     <component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+      <meta rel="Api" href="textandloc_pub/directory_localizer_api/directory_localizer_api.metaxml"/>
+      <unit bldFile="textandloc_pub/directory_localizer_api/group"/>
+     </component>
+    </collection>
+    <collection id="charconvfw" name="Character Conversion" level="encoding">
+      <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+        <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+      </component>
+      <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+        <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+      </component>
+      <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+        <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+      </component>      
+    </collection>
+    <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+      <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin" deprecated="^4">
+        <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+      </component>
+      <component id="fontstore" name="Font Store" purpose="mandatory">
+        <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
+      </component>
+     <component id="textbase" name="Text Base" purpose="mandatory">
+     	<!-- placeholder for text code from GDI -->
+     </component>      
+      <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+        <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+      </component>
+      <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+        <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
+      </component>
+    </collection>
+    <collection id="textlayout" name="Text Layout" level="text">
+      <component id="texthandling" name="Text Handling" purpose="optional">
+        <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
+      </component>
+      <component id="textformatting" name="Text Formatting" purpose="optional">
+        <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
+      </component>
+      <component id="word" name="Word" purpose="development" filter="test">
+        <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
+      </component>
+    </collection>
+    <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+      <component id="numbergrouping" name="Number Grouping">
+        <unit bldFile="charconvfw/numbergrouping/group"/>
+      </component>
+      <component id="jplangutil" name="Japanese Language Utilities">
+        <unit bldFile="charconvfw/jplangutil/group"/>
+      </component>
+      <component id="sortutil" name="Sorting Utility">
+        <unit bldFile="charconvfw/sortutil/group"/>
+      </component>
+      <component id="inlinetext" name="Inline Text">
+        <unit bldFile="charconvfw/inlinetext/group"/>
+      </component>
+     <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+     	<!-- placeholder for split from bafl -->
+     </component>
+      <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+        <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+      </component>
+    </collection>
+    <collection id="localesupport" name="Locale Support" level="util">
+      <component id="reflocales" name="Reference Locales"  purpose="optional" class="plugin">
+        <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+      </component>
+     <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+     	<!-- placeholder for split from bafl -->
+     </component>
+    </collection>
+    <collection id="textandloctools" name="Text and Localisation Tools"  level="tools">
+      <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+        <!-- placeholder for split from GDI Tools -->
+      </component>
+      <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+        <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+      </component>
+    </collection>    
+    <collection id="textandloc_info" name="Text and Localisation Info" level="text">
+      <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/textandloc/package_definition_3.0.xml
--- a/symbian4/os/textandloc/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
-    <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
-     <component id="findutil_api" class="api" name="Find Util API" filter="s60">
-      <meta rel="Api" href="textandloc_plat/findutil_api/findutil_api.metaxml"/>
-      <unit bldFile="textandloc_plat/findutil_api/group"/>
-     </component>
-     <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
-      <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
-      <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
-     </component>
-     <component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
-      <meta rel="Api" href="textandloc_plat/sortutil_api/sortutil_api.metaxml"/>
-      <unit bldFile="textandloc_plat/sortutil_api/group"/>
-     </component>
-    </collection>
-    <collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
-     <component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
-      <meta rel="Api" href="textandloc_pub/directory_localizer_api/directory_localizer_api.metaxml"/>
-      <unit bldFile="textandloc_pub/directory_localizer_api/group"/>
-     </component>
-    </collection>
-    <collection id="charconvfw" name="Character Conversion" level="encoding">
-      <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
-        <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-      </component>
-      <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
-        <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-      </component>
-      <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
-        <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-      </component>      
-    </collection>
-    <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
-      <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin" deprecated="^4">
-        <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-      </component>
-      <component id="fontstore" name="Font Store" purpose="mandatory">
-        <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
-      </component>
-     <component id="textbase" name="Text Base" purpose="mandatory">
-     	<!-- placeholder for text code from GDI -->
-     </component>      
-      <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
-        <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-      </component>
-      <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
-        <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
-      </component>
-    </collection>
-    <collection id="textlayout" name="Text Layout" level="text">
-      <component id="texthandling" name="Text Handling" purpose="optional">
-        <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
-      </component>
-      <component id="textformatting" name="Text Formatting" purpose="optional">
-        <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
-      </component>
-      <component id="word" name="Word" purpose="development" filter="test">
-        <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
-      </component>
-    </collection>
-    <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
-      <component id="numbergrouping" name="Number Grouping">
-        <unit bldFile="charconvfw/numbergrouping/group"/>
-      </component>
-      <component id="jplangutil" name="Japanese Language Utilities">
-        <unit bldFile="charconvfw/jplangutil/group"/>
-      </component>
-      <component id="sortutil" name="Sorting Utility">
-        <unit bldFile="charconvfw/sortutil/group"/>
-      </component>
-      <component id="inlinetext" name="Inline Text">
-        <unit bldFile="charconvfw/inlinetext/group"/>
-      </component>
-     <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
-     	<!-- placeholder for split from bafl -->
-     </component>
-      <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
-        <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-      </component>
-    </collection>
-    <collection id="localesupport" name="Locale Support" level="util">
-      <component id="reflocales" name="Reference Locales"  purpose="optional" class="plugin">
-        <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-      </component>
-     <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
-     	<!-- placeholder for split from bafl -->
-     </component>
-    </collection>
-    <collection id="textandloctools" name="Text and Localisation Tools"  level="tools">
-      <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
-        <!-- placeholder for split from GDI Tools -->
-      </component>
-      <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
-        <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-      </component>
-    </collection>    
-    <collection id="textandloc_info" name="Text and Localisation Info" level="text">
-      <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/usb/package_definition.xml
--- a/symbian4/os/usb/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/usb/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,102 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-          <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
-        </collection>
-        <collection name="usbmgmt" long-name="USB Management" level="server">
-          <component name="usbmgr" long-name="USB Manager" purpose="optional">
-            <unit bldFile="/sf/os/usb/usbmgmt/usbmgr/group" mrp="/sf/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-          </component>
-          <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
-            <unit mrp="/sf/os/usb/usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="/sf/os/usb/usbmgmt/usbmgrtest/group" version="2"/>
-          </component>
-          <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-            <unit mrp="/sf/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-          </component>
-        </collection>
-        <collection name="usb_info" long-name="USB Info" level="app-if">
-          <component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
-            <unit mrp="/sf/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
+   <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
+  </collection>
+  <collection id="usbmgmt" name="USB Management" level="server">
+   <component id="usbmgr" name="USB Manager" purpose="optional">
+    <unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>
+   </component>
+   <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+    <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
+   </component>
+   <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+    <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="usb_info" name="USB Info" level="app-if">
+   <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+    <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/usb/package_definition_3.0.xml
--- a/symbian4/os/usb/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
-  <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
-   <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
-  </collection>
-  <collection id="usbmgmt" name="USB Management" level="server">
-   <component id="usbmgr" name="USB Manager" purpose="optional">
-    <unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>
-   </component>
-   <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
-    <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
-   </component>
-   <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
-    <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-   </component>
-  </collection>
-  <collection id="usb_info" name="USB Info" level="app-if">
-   <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-    <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/wlan/package_definition.xml
--- a/symbian4/os/wlan/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/wlan/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,166 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-        <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-          <component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_dbif_api/group"/>
-          </component>
-          <component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_hal_api/group"/>
-          </component>
-          <component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_management_api/group"/>
-          </component>
-          <component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-          </component>
-          <component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_control_api/group"/>
-          </component>
-          <component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-          </component>
-          <component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-          </component>
-          <component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_info_api/group"/>
-          </component>
-          <component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-          </component>
-          <component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_osa_api/group"/>
-          </component>
-          <component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_spia_api/group"/>
-          </component>
-          <component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_hpa_api/group"/>
-          </component>
-          <component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-          </component>
-          <component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-          </component>
-          <component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
-          </component>
-        </collection>
-        <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-          <component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-          </component>
-        </collection>
-        <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-          <component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
-            <unit bldFile="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-          </component>
-          <component name="wlanagent" filter="s60" long-name="WLAN Agent">
-            <unit bldFile="/sf/os/wlan/wlan_bearer/wlanagent/group"/>
-          </component>
-          <component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
-            <unit bldFile="/sf/os/wlan/wlan_bearer/wlandbif_cd/group"/>
-          </component>
-          <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-          <component name="wlanengine" filter="s60" long-name="WLAN Engine">
-            <unit bldFile="/sf/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-          </component>
-          <component name="wlanldd" filter="s60" long-name="WLAN LDD">
-            <unit bldFile="/sf/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-          </component>
-          <component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
-            <unit bldFile="/sf/os/wlan/wlan_bearer/wlannwif/group"/>
-          </component>
-        </collection>
-        <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-          <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="/sf/os/wlan/wlanapitest/wlanhaitest/group"/>
-          </component>
-        </collection>
-        <collection name="wlan_info" long-name="WLAN Info" level="test">
-          <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="wlan" name="WLAN" levels="hw low mid high tools test">
+  <collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
+   <component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_dbif_api/wlan_dbif_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_dbif_api/group"/>
+   </component>
+   <component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_hal_api/wlan_hal_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_hal_api/group"/>
+   </component>
+   <component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_management_api/wlan_management_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_management_api/group"/>
+   </component>
+   <component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_device_settings_api/wlan_device_settings_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_device_settings_api/group"/>
+   </component>
+   <component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_control_api/wlan_control_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_control_api/group"/>
+   </component>
+   <component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_hw_initialization_data_api/wlan_hw_initialization_data_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_hw_initialization_data_api/group"/>
+   </component>
+   <component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_power_save_plugin_api/wlan_power_save_plugin_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_power_save_plugin_api/group"/>
+   </component>
+   <component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_info_api/wlan_info_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_info_api/group"/>
+   </component>
+   <component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_agent_hotspot_plugin_api/wlan_agent_hotspot_plugin_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+   </component>
+   <component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_osa_api/wlan_osa_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_osa_api/group"/>
+   </component>
+   <component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_spia_api/wlan_spia_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_spia_api/group"/>
+   </component>
+   <component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_hpa_api/wlan_hpa_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_hpa_api/group"/>
+   </component>
+   <component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_eapol_plugin_api/wlan_eapol_plugin_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_eapol_plugin_api/group"/>
+   </component>
+   <component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_generic_plugin_api/wlan_generic_plugin_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_generic_plugin_api/group"/>
+   </component>
+   <component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_aws_plugin_api/wlan_aws_plugin_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_aws_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
+   <component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_pub/wlan_sdk_info_api/wlan_sdk_info_api.metaxml"/>
+    <unit bldFile="wlan_pub/wlan_sdk_info_api/group"/>
+   </component>
+  </collection>
+  <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+   <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+    <unit bldFile="wlan_bearer/wlanpsmplugin/group"/>
+   </component>
+   <component id="wlanagent" filter="s60" name="WLAN Agent">
+    <unit bldFile="wlan_bearer/wlanagent/group"/>
+   </component>
+   <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+    <unit bldFile="wlan_bearer/wlandbif_cd/group"/>
+   </component>
+   <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+   <component id="wlanengine" filter="s60" name="WLAN Engine">
+    <unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+   </component>
+   <component id="wlanldd" filter="s60" name="WLAN LDD">
+    <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+   </component>
+   <component id="wlannwif" filter="s60" name="WLAN Network Interface">
+    <unit bldFile="wlan_bearer/wlannwif/group"/>
+   </component>
+  </collection>
+  <collection id="wlanapitest" name="WLAN API Tests" level="test">
+   <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
+   </component>
+  </collection>
+  <collection id="wlan_info" name="WLAN Info" level="test">
+   <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/wlan/package_definition_3.0.xml
--- a/symbian4/os/wlan/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="wlan" name="WLAN" levels="hw low mid high tools test">
-  <collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
-   <component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_dbif_api/wlan_dbif_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_dbif_api/group"/>
-   </component>
-   <component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_hal_api/wlan_hal_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_hal_api/group"/>
-   </component>
-   <component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_management_api/wlan_management_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_management_api/group"/>
-   </component>
-   <component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_device_settings_api/wlan_device_settings_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_device_settings_api/group"/>
-   </component>
-   <component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_control_api/wlan_control_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_control_api/group"/>
-   </component>
-   <component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_hw_initialization_data_api/wlan_hw_initialization_data_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_hw_initialization_data_api/group"/>
-   </component>
-   <component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_power_save_plugin_api/wlan_power_save_plugin_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_power_save_plugin_api/group"/>
-   </component>
-   <component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_info_api/wlan_info_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_info_api/group"/>
-   </component>
-   <component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_agent_hotspot_plugin_api/wlan_agent_hotspot_plugin_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-   </component>
-   <component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_osa_api/wlan_osa_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_osa_api/group"/>
-   </component>
-   <component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_spia_api/wlan_spia_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_spia_api/group"/>
-   </component>
-   <component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_hpa_api/wlan_hpa_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_hpa_api/group"/>
-   </component>
-   <component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_eapol_plugin_api/wlan_eapol_plugin_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_eapol_plugin_api/group"/>
-   </component>
-   <component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_generic_plugin_api/wlan_generic_plugin_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_generic_plugin_api/group"/>
-   </component>
-   <component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_plat/wlan_aws_plugin_api/wlan_aws_plugin_api.metaxml"/>
-    <unit bldFile="wlan_plat/wlan_aws_plugin_api/group"/>
-   </component>
-  </collection>
-  <collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
-   <component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
-    <meta rel="Api" href="wlan_pub/wlan_sdk_info_api/wlan_sdk_info_api.metaxml"/>
-    <unit bldFile="wlan_pub/wlan_sdk_info_api/group"/>
-   </component>
-  </collection>
-  <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
-   <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
-    <unit bldFile="wlan_bearer/wlanpsmplugin/group"/>
-   </component>
-   <component id="wlanagent" filter="s60" name="WLAN Agent">
-    <unit bldFile="wlan_bearer/wlanagent/group"/>
-   </component>
-   <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
-    <unit bldFile="wlan_bearer/wlandbif_cd/group"/>
-   </component>
-   <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-   <component id="wlanengine" filter="s60" name="WLAN Engine">
-    <unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-   </component>
-   <component id="wlanldd" filter="s60" name="WLAN LDD">
-    <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-   </component>
-   <component id="wlannwif" filter="s60" name="WLAN Network Interface">
-    <unit bldFile="wlan_bearer/wlannwif/group"/>
-   </component>
-  </collection>
-  <collection id="wlanapitest" name="WLAN API Tests" level="test">
-   <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
-   </component>
-  </collection>
-  <collection id="wlan_info" name="WLAN Info" level="test">
-   <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/xmlsrv/package_definition.xml
--- a/symbian4/os/xmlsrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,142 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-        <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-          <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-            <!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<SystemDefinition schema="3.0.0">
+ <package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
+  <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+   <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
+	<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
-            <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/group"/>
-          </component>
-          <component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
-            <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-          </component>
-          <component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
-            <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-          </component>
-          <component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
-            <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-          </component>
-        </collection>
-        <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-          <component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
-            <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-          </component>
-          <component name="xmlsec" filter="s60" long-name="XML Security">
-            <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-          </component>
-          <component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
-            <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-          </component>
-          <component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
-            <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-          </component>
-        </collection>
-        <collection name="xml" long-name="XML" level="generic">
-          <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-          </component>
-          <component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-          </component>
-          <component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-            <unit bldFile="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-          </component>
-          <component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-          </component>
-          <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-          </component>
-          <component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-          </component>
-          <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-          </component>
-        </collection>
-        <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-          <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="xmlsrv_plat/group"/>
+   </component>
+   <component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+    <meta rel="Api" href="xmlsrv_plat/xml_encryption_api/xml_encryption_api.metaxml"/>
+    <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+   </component>
+   <component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+    <meta rel="Api" href="xmlsrv_plat/xml_signature_api/xml_signature_api.metaxml"/>
+    <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+   </component>
+   <component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+    <meta rel="Api" href="xmlsrv_plat/xml_security_engine_utils_api/xml_security_engine_utils_api.metaxml"/>
+    <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+   </component>
+  </collection>
+  <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
+   <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+    <unit bldFile="xmlsecurityengine/xmlseccertman/group"/>
+   </component>
+   <component id="xmlsec" filter="s60" name="XML Security">
+    <unit bldFile="xmlsecurityengine/xmlsec/group"/>
+   </component>
+   <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+    <unit bldFile="xmlsecurityengine/xmlseccrypto/group"/>
+   </component>
+   <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+    <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
+   </component>
+  </collection>
+  <collection id="xml" name="XML" level="generic">
+   <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+    <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
+   </component>
+   <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+    <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+   </component>
+   <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+    <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+   </component>
+   <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+    <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+   </component>
+   <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+   </component>
+   <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+   </component>
+   <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+   </component>
+  </collection>
+  <collection id="xmlsrv_info" name="XML Services Info" level="specific">
+   <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r 30e67220bf86 -r f99f9ea9b39f symbian4/os/xmlsrv/package_definition_3.0.xml
--- a/symbian4/os/xmlsrv/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
-  <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
-   <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-	<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
-	  Remove this component and uncomment the other units when fixed-->
-    <unit bldFile="xmlsrv_plat/group"/>
-   </component>
-   <component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
-    <meta rel="Api" href="xmlsrv_plat/xml_encryption_api/xml_encryption_api.metaxml"/>
-    <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-   </component>
-   <component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
-    <meta rel="Api" href="xmlsrv_plat/xml_signature_api/xml_signature_api.metaxml"/>
-    <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-   </component>
-   <component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
-    <meta rel="Api" href="xmlsrv_plat/xml_security_engine_utils_api/xml_security_engine_utils_api.metaxml"/>
-    <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
-   </component>
-  </collection>
-  <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
-   <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
-    <unit bldFile="xmlsecurityengine/xmlseccertman/group"/>
-   </component>
-   <component id="xmlsec" filter="s60" name="XML Security">
-    <unit bldFile="xmlsecurityengine/xmlsec/group"/>
-   </component>
-   <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
-    <unit bldFile="xmlsecurityengine/xmlseccrypto/group"/>
-   </component>
-   <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
-    <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
-   </component>
-  </collection>
-  <collection id="xml" name="XML" level="generic">
-   <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
-    <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
-   </component>
-   <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
-    <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-   </component>
-   <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-    <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-   </component>
-   <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
-    <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-   </component>
-   <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-   </component>
-   <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-   </component>
-   <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-   </component>
-  </collection>
-  <collection id="xmlsrv_info" name="XML Services Info" level="specific">
-   <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>