# HG changeset patch
# User ShabeR@UK-SHABER
# Date 1239281216 -3600
# Node ID bf60c880fd59206ed7d1998fb3b73d831b32aa37
# Parent  d3023a0f691945af240a478c7f24b0b710ce6d56
Use updated foundation system definition

diff -r d3023a0f6919 -r bf60c880fd59 platform_foundationmodel/sysdefs/system_definition.xml
--- a/platform_foundationmodel/sysdefs/system_definition.xml	Thu Apr 09 13:44:59 2009 +0100
+++ b/platform_foundationmodel/sysdefs/system_definition.xml	Thu Apr 09 13:46:56 2009 +0100
@@ -1,7336 +1,2197 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition ( systemModel?, SystemBuild? )>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block* | collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock* | collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!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>
+ <!ELEMENT unit EMPTY>
+ <!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>
+ <!ELEMENT SystemBuild (option* | target+ | targetList+ | list+ | configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N ) #REQUIRED>
+ <!ELEMENT configuration (listRef+ | ref+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N ) #REQUIRED
+  targetParallel (Y | N ) "N">
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition name="Symbian" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
-   <block long-name="Kernel and Hardware Services" level="hw" name="kernelhwsrv" levels="hw-if adaptation framework test">
-    <collection name="baseapitest" long-name="Base API Tests" level="test"/>
+   <block name="kernelhwsrv" long-name="Kernel and Hardware Services" level="hw" levels="hw-if adaptation framework test">
     <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
      <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3">
-      <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
+      <unit bldFile="os\kernelhwsrv\baseintegtests\baseintegrationtest\group" mrp="os\kernelhwsrv\baseintegtests\baseintegrationtest\group\base_integration_test.mrp"/>
      </component>
     </collection>
     <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
      <component name="ubootldr" long-name="Boot Loader" introduced="9.2">
-      <unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-     </component>
-    </collection>
-    <collection name="filesystems" long-name="File Systems" level="framework">
-     <component name="compfs" long-name="Composite File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-     </component>
-     <component name="fatfs" long-name="FAT File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-     </component>
-     <component name="fat32fs" long-name="FAT32 File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-     </component>
-     <component name="iso9660fs" long-name="ISO9660 File System" filter="gt" plugin="Y" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/>
-     </component>
-     <component name="ntfs" long-name="NTFS" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/>
-     </component>
-     <component name="rofs" long-name="ROFS" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-     </component>
-     <component name="romfs" long-name="ROM File System" filter="gt" plugin="Y">
-      <unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-     </component>
-     <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+      <unit mrp="os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
      </component>
     </collection>
     <collection name="unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
-     <component name="uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/>
+     <component name="uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\unistore2" mrp="os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2.mrp"/>
      </component>
      <component name="uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1">
-      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
+      <unit mrp="os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2_undeliverable.mrp"/>
      </component>
      <component name="uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/>
-     </component>
-     <component name="uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2" mrp="os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2\base_crashflash_unistore2.mrp"/>
+     </component>
+     <component name="uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1">
+      <unit bldFile="os\kernelhwsrv\unistore2\uiibootsupport\nandloader\unistore2" mrp="os\kernelhwsrv\unistore2\uiibootsupport\base_nandboot_unistore2.mrp"/>
      </component>
     </collection>
     <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
      <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0">
-      <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
-     </component>
-    </collection>
-    <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-     <component name="genericboardsupport" long-name="Generic Board Support">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-     </component>
-     <component name="mediadrivers" long-name="Media Drivers">
-      <!-- these are for storage media-->
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-     </component>
-     <component name="sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/>
-     </component>
-     <component name="sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/>
-     </component>
-    </collection>
-    <collection name="halservices" long-name="HAL Services" level="framework">
-     <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0">
-      <unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+      <unit bldFile="os\kernelhwsrv\bsptemplate\asspandvariant\template_variant" mrp="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">
-      <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kernel\eka" mrp="os\kernelhwsrv\kernel\eka\base_e32.mrp"/>
      </component>
     </collection>
     <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
      <component name="e32test" long-name="E32 Tests" class="test">
-      <unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kerneltest\e32test\group" mrp="os\kernelhwsrv\kerneltest\e32test\group\base_e32test.mrp"/>
+     </component>
+     <component name="sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" class="test">
+      <unit bldFile="os\kernelhwsrv\kerneltest\sdiotest" mrp="os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp"/>
      </component>
      <component name="e32utils" long-name="E32 Utilities">
-      <unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kerneltest\e32utils\group" mrp="os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp"/>
      </component>
      <component name="f32test" long-name="File Server Tests" class="test">
-      <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
-     </component>
-     <component name="sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" class="test">
-      <unit bldFile="os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/>
-     </component>
-    </collection>
-    <collection name="localisation" long-name="Localisation" level="adaptation">
-     <component name="localesupport" long-name="Locale Support" plugin="Y">
-      <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kerneltest\f32test\group" mrp="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">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-     </component>
-     <component name="btrace" long-name="Kernel Trace Tool">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\ethernet" mrp="os\kernelhwsrv\kernel\eka\drivers\ethernet\base_e32_drivers_ethernet.mrp"/>
+     </component>
+     <component name="audioldd" long-name="Audio Drivers" introduced="8.1b">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\esound" mrp="os\kernelhwsrv\kernel\eka\drivers\esound\base_e32_drivers_sound.mrp"/>
+     </component>
+     <component name="serialldd" long-name="Serial Port Drivers">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\ecomm" mrp="os\kernelhwsrv\kernel\eka\drivers\ecomm\base_e32_drivers_ecomm.mrp"/>
      </component>
      <component name="legacydrivers" long-name="Legacy Drivers">
-      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+      <unit mrp="os\kernelhwsrv\kernel\eka\drivers\adc\base_e32_drivers_adc.mrp"/>
      </component>
      <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b">
       <!-- these are LDDs for storage media-->
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\locmedia" mrp="os\kernelhwsrv\kernel\eka\drivers\locmedia\base_e32_drivers_locmedia.mrp"/>
      </component>
      <component name="runmodedebugger" long-name="Run Mode Debugger">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
-     </component>
-     <component name="serialldd" long-name="Serial Port Drivers">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-     </component>
-     <component name="audioldd" long-name="Audio Drivers" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/esound" mrp="os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\debug" mrp="os\kernelhwsrv\kernel\eka\drivers\debug\base_e32_drivers_debug.mrp"/>
+     </component>
+     <component name="btrace" long-name="Kernel Trace Tool">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\trace" mrp="os\kernelhwsrv\kernel\eka\drivers\trace\base_e32_drivers_trace.mrp"/>
      </component>
     </collection>
-    <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-     <component name="textshell" long-name="Text Shell" filter="gt">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-     </component>
-     <component name="e32wsrv" long-name="Text Window Server">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+    <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+     <component name="sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c" mrp="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c\base_e32_sd3c.mrp"/>
+     </component>
+     <component name="sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c" mrp="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c\base_e32_sd4c.mrp"/>
+     </component>
+     <component name="mediadrivers" long-name="Media Drivers">
+      <!-- these are for storage media-->
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\media" mrp="os\kernelhwsrv\kernel\eka\drivers\media\base_e32_drivers_media.mrp"/>
+     </component>
+     <component name="genericboardsupport" long-name="Generic Board Support">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\bsp" mrp="os\kernelhwsrv\kernel\eka\drivers\bsp\base_e32_drivers_bsp.mrp"/>
+     </component>
+    </collection>
+    <collection name="localisation" long-name="Localisation" level="adaptation">
+     <component name="localesupport" long-name="Locale Support" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\localisation\localesupport" mrp="os\kernelhwsrv\localisation\localesupport\mmpfiles\base_loce32.mrp"/>
      </component>
     </collection>
     <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-     <component name="basedocs" long-name="Base Documentation">
-      <unit mrp="os/kernelhwsrv/userlibandfileserver/basedocs/base_documentation.mrp"/>
+     <component name="euser" long-name="User Library">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\euser" mrp="os\kernelhwsrv\kernel\eka\euser\base_e32_euser.mrp"/>
+     </component>
+     <component name="compsupp" long-name="Compiler Runtime Support" filter="gt">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\compsupp" mrp="os\kernelhwsrv\kernel\eka\compsupp\base_e32_compsupp.mrp"/>
+     </component>
+     <component name="fileserver" long-name="File Server" filter="gt">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\group" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\group\base_f32.mrp"/>
+     </component>
+     <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" plugin="Y" introduced="9.1">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group" mrp="os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group\syslibs_FATCharsetConv.mrp"/>
+     </component>
+     <component name="nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sftl" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sftl\base_f32_sftl.mrp"/>
      </component>
      <component name="estart" long-name="Base Starter" filter="gt">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-     </component>
-     <component name="compsupp" long-name="Compiler Runtime Support" filter="gt">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\estart" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\estart\base_f32_estart.mrp"/>
      </component>
      <component name="domainmgr" long-name="Domain Manager" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-     </component>
-     <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" plugin="Y" introduced="9.1">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-     </component>
-     <component name="fileserver" long-name="File Server" filter="gt">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-     </component>
-     <component name="nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1">
-      <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/>
-     </component>
-     <component name="euser" long-name="User Library">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\domainmgr\group" mrp="os\kernelhwsrv\userlibandfileserver\domainmgr\group\base_domain.mrp"/>
+     </component>
+     <component name="basedocs" long-name="Base Documentation">
+      <unit mrp="os\kernelhwsrv\userlibandfileserver\basedocs\base_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="filesystems" long-name="File Systems" level="framework">
+     <component name="romfs" long-name="ROM File System" filter="gt" plugin="Y">
+      <unit mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srom\base_f32_srom.mrp"/>
+     </component>
+     <component name="rofs" long-name="ROFS" filter="gt" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\srofs" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srofs\base_f32_srofs.mrp"/>
+     </component>
+     <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage\base_f32_smassstorage.mrp"/>
+     </component>
+     <component name="fat32fs" long-name="FAT32 File System" filter="gt" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32\base_f32_sfat32.mrp"/>
+     </component>
+     <component name="fatfs" long-name="FAT File System" filter="gt" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat\base_f32_sfat.mrp"/>
+     </component>
+     <component name="compfs" long-name="Composite File System" filter="gt" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\scomp" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\scomp\base_f32_scomp.mrp"/>
+     </component>
+     <component name="ntfs" long-name="NTFS" filter="gt" plugin="Y">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\ntfs" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\ntfs\base_f32_sntfs.mrp"/>
+     </component>
+     <component name="iso9660fs" long-name="ISO9660 File System" filter="gt" plugin="Y" introduced="8.1b">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660\base_f32_siso9660.mrp"/>
+     </component>
+    </collection>
+    <collection name="halservices" long-name="HAL Services" level="framework">
+     <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0">
+      <unit bldFile="os\kernelhwsrv\halservices\hal" mrp="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">
+      <unit bldFile="os\kernelhwsrv\kernel\eka\ewsrv" mrp="os\kernelhwsrv\kernel\eka\ewsrv\base_e32_ewsrv.mrp"/>
+     </component>
+     <component name="textshell" long-name="Text Shell" filter="gt">
+      <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\etshell" mrp="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" class="placeholder test" introduced="tb91">
+      <!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/kernelhwsrv/baseapitest/group/basesvs.mrp"/>
+			-->
+     </component>
+    </collection>
+   </block>
+   <block name="boardsupport" long-name="Board Support" level="hw" levels="bsp test 2 3 4">
+    <collection name="emulator" long-name="Emulator" level="bsp">
+     <component name="emulatorbsp" long-name="Emulator BSP">
+      <unit bldFile="os\boardsupport\emulator\emulatorbsp" mrp="os\boardsupport\emulator\emulatorbsp\base_wins.mrp"/>
+     </component>
+     <component name="unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91">
+      <unit bldFile="os\boardsupport\emulator\unistore2emulatorsupport" mrp="os\boardsupport\emulator\unistore2emulatorsupport\base_wins_unistore2.mrp"/>
+     </component>
+    </collection>
+    <collection name="omaph2" long-name="OMAP H2" level="bsp">
+     <component name="omaph2bsp" long-name="OMAP H2 BSP" introduced="9.0">
+      <unit bldFile="os\boardsupport\omaph2\omaph2bsp\h2" mrp="os\boardsupport\omaph2\omaph2bsp\h2\base_omaph2.mrp"/>
+     </component>
+     <component name="omaph2unistore2" long-name="OMAP H2 UniStore2" filter="gt" introduced="9.1">
+      <unit bldFile="os\boardsupport\omaph2\omaph2unistore2" mrp="os\boardsupport\omaph2\omaph2unistore2\base_h2_unistore2.mrp"/>
+     </component>
+     <component name="omaph2sdio" long-name="OMAP H2 SDIO" filter="gt" introduced="9.2">
+      <unit bldFile="os\boardsupport\omaph2\omaph2sdio" mrp="os\boardsupport\omaph2\omaph2sdio\base_h2_sdio.mrp"/>
+     </component>
+    </collection>
+    <collection name="omaph4" long-name="OMAP H4" level="bsp">
+     <component name="omaph4bsp" long-name="OMAP H4 BSP">
+      <unit bldFile="os\boardsupport\omaph4\omaph4bsp\h4" mrp="os\boardsupport\omaph4\omaph4bsp\h4\base_omaph4hrp.mrp"/>
+     </component>
+     <component name="h4bootloader" long-name="H4 Boot Loader" introduced="9.1">
+      <unit mrp="os\boardsupport\omaph4\h4bootloader\base_omaph4hrp_bootldr.mrp" bldFile="os\boardsupport\omaph4\h4bootloader"/>
+     </component>
+     <component name="omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2">
+      <unit mrp="os\boardsupport\omaph4\omaph4minienvbootloader\base_omaph4hrp_mebootldr.mrp" bldFile="os\boardsupport\omaph4\omaph4minienvbootloader"/>
+     </component>
+     <component name="omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2">
+      <unit bldFile="os\boardsupport\omaph4\omaph4unistore2" mrp="os\boardsupport\omaph4\omaph4unistore2\base_omaph4hrp_unistore2.mrp"/>
+     </component>
+     <component name="omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2">
+      <unit bldFile="os\boardsupport\omaph4\omaph4sdio" mrp="os\boardsupport\omaph4\omaph4sdio\base_omaph4hrp_sdio.mrp"/>
+     </component>
+    </collection>
+    <collection name="haitest" long-name="HAI Test Suites" level="test">
+     <component name="bspsvs" long-name="BSP Verification Suite" class="placeholder test" introduced="Saffron">
+      <!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/boardsupport/haitest/group/bspsvs.mrp"/>
+			-->
      </component>
     </collection>
    </block>
-   <block long-name="Board Support" level="hw" name="boardsupport" levels="bsp test 2 3 4">
-    <collection name="emulator" long-name="Emulator" level="bsp">
-     <component name="emulatorbsp" long-name="Emulator BSP">
-      <unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-     </component>
-     <component name="unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91">
-      <unit bldFile="os/boardsupport/emulator/unistore2emulatorsupport" mrp="os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/>
+   <block name="buildtools" long-name="Build Tools" level="hw" levels="bld mw fw ui">
+    <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+     <component name="buildsystemtools" long-name="Build System Tools">
+      <unit bldFile="os\buildtools\bldsystemtools\buildsystemtools\group" mrp="os\buildtools\bldsystemtools\buildsystemtools\group\tools_build.mrp"/>
+     </component>
+     <component name="gttechviewbaseline" long-name="GT Techview Baseline">
+      <unit mrp="os\buildtools\packaging\additionalutils\gt_techview_baseline.mrp"/>
+     </component>
+     <component name="commonbldutils" long-name="Common Utils">
+      <unit mrp="os\buildtools\bldsystemtools\commonbldutils\tools_utils_common.mrp"/>
+     </component>
+    </collection>
+    <collection name="packaging" long-name="Packaging" level="ui">
+     <component name="additionalutils" long-name="Additional Utils">
+      <unit mrp="os\buildtools\packaging\additionalutils\additional_unknown_cedar.mrp"/>
      </component>
     </collection>
-    <collection name="haitest" long-name="HAI Test Suites" level="test"/>
-    <collection name="naviengine" long-name="NaviEngine Baseport" level="bsp"/>
-    <collection name="omaph2" long-name="OMAP H2" level="bsp">
-     <component name="omaph2bsp" long-name="OMAP H2 BSP" introduced="9.0">
-      <unit bldFile="os/boardsupport/omaph2/omaph2bsp/h2" mrp="os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/>
-     </component>
-     <component name="omaph2sdio" long-name="OMAP H2 SDIO" filter="gt" introduced="9.2">
-      <unit bldFile="os/boardsupport/omaph2/omaph2sdio" mrp="os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/>
-     </component>
-     <component name="omaph2unistore2" long-name="OMAP H2 UniStore2" filter="gt" introduced="9.1">
-      <unit bldFile="os/boardsupport/omaph2/omaph2unistore2" mrp="os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/>
+    <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+     <component name="productionbldtools" long-name="Production Build Tools" filter="gt">
+      <unit mrp="os\buildtools\toolsandutils\productionbldtools\product_tools.mrp"/>
+     </component>
+     <component name="ctsfunctionalitycheckers" long-name="CTS Functionality Checkers">
+      <unit mrp="os\buildtools\toolsandutils\ctsfunctionalitycheckers\Group\testtools_cts_functionalitycheckers.mrp"/>
+     </component>
+     <component name="burtestserver" long-name="BUR Test Server">
+      <unit bldFile="os\buildtools\toolsandutils\burtestserver\Group" mrp="os\buildtools\toolsandutils\burtestserver\Group\testtools_burtestserver.mrp"/>
+     </component>
+     <component name="cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt">
+      <unit bldFile="os\buildtools\toolsandutils\cbrtools\group" mrp="os\buildtools\toolsandutils\cbrtools\group\tools_cbr_tools.mrp"/>
+     </component>
+     <component name="prf" long-name="Product Realisation Framework">
+      <unit bldFile="os\buildtools\toolsandutils\prf\group" mrp="os\buildtools\toolsandutils\prf\group\tools_cbr_prf.mrp"/>
+     </component>
+     <component name="cdb" long-name="Code Database">
+      <unit bldFile="os\buildtools\toolsandutils\cdb\group" mrp="os\buildtools\toolsandutils\cdb\group\testtools_cdb.mrp"/>
+     </component>
+     <component name="e32tools" long-name="E32 Tools" class="PC" deprecated="tb91">
+      <unit bldFile="os\buildtools\toolsandutils\e32tools\group" mrp="os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp"/>
+     </component>
+     <component name="kitcomparator" long-name="Kit Comparator">
+      <unit bldFile="os\buildtools\toolsandutils\kitcomparator\group" mrp="os\buildtools\toolsandutils\kitcomparator\group\testtools_cts_kitcomparator.mrp"/>
+     </component>
+     <component name="wincredistribution" long-name="WinC Redistribution">
+      <unit mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_winc.mrp"/>
+     </component>
+     <component name="additionalredistribution" long-name="Additional Redistribution">
+      <unit mrp="os\buildtools\perltoolsplat_os\redistribution\additional_tools.mrp"/>
+     </component>
+     <component name="testdriver" long-name="Test Driver">
+      <unit bldFile="os\buildtools\toolsandutils\testdriver\Group" mrp="os\buildtools\toolsandutils\testdriver\Group\testtools_testdriver.mrp"/>
+     </component>
+     <component name="statapi" long-name="STAT API" filter="gt">
+      <unit bldFile="os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
+     </component>
+     <component name="statsource" long-name="STAT Source" filter="gt">
+      <unit mrp="os\buildtools\toolsandutils\statsource\group\testtools_stat_common_source.mrp"/>
+     </component>
+     <component name="statdesktop" long-name="STAT Desktop" filter="gt">
+      <unit bldFile="os\buildtools\toolsandutils\statdesktop\group" mrp="os\buildtools\toolsandutils\statdesktop\group\testtools_stat_desktop.mrp"/>
+     </component>
+     <component name="systemmonitor" long-name="System Monitor" introduced="8.0">
+      <unit bldFile="os\buildtools\toolsandutils\systemmonitor\group" mrp="os\buildtools\toolsandutils\systemmonitor\group\testtools_systemmonitor.mrp"/>
+     </component>
+     <component name="testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91">
+      <unit bldFile="os\buildtools\toolsandutils\testtoolsdesktop\group" mrp="os\buildtools\toolsandutils\testtoolsdesktop\group\testtools_desktop.mrp"/>
+     </component>
+     <component name="wintunnel" long-name="Wintunnel">
+      <unit mrp="os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
+     </component>
+     <component name="usecasecontroller" long-name="Use Case Controller">
+      <unit bldFile="os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group" mrp="os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group\testtools_ucc.mrp"/>
+     </component>
+     <component name="autotest" long-name="Autotest">
+      <unit bldFile="os\buildtools\toolsandutils\autotest\group" mrp="os\buildtools\toolsandutils\autotest\group\tools_autotest.mrp"/>
+     </component>
+     <component name="testconfigfileparser" long-name="Test Config File Parser">
+      <unit bldFile="os\buildtools\toolsandutils\testconfigfileparser\group" mrp="os\buildtools\toolsandutils\testconfigfileparser\group\tools_testconfigfileparser.mrp"/>
+     </component>
+     <component name="kitsetupapp" long-name="Kit Setup App" filter="gt">
+      <unit mrp="os\buildtools\toolsandutils\kitsetupapp\group\tools_devkits_kitsetupapp.mrp"/>
+     </component>
+     <component name="navigationpages" long-name="Navigation Pages">
+      <unit mrp="os\buildtools\toolsandutils\navigationpages\tools_sdk_eng_NavigationPages.mrp"/>
+     </component>
+     <component name="productinstaller" long-name="Product Installer" filter="gt">
+      <unit bldFile="os\buildtools\toolsandutils\productinstaller\group" mrp="os\buildtools\toolsandutils\productinstaller\group\tools_custkits_productinstaller.mrp"/>
+     </component>
+     <component name="stlport" long-name="STL Port">
+      <unit bldFile="os\buildtools\toolsandutils\stlport\group" mrp="os\buildtools\toolsandutils\stlport\group\tools_stlport.mrp"/>
+     </component>
+    </collection>
+    <collection name="dist_os" long-name="Redistribution" level="mw">
+     <component name="redistributionwinceka2" long-name="Redistribution WINC EKA2">
+      <unit bldFile="os\buildtools\dist_os\redistributionwinceka2" mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_cedar.mrp"/>
+     </component>
+    </collection>
+    <collection name="bintools_os" long-name="Binary Tools" level="fw">
+     <component name="rcomp" long-name="Resource Compiler">
+      <unit bldFile="os\buildtools\bintools_os\rcomp\group" mrp="os\buildtools\bintools_os\rcomp\group\tools_rcomp.mrp"/>
+     </component>
+     <component name="evalid" long-name="Evalid">
+      <unit bldFile="os\buildtools\bintools_os\evalid" mrp="os\buildtools\bintools_os\evalid\tools_evalid.mrp"/>
+     </component>
+    </collection>
+    <collection name="perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
+     <component name="redistribution" long-name="Redistribution" filter="gt">
+      <unit bldFile="os\buildtools\perltoolsplat_os\redistribution" mrp="os\buildtools\perltoolsplat_os\redistribution\tools_redistribution_common.mrp"/>
+     </component>
+     <component name="legacycommonperl" long-name="Legacy Common Perl Libraries">
+      <unit bldFile="os\buildtools\perltoolsplat_os\legacycommonperl\group" mrp="os\buildtools\perltoolsplat_os\legacycommonperl\group\tools_sdk_eng_perllibrary.mrp"/>
+     </component>
+     <component name="commonperl" long-name="Common Perl Libraries">
+      <unit bldFile="os\buildtools\perltoolsplat_os\commonperl\group" mrp="os\buildtools\perltoolsplat_os\commonperl\group\tools_sdk_eng_perl_shared.mrp"/>
+     </component>
+    </collection>
+    <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
+     <component name="e32toolp" long-name="E32 Perl Tools" class="PC">
+      <unit mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
+     </component>
+     <component name="bldtools" long-name="Build Tools" filter="gt">
+      <unit bldFile="os\buildtools\sbsv1_os\bldtools\group" mrp="os\buildtools\sbsv1_os\bldtools\group\tools_sdk_eng_build-tools.mrp"/>
+     </component>
+    </collection>
+    <collection name="srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
+     <component name="leavescan" long-name="Leavescan">
+      <unit bldFile="os\buildtools\srcanamdw_os\leavescan\group" mrp="os\buildtools\srcanamdw_os\leavescan\group\testtools_leavescan.mrp"/>
+     </component>
+     <component name="programchecker" long-name="Program Checker" deprecated="tb91">
+      <unit bldFile="os\buildtools\srcanamdw_os\programchecker\group" mrp="os\buildtools\srcanamdw_os\programchecker\group\testtools_programchecker.mrp"/>
+     </component>
+     <component name="migrationtool" long-name="Migration Tool">
+      <unit bldFile="os\buildtools\srcanamdw_os\migrationtool\group" mrp="os\buildtools\srcanamdw_os\migrationtool\group\testtools_migrationtool.mrp"/>
+     </component>
+    </collection>
+    <collection name="imgtools_os" long-name="Image Tools" level="fw">
+     <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91">
+      <unit bldFile="os\buildtools\imgtools_os\romkiteka2\group" mrp="os\buildtools\imgtools_os\romkiteka2\group\tools_romkit.mrp"/>
      </component>
     </collection>
-    <collection name="omaph4" long-name="OMAP H4" level="bsp">
-     <component name="h4bootloader" long-name="H4 Boot Loader" introduced="9.1">
-      <unit mrp="os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="os/boardsupport/omaph4/h4bootloader"/>
-     </component>
-     <component name="omaph4bsp" long-name="OMAP H4 BSP">
-      <unit bldFile="os/boardsupport/omaph4/omaph4bsp/h4" mrp="os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/>
-     </component>
-     <component name="omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2">
-      <unit mrp="os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="os/boardsupport/omaph4/omaph4minienvbootloader"/>
-     </component>
-     <component name="omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2">
-      <unit bldFile="os/boardsupport/omaph4/omaph4sdio" mrp="os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/>
-     </component>
-     <component name="omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2">
-      <unit bldFile="os/boardsupport/omaph4/omaph4unistore2" mrp="os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/>
+    <collection name="binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
+     <component name="captools" long-name="Capability Tools">
+      <unit bldFile="os\buildtools\binanamdw_os\captools\group" mrp="os\buildtools\binanamdw_os\captools\group\testtools_captools.mrp"/>
+     </component>
+     <component name="depcheck" long-name="Dependency Checker">
+      <unit bldFile="os\buildtools\binanamdw_os\depcheck" mrp="os\buildtools\binanamdw_os\depcheck\tools_depcheck.mrp"/>
+     </component>
+    </collection>
+    <collection name="devlib" long-name="Developer Library" level="ui">
+     <component name="devlibhelp" long-name="Developer Library Help">
+      <unit version="9.4" bldFile="os\buildtools\devlib\devlibhelp\group\devlib94" mrp="os\buildtools\devlib\devlibhelp\group\devlib94\developerlibrary_doc_html.mrp"/>
+     </component>
+     <component name="devlibsrc" long-name="Developer Library Source" filter="gt">
+      <unit bldFile="os\buildtools\devlib\devlibhelp\securitysupplement\doc_source" mrp="os\buildtools\devlib\devlibhelp\developerlibrary_doc_source.mrp"/>
+     </component>
+     <component name="devlibhtml" long-name="Developer Library HTML">
+      <unit mrp="os\buildtools\devlib\devlibhelp\group\shared\developerlibrary_doc_plain_html.mrp"/>
+     </component>
+     <component name="toolsdocs" long-name="Tools Documentation">
+      <unit mrp="os\buildtools\devlib\toolsdocs\tools_documentation.mrp"/>
      </component>
     </collection>
-    <collection name="omap3variants" long-name="OMAP3 Variants" level="bsp"/>
-   </block>
-   <block long-name="Generic OS Services" level="services" name="ossrv" levels="physical-abstraction app-libs encoding translation data-services utilities">
+    <collection name="misccomponents" long-name="Misc Components" level="mw">
+     <component name="runperl" long-name="Run PERL" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\runperl\group" mrp="os\buildtools\misccomponents\runperl\group\tools_sdk_eng_runperl.mrp"/>
+     </component>
+     <component name="assertion" long-name="Assertion" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\assertion\group" mrp="os\buildtools\misccomponents\assertion\group\tools_sdk_eng_assertion.mrp"/>
+     </component>
+     <component name="enum" long-name="Enum" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\enum\group" mrp="os\buildtools\misccomponents\enum\group\tools_sdk_eng_enum.mrp"/>
+     </component>
+     <component name="logger" long-name="Logger" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\logger\group" mrp="os\buildtools\misccomponents\logger\group\tools_sdk_eng_logger.mrp"/>
+     </component>
+     <component name="filesys" long-name="Filesys" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\filesys\group" mrp="os\buildtools\misccomponents\filesys\group\tools_sdk_eng_filesys.mrp"/>
+     </component>
+     <component name="envvar" long-name="Envvar" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\envvar\group" mrp="os\buildtools\misccomponents\envvar\group\tools_sdk_eng_envvar.mrp"/>
+     </component>
+     <component name="installutils" long-name="Install Utils" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\installutils\group" mrp="os\buildtools\misccomponents\installutils\group\tools_sdk_eng_installutils.mrp"/>
+     </component>
+     <component name="mnemonicfix" long-name="Mnemonic Fix" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\mnemonicfix\group" mrp="os\buildtools\misccomponents\mnemonicfix\group\tools_sdk_eng_mnemonicfix.mrp"/>
+     </component>
+     <component name="pathbrowser" long-name="Path Browser" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\pathbrowser\group" mrp="os\buildtools\misccomponents\pathbrowser\group\tools_sdk_eng_pathbrowser.mrp"/>
+     </component>
+     <component name="shellexec" long-name="Shell Exec" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\shellexec\group" mrp="os\buildtools\misccomponents\shellexec\group\tools_sdk_eng_shellexec.mrp"/>
+     </component>
+     <component name="swingworker" long-name="Swing Worker" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\swingworker\group" mrp="os\buildtools\misccomponents\swingworker\group\tools_sdk_eng_swingworker.mrp"/>
+     </component>
+     <component name="testcaserunner" long-name="Test Case Runner" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\testcaserunner\group" mrp="os\buildtools\misccomponents\testcaserunner\group\tools_sdk_eng_testcaserunner.mrp"/>
+     </component>
+     <component name="toolbarpanel" long-name="Tool Bar Panel" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\toolbarpanel\group" mrp="os\buildtools\misccomponents\toolbarpanel\group\tools_sdk_eng_toolbarpanel.mrp"/>
+     </component>
+     <component name="javahelp" long-name="Java Help" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\javahelp\group" mrp="os\buildtools\misccomponents\javahelp\group\tools_sdk_eng_javahelp.mrp"/>
+     </component>
+     <component name="langconfig" long-name="Language Config" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\langconfig\group" mrp="os\buildtools\misccomponents\langconfig\group\tools_sdk_eng_langconfig.mrp"/>
+     </component>
+     <component name="sdkinfo" long-name="SDK Info" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\sdkinfo\group" mrp="os\buildtools\misccomponents\sdkinfo\group\tools_sdk_eng_sdkinfo.mrp"/>
+     </component>
+     <component name="jade" long-name="Jade " filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\jade\group" mrp="os\buildtools\misccomponents\jade\group\tools_sdk_eng_jade.mrp"/>
+     </component>
+     <component name="sdkpackagemgr" long-name="SDK Package Manager" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\sdkpackagemgr\group" mrp="os\buildtools\misccomponents\sdkpackagemgr\group\tools_sdk_eng_sdkpkg-manager.mrp"/>
+     </component>
+     <component name="sdkpkgtools" long-name="SDK Package Tools" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\sdkpkgtools\group" mrp="os\buildtools\misccomponents\sdkpkgtools\group\tools_sdk_eng_sdkpkg-tools.mrp"/>
+     </component>
+     <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\emulatorlauncher\group" mrp="os\buildtools\misccomponents\emulatorlauncher\group\tools_sdk_eng_emulator_launcher.mrp"/>
+     </component>
+     <component name="pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\pkgmgrgui\group" mrp="os\buildtools\misccomponents\pkgmgrgui\group\tools_sdk_eng_pkgmgrgui.mrp"/>
+     </component>
+     <component name="launch" long-name="Launch" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\launch\group" mrp="os\buildtools\misccomponents\launch\group\tools_sdk_eng_launch.mrp"/>
+     </component>
+     <component name="toolsstubs" long-name="Devices Tools Stubs" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\toolsstubs\group" mrp="os\buildtools\misccomponents\toolsstubs\group\tools_sdk_eng_tools_stubs.mrp"/>
+     </component>
+     <component name="bspbuilder" long-name="BSP Builder" filter="gt">
+      <unit bldFile="os\buildtools\misccomponents\bspbuilder\group" mrp="os\buildtools\misccomponents\bspbuilder\group\tools_bspbuilder.mrp"/>
+     </component>
+     <component name="splash" long-name="Splash Screen">
+      <unit bldFile="os\buildtools\misccomponents\splash\group" mrp="os\buildtools\misccomponents\splash\group\tools_sdk_eng_splash.mrp"/>
+     </component>
+     <component name="sdkbuilder" long-name="SDK Building Tools">
+      <unit bldFile="os\buildtools\misccomponents\sdkbuilder\group" mrp="os\buildtools\misccomponents\sdkbuilder\group\tools_sdk_eng_sdk_builder.mrp"/>
+     </component>
+    </collection>
+    <collection name="javatoolsplat" long-name="Java Tools Platform" level="mw">
+     <component name="javalib" long-name="Java Library " filter="gt">
+      <unit bldFile="os\buildtools\javatoolsplat\javalib\group" mrp="os\buildtools\javatoolsplat\javalib\group\tools_sdk_eng_javalibrary.mrp"/>
+     </component>
+    </collection>
+    <collection name="fileconv" long-name="File Converters" level="mw">
+     <component name="cjpeg" long-name="CJpeg">
+      <unit bldFile="os\buildtools\fileconv\cjpeg\group" mrp="os\buildtools\fileconv\cjpeg\group\tools_sdk_eng_cjpeg.mrp"/>
+     </component>
+     <component name="alp2csh" long-name="ALP to CSH">
+      <unit bldFile="os\buildtools\fileconv\alp2csh\group" mrp="os\buildtools\fileconv\alp2csh\group\tools_sdk_eng_alp2csh.mrp"/>
+     </component>
+     <component name="rtf2ptml" long-name="RTF to PTML">
+      <unit bldFile="os\buildtools\fileconv\rtf2ptml\group" mrp="os\buildtools\fileconv\rtf2ptml\group\tools_sdk_eng_rtf2ptml.mrp"/>
+     </component>
+    </collection>
+   </block>   
+   <block name="ossrv" long-name="Generic OS Services" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+    <collection name="genericservices" long-name="Generic Services" level="utilities">
+     <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt">
+      <unit version="9.4" bldFile="os\ossrv\genericservices\s60compatibilityheaders\group94" mrp="os\ossrv\genericservices\s60compatibilityheaders\group94\tools_s60_header_compat94.mrp"/>
+     </component>
+     <component name="mimerecognitionfw" long-name="MIME Recognition Framework">
+      <unit bldFile="os\ossrv\genericservices\mimerecognitionfw\group" mrp="os\ossrv\genericservices\mimerecognitionfw\group\app-framework_emime.mrp"/>
+     </component>
+     <component name="systemagent" long-name="System Agent" introduced="9.0">
+      <unit bldFile="os\ossrv\genericservices\systemagent\group" mrp="os\ossrv\genericservices\systemagent\group\syslibs_sysagent2.mrp"/>
+     </component>
+     <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0">
+      <unit bldFile="os\ossrv\genericservices\taskscheduler\group" mrp="os\ossrv\genericservices\taskscheduler\group\syslibs_schsvr.mrp"/>
+     </component>
+     <component name="activebackupclient" long-name="Active Backup Client">
+      <unit bldFile="os\ossrv\genericservices\activebackupclient\group" mrp="os\ossrv\genericservices\activebackupclient\group\connectivity_abclient.mrp"/>
+     </component>
+     <component name="syslibsdocs" long-name="Syslibs Documentation" class="doc">
+      <unit mrp="os\ossrv\genericservices\syslibsdocs\syslibs_documentation.mrp"/>
+     </component>
+     <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2">
+      <unit bldFile="os\ossrv\genericservices\httputils\group" mrp="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" class="placeholder test" introduced="tb91">
+      <!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/ossrv/syslibsapitest/group/syslibssvs.mrp"/>
+			-->
+     </component>
+    </collection>
     <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
      <component name="ziplib" long-name="Zip Compression Library" introduced="6.0">
-      <unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
+      <unit bldFile="os\ossrv\compressionlibs\ziplib\group" mrp="os\ossrv\compressionlibs\ziplib\group\syslibs_ezlib.mrp"/>
      </component>
     </collection>
     <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
      <component name="cstdlib" long-name="C Standard Library" introduced="ER5">
-      <unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+      <unit bldFile="os\ossrv\genericopenlibs\cstdlib\group" mrp="os\ossrv\genericopenlibs\cstdlib\group\syslibs_stdlib.mrp"/>
      </component>
      <component name="openenvcore" long-name="Open Environment Core" introduced="tb91">
-      <unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-     </component>
-    </collection>
-    <collection name="genericservices" long-name="Generic Services" level="utilities">
-     <component name="activebackupclient" long-name="Active Backup Client">
-      <unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-     </component>
-     <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2">
-      <unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-     </component>
-     <component name="mimerecognitionfw" long-name="MIME Recognition Framework">
-      <unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-     </component>
-     <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt">
-      <unit version="9.4" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp"/>
-      <unit version="9.5" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group95" mrp="os/ossrv/genericservices/s60compatibilityheaders/group95/tools_s60_header_compat95.mrp"/>
-      <unit version="9.6" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group96" mrp="os/ossrv/genericservices/s60compatibilityheaders/group96/tools_s60_header_compat96.mrp"/>
-      <unit version="Future" bldFile="os/ossrv/genericservices/s60compatibilityheaders/groupfuture" mrp="os/ossrv/genericservices/s60compatibilityheaders/groupfuture/tools_s60_header_compatfuture.mrp"/>
-     </component>
-     <component name="syslibsdocs" long-name="Syslibs Documentation" class="doc">
-      <unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-     </component>
-     <component name="systemagent" long-name="System Agent" introduced="9.0">
-      <unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-     </component>
-     <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0">
-      <unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+      <unit bldFile="os\ossrv\genericopenlibs\openenvcore\group" mrp="os\ossrv\genericopenlibs\openenvcore\group\openenv.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">
+      <unit version="2" bldFile="os\ossrv\lowlevellibsandfws\pluginfw\Group" mrp="os\ossrv\lowlevellibsandfws\pluginfw\Group\syslibs_ecom.mrp"/>
+     </component>
      <component name="apputils" long-name="Application Utilities" introduced="ER5">
-      <unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-     </component>
-     <component name="pluginfw" long-name="Plugin Framework" introduced="6.2">
-      <unit version="2" bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp"/>
-     </component>
-    </collection>
-    <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-     <component name="syslibssvs" long-name="SysLibs SVS" introduced="9.2"/>
-    </collection>
-    <collection name="glib" long-name="Glib" level="utilities">
-     <component name="glibbackend" long-name="Glib Backend">
-      <!-- <unit bldFile="os/ossrv/glib/glibbackend/group"/> -->
-     </component>
-     <component name="libglib" long-name="Libglib">
-      <!-- <unit bldFile="os/ossrv/glib/libglib/group"/> -->
-     </component>
-     <component name="libgmodule" long-name="Libg Module">
-      <!-- <unit bldFile="os/ossrv/glib/libgmodule/group"/> -->
-     </component>
-     <component name="libgobject" long-name="Libg Object">
-      <!-- <unit bldFile="os/ossrv/glib/libgobject/group"/> -->
-     </component>
-     <component name="libgthread" long-name="Libg Thread">
-      <!-- <unit bldFile="os/ossrv/glib/libgthread/group"/> -->
-     </component>
-    </collection>
-    <collection name="ofdbus" long-name="OF Dbus" level="utilities">
-     <component name="dbus" long-name="Dbus">
-      <!-- <unit bldFile="os/ossrv/ofdbus/dbus/group"/> -->
-     </component>
-     <component name="dbus-glib" long-name="Dbus glib">
-      <!-- <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/> -->
-     </component>
-    </collection>
-    <collection name="ssl" long-name="SSL" level="data-services">
-     <component name="libcrypto" long-name="Libcrypto">
-      <!-- <unit bldFile="os/ossrv/ssl/libcrypto/group"/> -->
-     </component>
-     <component name="libssl" long-name="Libssl">
-      <!-- <unit bldFile="os/ossrv/ssl/libssl/group"/> -->
-     </component>
-    </collection>
-    <collection name="stdcpp" long-name="Stdcpp" level="translation">
-     <component name="stdcpp compo" long-name="Libstdcpp">
-      <!-- <unit bldFile="os/ossrv/stdcpp/stdcpp compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="stdlibs" long-name="Stdlibs" level="translation">
-     <component name="libcrypt" long-name="Libcrypt">
-      <!-- <unit bldFile="os/ossrv/stdlibs/libcrypt/group"/> -->
-     </component>
-     <component name="libz" long-name="Libz">
-      <!-- <unit bldFile="os/ossrv/stdlibs/libz/group"/> -->
-     </component>
-    </collection>
-    <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-     <component name="libutils" long-name="Utility Library">
-      <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/> -->
+      <unit bldFile="os\ossrv\lowlevellibsandfws\apputils\group" mrp="os\ossrv\lowlevellibsandfws\apputils\group\syslibs_bafl.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="OS Security" level="services" name="security" levels="physical-abstraction plugins libraries management services utilities">
-    <collection name="authenticationservices" long-name="Authentication Services" level="utilities"/>
-    <collection name="authorisation" long-name="Authorisation" level="utilities">
-     <component name="userpromptservice" long-name="User Prompt Service" introduced="tb92">
-      <unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-     </component>
-    </collection>
+   <block name="security" long-name="OS Security" level="services" levels="physical-abstraction plugins libraries management services utilities">
     <collection name="contentmgmt" long-name="Content Management" level="utilities">
+     <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1">
+      <unit bldFile="os\security\contentmgmt\contentaccessfwfordrm\group" mrp="os\security\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
+     </component>
      <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1">
-      <unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-     </component>
-     <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="tb92">
-      <unit bldFile="os/security/contentmgmt/cafstreamingsupport/group" mrp="os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
-     </component>
-     <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1">
-      <unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+      <unit bldFile="os\security\contentmgmt\cafrecogniserconfig" mrp="os\security\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp"/>
      </component>
     </collection>
     <collection name="crypto" long-name="Crypto Libraries" level="libraries">
-     <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92">
-      <unit bldFile="os/security/crypto/weakcryptospi/strong" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+     <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt">
+      <unit bldFile="os\security\crypto\weakcrypto\group" mrp="os\security\crypto\weakcrypto\group\security_crypto_weak.mrp"/>
      </component>
      <component name="strongcrypto" long-name="Strong Cryptography Library" filter="gt">
-      <unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
-     </component>
-     <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92">
-      <unit bldFile="os/security/crypto/weakcryptospi/group" mrp="os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-     </component>
-     <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt">
-      <unit bldFile="os/security/crypto/weakcrypto/group" mrp="os/security/crypto/weakcrypto/group/security_crypto_weak.mrp"/>
+      <unit bldFile="os\security\crypto\weakcrypto\strong" mrp="os\security\crypto\weakcrypto\group\security_crypto_strong.mrp"/>
      </component>
     </collection>
     <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-     <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0">
-      <unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-     </component>
-     <component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0">
-      <unit bldFile="os/security/cryptomgmtlibs/securitycommonutils/group" mrp="os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-     </component>
-     <component name="securitydocs" long-name="Security Documentation">
-      <unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+     <component name="securityutils" long-name="Security Utils" introduced="8.0">
+      <unit bldFile="os\security\cryptomgmtlibs\securityutils\group" mrp="os\security\cryptomgmtlibs\securityutils\group\security_common.mrp"/>
      </component>
      <component name="securitytestfw" long-name="Security Test Framework" introduced="7.0" class="test" deprecated="tb92">
-      <unit mrp="os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
-     </component>
-     <component name="securityutils" long-name="Security Utils" introduced="8.0">
-      <unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-     <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" plugin="Y" introduced="tb92">
-      <unit bldFile="os/security/cryptoplugins/cryptospiplugins/group" mrp="os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-     </component>
-    </collection>
-    <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-     <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0">
-      <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-     </component>
-     <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0">
-      <unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-     </component>
-     <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0">
-      <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-     </component>
-     <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s">
-      <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
+      <unit mrp="os\security\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
+     </component>
+     <component name="securitydocs" long-name="Security Documentation">
+      <unit mrp="os\security\cryptomgmtlibs\securitydocs\security_documentation.mrp"/>
+     </component>
+     <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0">
+      <unit bldFile="os\security\cryptomgmtlibs\cryptotokenfw\group" mrp="os\security\cryptomgmtlibs\cryptotokenfw\group\security_cryptotokens.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">
-      <unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+      <unit bldFile="os\security\securityanddataprivacytools\securityconfig\group" mrp="os\security\securityanddataprivacytools\securityconfig\group\security_config.mrp"/>
      </component>
      <component name="securitytools" long-name="Security Tools" class="PC" introduced="tb92">
-      <unit bldFile="os/security/securityanddataprivacytools/securitytools/group" mrp="os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+      <unit bldFile="os\security\securityanddataprivacytools\securitytools\group" mrp="os\security\securityanddataprivacytools\securitytools\group\security_tools.mrp"/>
+     </component>
+    </collection>
+    <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+     <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0">
+      <unit bldFile="os\security\cryptoservices\certificateandkeymgmt\group" mrp="os\security\cryptoservices\certificateandkeymgmt\group\security_certman.mrp"/>
+     </component>
+     <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0">
+      <unit bldFile="os\security\cryptoservices\filebasedcertificateandkeystores\group" mrp="os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
+     </component>
+     <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s">
+      <unit mrp="os\security\cryptoservices\rootcertificates\rootcerts.mrp"/>
+     </component>
+     <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0">
+      <unit bldFile="os\security\cryptoservices\asnpkcs\group" mrp="os\security\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Persistent Data Services" level="services" name="persistentdata" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="databaseabstraction" long-name="Database Abstraction" level="app-if">
-     <component name="dbmsemulationlib" long-name="DBMS Emulation Library" introduced="9.3">
-      <unit bldFile="os/persistentdata/databaseabstraction/dbmsemulationlib/group" mrp="os/persistentdata/databaseabstraction/dbmsemulationlib/group/syslibs_dbmssql.mrp"/>
+   <block name="persistentdata" long-name="Persistent Data Services" level="services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="featuremgmt" long-name="Feature Management" level="framework">
+     <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="Future">
+      <unit bldFile="os\persistentdata\featuremgmt\featureregistry\group" mrp="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">
-      <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+      <unit bldFile="os\persistentdata\loggingservices\eventlogger\group" mrp="os\persistentdata\loggingservices\eventlogger\group\syslibs_logeng.mrp"/>
      </component>
      <component name="filelogger" long-name="File Logger" introduced="ER5">
-      <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+      <unit bldFile="os\persistentdata\loggingservices\filelogger\group" mrp="os\persistentdata\loggingservices\filelogger\group\comms-infras_flogger.mrp"/>
      </component>
      <component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1">
-      <unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-     </component>
-    </collection>
-    <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-     <component name="centralrepository" long-name="Central Repository" introduced="7.0s">
-      <unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-     </component>
-     <component name="dbms" long-name="DBMS">
-      <unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-     </component>
-     <component name="sql" long-name="SQL" introduced="9.3">
-      <unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-     </component>
-     <component name="store" long-name="Store">
-      <unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+      <unit bldFile="os\persistentdata\loggingservices\rfilelogger\group" mrp="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">
-      <unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+      <unit bldFile="os\persistentdata\traceservices\commsdebugutility\group" mrp="os\persistentdata\traceservices\commsdebugutility\group\comms-infras_commsdebugutility.mrp"/>
      </component>
      <component name="tracefw" long-name="Trace Framework" introduced="9.2">
-      <unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+      <unit bldFile="os\persistentdata\traceservices\tracefw\ulogger\group" mrp="os\persistentdata\traceservices\tracefw\ulogger\group\tools_debug_trace.mrp"/>
      </component>
      <component name="utrace" long-name="UTrace" introduced="9.3" deprecated="tb91">
-      <unit bldFile="os/persistentdata/traceservices/utrace/group" mrp="os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
+      <unit bldFile="os\persistentdata\traceservices\utrace\group" mrp="os\persistentdata\traceservices\utrace\group\testtools_utrace_api.mrp"/>
      </component>
     </collection>
-    <collection name="featuremgmt" long-name="Feature Management" level="framework">
-     <component name="featuremgr" long-name="Feature Manager" introduced="tb92">
-      <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
-     </component>
-     <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="Future">
-      <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-     </component>
-     <component name="featuremanager" long-name="Feature Manager">
-      <!-- <unit bldFile="os/persistentdata/featuremgmt/featuremanager/group"/> -->
+    <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+     <component name="store" long-name="Store">
+      <unit bldFile="os\persistentdata\persistentstorage\store\group" mrp="os\persistentdata\persistentstorage\store\group\syslibs_store.mrp"/>
+     </component>
+     <component name="dbms" long-name="DBMS">
+      <unit bldFile="os\persistentdata\persistentstorage\dbms\group" mrp="os\persistentdata\persistentstorage\dbms\group\syslibs_dbms.mrp"/>
+     </component>
+     <component name="centralrepository" long-name="Central Repository" introduced="7.0s">
+      <unit bldFile="os\persistentdata\persistentstorage\centralrepository\group" mrp="os\persistentdata\persistentstorage\centralrepository\group\syslibs_centralrepository.mrp"/>
+     </component>
+     <component name="sql" long-name="SQL" introduced="9.3">
+      <unit bldFile="os\persistentdata\persistentstorage\sql\GROUP" mrp="os\persistentdata\persistentstorage\sql\GROUP\syslibs_sql.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Device Services" level="services" name="devicesrv" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if"/>
-    <collection name="systemhealthmanagement" long-name="System Health Management" level="server"/>
+   <block name="devicesrv" long-name="Device Services" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
      <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1">
-      <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-     </component>
-     <component name="reftsp" long-name="Remote Control Reference TSP" filter="techview" plugin="Y" introduced="9.1">
-      <unit bldFile="os/devicesrv/accessoryservices/reftsp/group" mrp="os/devicesrv/accessoryservices/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
-     </component>
-     <component name="accessorymonitor" long-name="Accessory Monitor">
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/> -->
-     </component>
-     <component name="accessoryremotecontrol" long-name="Accessory Remote Control">
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/> -->
-     </component>
-     <component name="accessoryserver" long-name="Accessory Server">
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/> -->
-     </component>
-     <component name="headsetstatusapi" long-name="Headset Status Api">
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/> -->
-     </component>
-     <component name="tspclientmapper" long-name="TSP Client Mapper">
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/> -->
-     </component>
-    </collection>
-    <collection name="commonservices" long-name="Common Services" level="app-if">
-     <component name="PlatformEnv" long-name="Platform Env">
-      <!-- <unit bldFile="os/devicesrv/commonservices/PlatformEnv/group"/> -->
-     </component>
-     <component name="activitymanager" long-name="Activity Manager">
-      <!-- <unit bldFile="os/devicesrv/commonservices/activitymanager/group"/> -->
-     </component>
-     <component name="commonengine" long-name="Common Engine">
-      <!-- <unit bldFile="os/devicesrv/commonservices/commonengine/group"/> -->
-     </component>
-     <component name="commonengineresources" long-name="Common Engine Resources">
-      <!-- <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/> -->
-     </component>
-     <component name="sysutil" long-name="Sysutil">
-      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/group"/> -->
-     </component>
-    </collection>
-    <collection name="dosservices" long-name="Dos Services" level="hw-if">
-     <component name="commondsy" long-name="Common DSY">
-      <!-- <unit bldFile="os/devicesrv/dosservices/commondsy/group"/> -->
-     </component>
-     <component name="dosserver" long-name="Dos Server">
-      <!-- <unit bldFile="os/devicesrv/dosservices/dosserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-     <component name="hapticsclient" long-name="Haptics Client">
-      <!-- <unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/> -->
-     </component>
-     <component name="hapticslicense" long-name="Haptics License">
-      <!-- <unit bldFile="os/devicesrv/hwrmhaptics/hapticslicense/group"/> -->
-     </component>
-     <component name="hapticspacketizer" long-name="Haptics Packetizer">
-      <!-- <unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/> -->
-     </component>
-     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager">
-      <!-- <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/> -->
-     </component>
-     <component name="hapticspluginservice" long-name="Haptics Plugin Service">
-      <!-- <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/> -->
-     </component>
-     <component name="hapticsserver" long-name="Haptics Server">
-      <!-- <unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="mediator" long-name="Mediator" level="app-if">
-     <component name="MediatorClient.dll=binary">
-      <!-- <unit bldFile="os/devicesrv/mediator/MediatorClient.dll=binary/group"/> -->
-     </component>
-     <component name="MediatorPluginBase.dll=binary">
-      <!-- <unit bldFile="os/devicesrv/mediator/MediatorPluginBase.dll=binary/group"/> -->
-     </component>
-     <component name="MediatorServer.exe=binary">
-      <!-- <unit bldFile="os/devicesrv/mediator/MediatorServer.exe=binary/group"/> -->
-     </component>
-     <component name="mediatorclientstub.dll=binary">
-      <!-- <unit bldFile="os/devicesrv/mediator/mediatorclientstub.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="psmservices" long-name="PSM Services" level="app-if">
-     <component name="psmserver" long-name="PSM Server">
-      <!-- <unit bldFile="os/devicesrv/psmservices/psmserver/group"/> -->
+      <unit bldFile="os\devicesrv\accessoryservices\remotecontrolfw\group" mrp="os\devicesrv\accessoryservices\remotecontrolfw\group\bluetooth_remotecontrol.mrp"/>
+     </component>
+     <component name="reftsp" long-name="Remote Control Reference TSP" plugin="Y" introduced="9.1">
+      <unit bldFile="os\devicesrv\accessoryservices\reftsp\group" mrp="os\devicesrv\accessoryservices\reftsp\group\bluetooth_remotecontrol_refTSP.mrp"/>
      </component>
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="ClientDll" long-name="Client DLL">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/ClientDll/group"/> -->
-     </component>
-     <component name="CommonDll" long-name="Common DLL">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/CommonDll/group"/> -->
-     </component>
-     <component name="ExtendedLightClientDll" long-name="Extended Light Client DLL">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/ExtendedLightClientDll/group"/> -->
-     </component>
-     <component name="FmTxClientDll" long-name="FM TX Client DLL">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/FmTxClientDll/group"/> -->
-     </component>
      <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91">
-      <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-     </component>
-     <component name="LightClientDll" long-name="Light Client DLL">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/LightClientDll/group"/> -->
+      <unit bldFile="os\devicesrv\resourcemgmt\hwresourcesmgr\group" mrp="os\devicesrv\resourcemgmt\hwresourcesmgr\group\telephony_hwrm.mrp"/>
      </component>
      <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0">
-      <unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-     </component>
-     <component name="ServerExe" long-name="Server Exe">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/ServerExe/group"/> -->
-     </component>
-     <component name="VibraClientDll" long-name="Vibra Client DLL">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/VibraClientDll/group"/> -->
-     </component>
-     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
-     </component>
-     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-     </component>
-     <component name="vibractrl" long-name="Vibra Control">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/> -->
-     </component>
-    </collection>
-    <collection name="sensordrivers" long-name="Sensor Drivers" level="adaptation"/>
-    <collection name="sensorservices" long-name="Sensor Services" level="framework">
-     <component name="orientationssy" long-name="Orientation SSY">
-      <!-- <unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/> -->
-     </component>
-     <component name="sensorserver" long-name="Sensor Server">
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/> -->
-     </component>
-     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY">
-      <!-- <unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/> -->
+      <unit bldFile="os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group" mrp="os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group\syslibs_pwrcli.mrp"/>
      </component>
     </collection>
     <collection name="sysstatemgmt" long-name="System State Management" level="server">
      <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92">
-      <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-     </component>
-     <component name="starter" long-name="Starter">
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/> -->
+      <unit bldFile="os\devicesrv\sysstatemgmt\systemstarter\group" mrp="os\devicesrv\sysstatemgmt\systemstarter\group\app-framework_sysstart.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Locating Services" level="services" name="lbs" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-     <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-     </component>
-    </collection>
+   <block name="lbs" long-name="Locating Services" level="services" levels="hw-if data-acquisition adaptation management application-interface">
     <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-     <component name="agpsintegrationmodule" long-name="A-GPS Integration Module" plugin="Y" introduced="9.2">
-      <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/>
+     <component name="defaultpositioningmodule" long-name="Default Positioning Module" plugin="Y" introduced="tb91">
+      <unit bldFile="os\lbs\datasourcemodules\defaultpositioningmodule\group" mrp="os\lbs\datasourcemodules\defaultpositioningmodule\group\lbs_default_positioning_module.mrp"/>
      </component>
      <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-     </component>
-     <component name="defaultpositioningmodule" long-name="Default Positioning Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+      <unit bldFile="os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group" mrp="os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group\lbs_bt_positioning_module.mrp"/>
      </component>
      <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-     </component>
-     <component name="locationbtgpspsy" long-name="BT GPS PSY">
-      <!-- <unit bldFile="os/lbs/datasourcemodules/locationbtgpspsy/group"/> -->
-     </component>
-     <component name="locationnpppsy" long-name="Location NPP PSY">
-      <!-- <unit bldFile="os/lbs/datasourcemodules/locationnpppsy/group"/> -->
-     </component>
-     <component name="locationsuplpsy" long-name="Location SUPL PSY">
-      <!-- <unit bldFile="os/lbs/datasourcemodules/locationsuplpsy/group"/> -->
+      <unit bldFile="os\lbs\datasourcemodules\simulationpositioningmodule\group" mrp="os\lbs\datasourcemodules\simulationpositioningmodule\group\lbs_simulation_positioning_module.mrp"/>
+     </component>
+     <component name="agpsintegrationmodule" long-name="A-GPS Integration Module" plugin="Y" introduced="9.2">
+      <unit bldFile="os\lbs\datasourcemodules\agpsintegrationmodule\group" mrp="os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp"/>
+     </component>
+    </collection>
+    <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+     <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" plugin="Y" introduced="tb91">
+      <unit bldFile="os\lbs\datasourceadaptation\gpsdatasourceadaptation\group" mrp="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">
+      <unit bldFile="os\lbs\locationrequestmgmt\locationserver\group" mrp="os\lbs\locationrequestmgmt\locationserver\group\lbs_locationserver.mrp"/>
+     </component>
+     <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2">
+      <unit bldFile="os\lbs\locationrequestmgmt\networkrequesthandler\group" mrp="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" class="test">
+      <unit mrp="os\lbs\lbstest\lbstestproduct\group\lbs_testproduct.mrp"/>
+     </component>
+     <component name="locationprotocoltest" long-name="Location Protocol Tests" plugin="Y" introduced="9.2">
+      <unit bldFile="os\lbs\lbstest\locationprotocoltest\group" mrp="os\lbs\lbstest\locationprotocoltest\group\lbs_networktest.mrp"/>
      </component>
     </collection>
     <collection name="locationmgmt" long-name="Location Management" level="management">
      <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-     </component>
-     <component name="locationcore" long-name="Location Core" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-     </component>
-     <component name="networkgateway" long-name="Network Gateway" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+      <unit bldFile="os\lbs\locationmgmt\agpslocationmgr\group" mrp="os\lbs\locationmgmt\agpslocationmgr\group\lbs_agpslocationmanager.mrp"/>
      </component>
      <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2">
-      <unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-     </component>
-    </collection>
-    <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-     <component name="locationserver" long-name="Location Server" introduced="9.2">
-      <unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-     </component>
-     <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2">
-      <unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+      <unit bldFile="os\lbs\locationmgmt\networklocationmgr\group" mrp="os\lbs\locationmgmt\networklocationmgr\group\lbs_networklocationmanager.mrp"/>
+     </component>
+     <component name="locationcore" long-name="Location Core" introduced="9.2">
+      <unit bldFile="os\lbs\locationmgmt\locationcore\group" mrp="os\lbs\locationmgmt\locationcore\group\lbs_admin.mrp"/>
+     </component>
+     <component name="networkgateway" long-name="Network Gateway" introduced="9.2">
+      <unit bldFile="os\lbs\locationmgmt\networkgateway\group" mrp="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" plugin="Y" introduced="tb91">
-      <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+      <unit bldFile="os\lbs\networkprotocolmodules\privacyprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\privacyprotocolmodule\group\lbs_privacyprotocolmodule.mrp"/>
      </component>
      <component name="suplprotocolmodule" long-name="SUPL Protocol Module" plugin="Y" introduced="tb91" deprecated="tb91">
-      <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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" class="test">
-      <unit mrp="os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
-     </component>
-     <component name="locationprotocoltest" long-name="Location Protocol Tests" plugin="Y" introduced="9.2">
-      <unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+      <unit bldFile="os\lbs\networkprotocolmodules\suplprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Communications Framework" level="services" name="commsfw" levels="server support  framework process app-if">
-    <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
-     <component name="refcpr" long-name="Reference CPR" plugin="Y" introduced="9.2">
-      <unit bldFile="os/commsfw/baseconnectionproviders/refcpr/group" mrp="os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
-     </component>
-     <component name="refscpr" long-name="Reference SCPR" plugin="Y" introduced="9.2">
-      <unit bldFile="os/commsfw/baseconnectionproviders/refscpr/group" mrp="os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
+   <block name="commsfw" long-name="Communications Framework" level="services" levels="server support  framework process app-if">
+    <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+     <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" class="placeholder test" introduced="tb91">
+      <!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/commsfw/commsinfrastructureapitest/group/commsinfrastructuresvs.mrp"/>
+			-->
+     </component>
+    </collection>
+    <collection name="commsprocess" long-name="Comms Process" level="process">
+     <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s">
+      <unit bldFile="os\commsfw\commsprocess\commsrootserverconfig\group" mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver.mrp"/>
+     </component>
+     <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" class="config">
+      <unit mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver-config.mrp"/>
      </component>
     </collection>
     <collection name="commsconfig" long-name="Comms Config" level="process">
      <component name="commsdatabase" long-name="Comms Database">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+      <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\group\comms-infras_commsdat.mrp"/>
      </component>
      <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1">
-      <unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+      <unit bldFile="os\commsfw\commsconfig\commsdatabaseshim\group" mrp="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">
+      <unit version="2" bldFile="os\commsfw\datacommsserver\esockserver\group" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock.mrp"/>
+     </component>
+     <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" class="config">
+      <unit version="2" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock-config.mrp"/>
+     </component>
+     <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U">
+      <unit version="1" bldFile="os\commsfw\datacommsserver\networkinterfacemgr\group" mrp="os\commsfw\datacommsserver\networkinterfacemgr\group\comms-infras_nifman.mrp"/>
+     </component>
+     <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1">
+      <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\group" mrp="os\commsfw\datacommsserver\networkingdialogapi\group\networking_dialog.mrp"/>
+     </component>
+     <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1">
+      <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\default" mrp="os\commsfw\datacommsserver\networkingdialogapi\default\networking_dialog_default.mrp"/>
+     </component>
+     <component name="networkcontroller" long-name="Network Controller" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\commsfw\datacommsserver\networkcontroller\group" mrp="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" class="placeholder" plugin="Y" introduced="ER5">
+      <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
+     </component>
+     <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" class="test">
+      <unit bldFile="os\commsfw\serialserver\packetloopbackcsy\group" mrp="os\commsfw\serialserver\packetloopbackcsy\group\PacketLoopbackCSY.mrp"/>
+     </component>
+     <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5">
+      <unit bldFile="os\commsfw\serialserver\c32serialserver\group" mrp="os\commsfw\serialserver\c32serialserver\group\ser-comms_c32.mrp"/>
+     </component>
+     <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" class="config">
+      <unit bldFile="os\commsfw\serialserver\c32serialserverconfig" mrp="os\commsfw\serialserver\c32serialserverconfig\ser-comms_c32-config.mrp"/>
+     </component>
+     <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation">
+      <unit mrp="os\commsfw\serialserver\c32serialserverdocs\ser-comms_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
+     <component name="refcpr" long-name="Reference CPR" plugin="Y" introduced="9.2">
+      <unit bldFile="os\commsfw\baseconnectionproviders\refcpr\group" mrp="os\commsfw\baseconnectionproviders\refcpr\group\networking_ReferenceCPR.mrp"/>
+     </component>
+     <component name="refscpr" long-name="Reference SCPR" plugin="Y" introduced="9.2">
+      <unit bldFile="os\commsfw\baseconnectionproviders\refscpr\group" mrp="os\commsfw\baseconnectionproviders\refscpr\group\networking_ReferenceSCPR.mrp"/>
      </component>
     </collection>
     <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
      <component name="commfw" long-name="Comms Framework" introduced="7.0s">
-      <unit bldFile="os/commsfw/commsfwutils/commfw/group" mrp="os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
+      <unit bldFile="os\commsfw\commsfwutils\commfw\group" mrp="os\commsfw\commsfwutils\commfw\group\comms-infras_commsfw.mrp" priority="10"/>
      </component>
      <component name="mbufmgr" long-name="MBuf Manager" introduced="7.0s">
-      <unit bldFile="os/commsfw/commsfwutils/mbufmgr/group" mrp="os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-     <component name="commstools" long-name="Comms Tools" introduced="tb91" class="PC">
-      <unit mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-     </component>
-     <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" class="PC">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-     </component>
-     <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" class="config PC">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsprocess" long-name="Comms Process" level="process">
-     <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s">
-      <unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-     </component>
-     <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" class="config">
-      <unit mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-     <component name="commsinfrastructuresvs" long-name="Comms-Infras SVS" introduced="9.2" class="test"/>
-    </collection>
-    <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-     <component name="esockserver" long-name="ESock Server">
-      <unit version="2" bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
-      <unit version="3" bldFile="os/unref/orphan/comgen/comms-infras/esock/group" mrp="os/unref/orphan/comgen/comms-infras/esock/group/comms-infras_esock.mrp"/>
-     </component>
-     <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" class="config">
-      <unit version="2" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp"/>
-      <unit version="3" mrp="os/unref/orphan/comgen/comms-infras/esock/group/comms-infras_esock-config.mrp"/>
-     </component>
-     <component name="networkcontroller" long-name="Network Controller" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-     </component>
-     <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U">
-      <unit version="1" bldFile="os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
-      <unit version="2" bldFile="os/unref/orphan/comgen/comms-infras/nifman/group" mrp="os/unref/orphan/comgen/comms-infras/nifman/group/comms-infras_nifman.mrp"/>
-     </component>
-     <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1">
-      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-     </component>
-     <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1">
-      <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/default" mrp="os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-     </component>
-    </collection>
-    <collection name="serialserver" long-name="Serial Server" level="server">
-     <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5">
-      <unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-     </component>
-     <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" class="config">
-      <unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-     </component>
-     <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation">
-      <unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-     </component>
-     <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" class="test">
-      <unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-     </component>
-     <component name="serialportcsy" long-name="Serial Port CSY" class="placeholder" plugin="Y" introduced="ER5">
-      <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
+      <unit bldFile="os\commsfw\commsfwutils\mbufmgr\group" mrp="os\commsfw\commsfwutils\mbufmgr\group\comms-infras_mbufmgr.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" class="doc">
-      <unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+      <unit mrp="os\commsfw\commsfw_info\commsinfrastructuredocs\comms-infras_documentation.mrp"/>
      </component>
     </collection>
     <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
      <component name="commselements" long-name="Comms Elements" introduced="8.0">
-      <unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+      <unit bldFile="os\commsfw\commsfwsupport\commselements\group" mrp="os\commsfw\commsfwsupport\commselements\group\comms-infras_elements.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" class="config PC">
+      <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group\comms-infras_defaultcommdb.mrp"/>
+     </component>
+     <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" class="PC">
+      <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group\comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+     </component>
+     <component name="commstools" long-name="Comms Tools" introduced="tb91" class="PC">
+      <unit mrp="os\commsfw\commsfwtools\commstools\group\comms-infras_tools.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Networking Services" level="services" name="networkingsrv" levels="adaptation hw-if plugin framework server app-if">
+   <block name="networkingsrv" long-name="Networking Services" level="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">
-      <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+      <unit bldFile="os\networkingsrv\esockapiextensions\internetsockets\group" mrp="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">
+      <unit bldFile="os\networkingsrv\tcpiputils\dnd\group" mrp="os\networkingsrv\tcpiputils\dnd\group\networking_dnd.mrp"/>
+     </component>
+     <component name="dndconfig" long-name="DND Config" introduced="7.0" class="config">
+      <unit mrp="os\networkingsrv\tcpiputils\dnd\group\networking_dnd-config.mrp"/>
+     </component>
+     <component name="dhcp" long-name="DHCP" introduced="8.0">
+      <unit bldFile="os\networkingsrv\tcpiputils\dhcp\group" mrp="os\networkingsrv\tcpiputils\dhcp\group\networking_dhcp.mrp"/>
+     </component>
+     <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" plugin="Y" introduced="tb91">
+      <unit bldFile="os\networkingsrv\tcpiputils\networkaddressandporttranslation\group" mrp="os\networkingsrv\tcpiputils\networkaddressandporttranslation\group\networking_napt.mrp"/>
      </component>
     </collection>
     <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
      <component name="nullagt" long-name="NULL AGT" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+      <unit bldFile="os\networkingsrv\linklayercontrol\nullagt\group" mrp="os\networkingsrv\linklayercontrol\nullagt\group\networking_nullagt.mrp"/>
      </component>
     </collection>
     <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
      <component name="ethernetnif" long-name="Ethernet NIF" plugin="Y">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+      <unit bldFile="os\networkingsrv\linklayerprotocols\ethernetnif\group" mrp="os\networkingsrv\linklayerprotocols\ethernetnif\group\networking_ether802.mrp"/>
      </component>
      <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" plugin="Y" introduced="7.0">
-      <unit mrp="os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
+      <unit mrp="os\networkingsrv\linklayerprotocols\ethernetpacketdriver\group\networking_etherdrv_srconly.mrp"/>
+     </component>
+     <component name="pppnif" long-name="PPP NIF" plugin="Y" introduced="ER5">
+      <unit version="1" bldFile="os\networkingsrv\linklayerprotocols\pppnif\group" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp.mrp"/>
      </component>
      <component name="pppconfig" long-name="PPP Config" introduced="ER5">
-      <unit version="1" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp"/>
-      <unit version="2" mrp="os/unref/orphan/comgen/networking/ppp/group/networking_ppp-config.mrp"/>
-     </component>
-     <component name="pppnif" long-name="PPP NIF" plugin="Y" introduced="ER5">
-      <unit version="1" bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
-      <unit version="2" bldFile="os/unref/orphan/comgen/networking/ppp/group" mrp="os/unref/orphan/comgen/networking/ppp/group/networking_ppp.mrp"/>
+      <unit version="1" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp-config.mrp"/>
      </component>
      <component name="slipnif" long-name="SLIP NIF" plugin="Y">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+      <unit bldFile="os\networkingsrv\linklayerprotocols\slipnif\group" mrp="os\networkingsrv\linklayerprotocols\slipnif\group\networking_slip.mrp"/>
      </component>
      <component name="tunnelnif" long-name="Tunnel NIF" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+      <unit bldFile="os\networkingsrv\linklayerprotocols\tunnelnif\group" mrp="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" class="test">
-      <unit bldFile="os/networkingsrv/linklayerutils/packetlogger/group" mrp="os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+      <unit bldFile="os\networkingsrv\linklayerutils\packetlogger\group" mrp="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" class="config">
+      <unit mrp="os\networkingsrv\networkcontrol\qosfwconfig\qos\group\networking_qos-config.mrp"/>
+     </component>
+     <component name="qoslib" long-name="QoS Library" introduced="7.0s">
+      <unit bldFile="os\networkingsrv\networkcontrol\qoslib\group" mrp="os\networkingsrv\networkcontrol\qoslib\group\networking_qoslib.mrp"/>
+     </component>
+     <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s">
+      <unit bldFile="os\networkingsrv\networkcontrol\pfqoslib\group" mrp="os\networkingsrv\networkcontrol\pfqoslib\group\networking_pfqoslib.mrp"/>
+     </component>
+     <component name="qosfwprt" long-name="QoS Framework PRT" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\networkingsrv\networkcontrol\qosfwconfig\qos\group" mrp="os\networkingsrv\networkcontrol\qosfwconfig\qos\group\networking_qos.mrp"/>
+     </component>
      <component name="ipcpr" long-name="IP CPR" plugin="Y" introduced="8.1">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipcpr/group" mrp="os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
-     </component>
-     <component name="ipcprshim" long-name="IP CPR Shim" plugin="Y" deprecated="Future">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipcprshim/group" mrp="os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
-     </component>
-     <component name="ipnetworklayer" long-name="IP Network Layer" plugin="Y" introduced="tb92">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+      <unit bldFile="os\networkingsrv\networkcontrol\ipcpr\group" mrp="os\networkingsrv\networkcontrol\ipcpr\group\networking_ipcpr.mrp"/>
      </component>
      <component name="ipscpr" long-name="IP SCPR" plugin="Y" introduced="9.1">
-      <unit bldFile="os/networkingsrv/networkcontrol/ipscpr/group" mrp="os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
-     </component>
-     <component name="iptransportlayer" long-name="IP Transport Layer" plugin="Y">
-      <unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-     </component>
-     <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-     </component>
-     <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" class="config">
-      <unit mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
-     </component>
-     <component name="qosfwprt" long-name="QoS Framework PRT" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-     </component>
-     <component name="qosipscpr" long-name="QoS IP SCPR" plugin="Y">
-      <unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-     </component>
-     <component name="qoslib" long-name="QoS Library" introduced="7.0s">
-      <unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+      <unit bldFile="os\networkingsrv\networkcontrol\ipscpr\group" mrp="os\networkingsrv\networkcontrol\ipscpr\group\networking_ipscpr.mrp"/>
+     </component>
+     <component name="ipcprshim" long-name="IP CPR Shim" plugin="Y" deprecated="Future">
+      <unit bldFile="os\networkingsrv\networkcontrol\ipcprshim\group" mrp="os\networkingsrv\networkcontrol\ipcprshim\group\networking_shimcpr.mrp"/>
      </component>
     </collection>
     <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+     <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" class="config">
+      <unit mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6-config.mrp"/>
+     </component>
      <component name="ipeventnotifier" long-name="IP Event Notifier" plugin="Y" introduced="8.1">
-      <unit bldFile="os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+      <unit bldFile="os\networkingsrv\networkprotocols\ipeventnotifier\group" mrp="os\networkingsrv\networkprotocols\ipeventnotifier\group\networking_ipeventnotifier.mrp"/>
+     </component>
+     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" plugin="Y" introduced="7.0">
+      <unit bldFile="os\networkingsrv\networkprotocols\tcpipv4v6prt\group" mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6.mrp"/>
      </component>
      <component name="iphook" long-name="IP Hook" introduced="7.0">
-      <unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+      <unit bldFile="os\networkingsrv\networkprotocols\iphook\inhook6\group" mrp="os\networkingsrv\networkprotocols\iphook\inhook6\group\networking_inhook6.mrp"/>
      </component>
      <component name="mobileip" long-name="Mobile IP" plugin="Y" introduced="8.1">
-      <unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-     </component>
-     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" plugin="Y" introduced="7.0">
-      <unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-     </component>
-     <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" class="config">
-      <unit mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
+      <unit bldFile="os\networkingsrv\networkprotocols\mobileip\group" mrp="os\networkingsrv\networkprotocols\mobileip\group\networking_mobileip.mrp"/>
      </component>
     </collection>
     <collection name="networksecurity" long-name="Network Security" level="framework">
-     <component name="ipsec" long-name="IPsec" introduced="7.0">
-      <unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-     </component>
      <component name="tls" long-name="TLS" introduced="6.0">
-      <unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+      <unit bldFile="os\networkingsrv\networksecurity\tls\group" mrp="os\networkingsrv\networksecurity\tls\group\networking_tls.mrp"/>
      </component>
      <component name="tlsprovider" long-name="TLS Provider" introduced="8.1">
-      <unit bldFile="os/networkingsrv/networksecurity/tlsprovider/group" mrp="os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+      <unit bldFile="os\networkingsrv\networksecurity\tlsprovider\group" mrp="os\networkingsrv\networksecurity\tlsprovider\group\security_tlsprovider.mrp"/>
+     </component>
+     <component name="ipsec" long-name="IPsec" introduced="7.0">
+      <unit bldFile="os\networkingsrv\networksecurity\ipsec\group" mrp="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" class="test">
+      <unit mrp="os\networkingsrv\networkingtestandutils\networkingunittest\group\networking_unittest.mrp"/>
+     </component>
+     <component name="networkingexamples" long-name="Networking Examples" introduced="7.0">
+      <unit bldFile="os\networkingsrv\networkingtestandutils\networkingexamples\examplecode\group" mrp="os\networkingsrv\networkingtestandutils\networkingexamples\examplecode\group\networking_examplecode.mrp"/>
+     </component>
      <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5">
-      <unit mrp="os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
-     </component>
-     <component name="ipanalyzer" long-name="IP Analyzer" introduced="7.0" deprecated="tb92">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\exampleinternetutilities\group\networking_inetutil.mrp"/>
      </component>
      <component name="ipprobe" long-name="IP Probe" plugin="Y" introduced="7.0s">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\ipprobe\group\networking_probe.mrp"/>
      </component>
      <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" plugin="Y">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
-     </component>
-     <component name="networkingexamples" long-name="Networking Examples" introduced="7.0">
-      <unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group\networking_6to4.mrp"/>
+     </component>
+     <component name="ipanalyzer" long-name="IP Analyzer" introduced="7.0" deprecated="tb92">
+      <unit mrp="os\networkingsrv\networkingtestandutils\ipanalyzer\group\networking_iprotor.mrp"/>
      </component>
      <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" class="test">
-      <unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-     </component>
-     <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" class="test">
-      <unit mrp="os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
+      <unit bldFile="os\networkingsrv\networkingtestandutils\networkingintegrationtest\Group" mrp="os\networkingsrv\networkingtestandutils\networkingintegrationtest\Group\networking_integrationtest.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+     <component name="networkingrom" long-name="Networking ROM">
+      <!--  production component: contains the IBY files -->
+      <unit bldFile="os\networkingsrv\networkingsrv_info\networkingrom\group" mrp="os\networkingsrv\networkingsrv_info\networkingrom\group\networking_general.mrp"/>
+     </component>
+     <component name="networkingdocs" long-name="Networking Documentation" class="doc">
+      <unit mrp="os\networkingsrv\networkingsrv_info\networkingdocs\networking_documentation.mrp"/>
      </component>
     </collection>
     <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
      <component name="predictorcompression" long-name="Predictor Compression" plugin="Y" introduced="6.0">
-      <unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsdb" long-name="Comms DB" level="server">
-     <component name="s60_commsdb" long-name="S60 Commsdb">
-      <!-- <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/> -->
-     </component>
-    </collection>
-    <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-     <component name="networkingdocs" long-name="Networking Documentation" class="doc">
-      <unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-     </component>
-     <component name="networkingrom" long-name="Networking ROM">
-      <!--  production component: contains the IBY files -->
-      <unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-     </component>
-    </collection>
-    <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-     <component name="dhcp" long-name="DHCP" introduced="8.0">
-      <unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-     </component>
-     <component name="dnd" long-name="DND" introduced="7.0">
-      <unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-     </component>
-     <component name="dndconfig" long-name="DND Config" introduced="7.0" class="config">
-      <unit mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
-     </component>
-     <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" plugin="Y" introduced="tb91">
-      <unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+      <unit bldFile="os\networkingsrv\pppcompressionplugins\predictorcompression\group" mrp="os\networkingsrv\pppcompressionplugins\predictorcompression\group\networking_predcomp.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="WLAN" level="services" name="wlan" levels="hw 1 mid 3 tools test">
-    <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-     <component name="wlanagent" long-name="WLAN Agent">
-      <!-- <unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/> -->
-     </component>
-     <component name="wlandbif_cd" long-name="WLAN CommsDat interface">
-      <!-- <unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/> -->
-     </component>
-     <component name="wlanengine" long-name="WLAN Engine">
-      <!-- <unit bldFile="os/wlan/wlan_bearer/wlanengine/group"/> -->
-     </component>
-     <component name="wlanldd" long-name="WLAN LDD">
-      <!-- <unit bldFile="os/wlan/wlan_bearer/wlanldd/group"/> -->
-     </component>
-     <component name="wlannwif" long-name="WLAN Network Interface">
-      <!-- <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/> -->
-     </component>
-     <component name="wlanpsmplugin" long-name="WLAN PSM Plugin">
-      <!-- <unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/> -->
+   <block name="cellularsrv" long-name="Cellular Baseband Services" level="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">
+      <unit bldFile="os\cellularsrv\basebandabstraction\basebandchanneladaptor\group" mrp="os\cellularsrv\basebandabstraction\basebandchanneladaptor\group\networking_bca.mrp"/>
+     </component>
+     <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92">
+      <unit bldFile="os\cellularsrv\basebandabstraction\intersystemcomm\group" mrp="os\cellularsrv\basebandabstraction\intersystemcomm\group\networking_isc.mrp"/>
      </component>
     </collection>
-    <collection name="wlantools" long-name="WLAN Tools" level="tools">
-     <component name="dut" long-name="Dut">
-      <!-- <unit bldFile="os/wlan/wlantools/dut/group"/> -->
-     </component>
-     <component name="ping" long-name="Ping">
-      <!-- <unit bldFile="os/wlan/wlantools/ping/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Cellular Baseband Services" level="services" name="cellularsrv" levels="adaptation hw-if plugin framework server app-if">
     <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
      <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" plugin="Y" introduced="8.1">
-      <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-     </component>
-     <component name="basebandchanneladaptorforisc" long-name="Baseband Channel Adaptor for ISC" plugin="Y">
-      <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforisc/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforisc/group/networking_bcatoisc.mrp"/>
+      <unit bldFile="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" mrp="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group\networking_c32bca.mrp"/>
      </component>
     </collection>
     <collection name="fax" long-name="Fax" level="server">
      <component name="faxclientandserver" long-name="Fax Client and Server">
-      <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-     </component>
-    </collection>
-    <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-     <component name="mocksy" long-name="MockSY" introduced="tb91" plugin="Y">
-      <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+      <unit bldFile="os\cellularsrv\fax\faxclientandserver\Group" mrp="os\cellularsrv\fax\faxclientandserver\Group\telephony_fax.mrp"/>
      </component>
     </collection>
     <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+     <component name="smsstack" long-name="SMS Stack" plugin="Y" introduced="6.0">
+      <unit bldFile="os\cellularsrv\smsprotocols\smsstack\group" mrp="os\cellularsrv\smsprotocols\smsstack\group\nbprotocols_smsstackv2.mrp"/>
+     </component>
      <component name="cdmasmsstack" long-name="CDMA SMS Stack" plugin="Y" introduced="8.0">
-      <unit bldFile="os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/>
-     </component>
-     <component name="smsstack" long-name="SMS Stack" plugin="Y" introduced="6.0">
-      <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+      <unit bldFile="os\cellularsrv\smsprotocols\cdmasmsstack\group" mrp="os\cellularsrv\smsprotocols\cdmasmsstack\group\nbprotocols_cdmasmsstack.mrp"/>
      </component>
     </collection>
     <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
      <component name="csdagt" long-name="CSD AGT" plugin="Y" introduced="6.1">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-     </component>
-     <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyprotocols\csdagt\group" mrp="os\cellularsrv\telephonyprotocols\csdagt\group\networking_csdagt.mrp"/>
+     </component>
+     <component name="psdagt" long-name="PSD AGT" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\cellularsrv\telephonyprotocols\psdagt\group" mrp="os\cellularsrv\telephonyprotocols\psdagt\group\networking_psdagt.mrp"/>
      </component>
      <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-     </component>
-     <component name="pdplayer" long-name="PDP Layer" plugin="Y" introduced="tb92">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-     </component>
-     <component name="psdagt" long-name="PSD AGT" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-     </component>
-     <component name="qos3gppcpr" long-name="QoS 3GPP CPR" plugin="Y" introduced="9.2">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group\networking_guqos.mrp"/>
+     </component>
+     <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group\networking_umtsif.mrp"/>
      </component>
      <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-     </component>
-     <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyprotocols\qosextnapi\group" mrp="os\cellularsrv\telephonyprotocols\qosextnapi\group\networking_qosextnapi.mrp"/>
      </component>
      <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group" mrp="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group\networking_spud.mrp"/>
      </component>
      <component name="umtsgprsscpr" long-name="UMTS/GPRS SCPR" plugin="Y" introduced="8.1">
-      <unit bldFile="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyprotocols\umtsgprsscpr\group" mrp="os\cellularsrv\telephonyprotocols\umtsgprsscpr\group\networking_UmtsGprsSCPR.mrp"/>
+     </component>
+     <component name="qos3gppcpr" long-name="QoS 3GPP CPR" plugin="Y" introduced="9.2">
+      <unit bldFile="os\cellularsrv\telephonyprotocols\qos3gppcpr\group" mrp="os\cellularsrv\telephonyprotocols\qos3gppcpr\group\networking_Qos3GPP.mrp"/>
+     </component>
+     <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1">
+      <unit bldFile="os\cellularsrv\telephonyprotocols\rawipnif\group" mrp="os\cellularsrv\telephonyprotocols\rawipnif\group\networking_rawipnif.mrp"/>
      </component>
     </collection>
-    <collection name="telephonyreferenceplat" long-name="Telephony Reference Platform" level="plugin"/>
     <collection name="telephonyserver" long-name="Telephony Server" level="server">
-     <component name="etelcdma" long-name="ETel CDMA" introduced="7.0s">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/>
+     <component name="etelserverandcore" long-name="ETel Server and Core">
+      <unit bldFile="os\cellularsrv\telephonyserver\etelserverandcore\group" mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel.mrp"/>
      </component>
      <component name="etelconfig" long-name="ETel Config">
-      <unit mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
+      <unit mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel-config.mrp"/>
      </component>
      <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyserver\etelmultimode\group" mrp="os\cellularsrv\telephonyserver\etelmultimode\group\telephony_etelmm.mrp"/>
      </component>
      <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyserver\etelpacketdata\group" mrp="os\cellularsrv\telephonyserver\etelpacketdata\group\telephony_etelpckt.mrp"/>
      </component>
      <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-     </component>
-     <component name="etelserverandcore" long-name="ETel Server and Core">
-      <unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyserver\etelsimtoolkit\group" mrp="os\cellularsrv\telephonyserver\etelsimtoolkit\group\telephony_etelsat.mrp"/>
+     </component>
+     <component name="etelcdma" long-name="ETel CDMA" introduced="7.0s">
+      <unit bldFile="os\cellularsrv\telephonyserver\etelcdma\group" mrp="os\cellularsrv\telephonyserver\etelcdma\group\telephony_etelcdma.mrp"/>
      </component>
     </collection>
     <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-     <component name="cdmatsy" long-name="CDMA TSY" plugin="Y" introduced="7.0">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/>
-     </component>
      <component name="common_tsy" long-name="Common TSY" introduced="tb92">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="os\cellularsrv\telephonyserverplugins\common_tsy\group\telephony_commontsy.mrp"/>
      </component>
      <component name="multimodetsy" long-name="Multimode TSY" plugin="Y">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyserverplugins\multimodetsy\group" mrp="os\cellularsrv\telephonyserverplugins\multimodetsy\group\telephony_mmtsy.mrp"/>
+     </component>
+     <component name="cdmatsy" long-name="CDMA TSY" plugin="Y" introduced="7.0">
+      <unit bldFile="os\cellularsrv\telephonyserverplugins\cdmatsy\group" mrp="os\cellularsrv\telephonyserverplugins\cdmatsy\group\telephony_cdmatsy.mrp"/>
      </component>
      <component name="simtsy" long-name="SIM TSY" plugin="Y" introduced="7.0" class="test">
-      <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyserverplugins\simtsy\group" mrp="os\cellularsrv\telephonyserverplugins\simtsy\group\telephony_simtsy.mrp"/>
      </component>
     </collection>
     <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
      <component name="dial" long-name="Dial" deprecated="9.1">
-      <unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-     </component>
-     <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0">
-      <unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+      <unit bldFile="os\cellularsrv\telephonyutils\dial\group" mrp="os\cellularsrv\telephonyutils\dial\group\telephony_dial.mrp"/>
      </component>
      <component name="telephonywatchers" long-name="Telephony Watchers" plugin="Y" introduced="6.0">
-      <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-     </component>
-    </collection>
-    <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-     <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1">
-      <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-     </component>
-     <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92">
-      <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
-     </component>
-     <component name="isc_if" long-name="ISC Interface">
-      <!-- <unit bldFile="os/cellularsrv/basebandabstraction/isc_if/group"/> -->
+      <unit bldFile="os\cellularsrv\telephonyutils\telephonywatchers\group" mrp="os\cellularsrv\telephonyutils\telephonywatchers\group\telephony_watchers.mrp"/>
+     </component>
+     <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0">
+      <unit bldFile="os\cellularsrv\telephonyutils\etel3rdpartyapi\Group" mrp="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" class="doc">
-      <unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+      <unit mrp="os\cellularsrv\cellularsrv_info\telephonyconfidentialdocs\telephony_confidential.mrp"/>
      </component>
      <component name="telephonydocs" long-name="Telephony Documentation" class="doc">
-      <unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
-     <component name="gennif" long-name="Generic NIF">
-      <!-- <unit bldFile="os/cellularsrv/commonnetworkinterface/gennif/group"/> -->
-     </component>
-     <component name="gprsumtsagent" long-name="GPRS UMTS Agent">
-      <!-- <unit bldFile="os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/> -->
-     </component>
-    </collection>
-    <collection name="commontsy" long-name="Common TSY" level="hw-if">
-     <component name="ctsy" long-name="CTSY">
-      <!-- <unit bldFile="os/cellularsrv/commontsy/ctsy/group"/> -->
-     </component>
-     <component name="customapi" long-name="Custom API">
-      <!-- <unit bldFile="os/cellularsrv/commontsy/customapi/group"/> -->
-     </component>
-     <component name="phonetsy" long-name="Phone TSY">
-      <!-- <unit bldFile="os/cellularsrv/commontsy/phonetsy/group"/> -->
-     </component>
-    </collection>
-    <collection name="dataporttesttool" long-name="Dataport Test Tool" level="plugin">
-     <component name="DPS_Test_client" long-name="DPS Test Client">
-      <!-- <unit bldFile="os/cellularsrv/dataporttesttool/DPS_Test_client/group"/> -->
-     </component>
-     <component name="dps_test.dll=binary">
-      <!-- <unit bldFile="os/cellularsrv/dataporttesttool/dps_test.dll=binary/group"/> -->
+      <unit mrp="os\cellularsrv\cellularsrv_info\telephonydocs\telephony_documentation.mrp"/>
      </component>
     </collection>
-    <collection name="stif_tsy_test_tool" long-name="STIF TSY Test Tool" level="app-if">
-     <component name="CAP">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/CAP/group"/> -->
-     </component>
-     <component name="CC">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/CC/group"/> -->
-     </component>
-     <component name="Core">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Core/group"/> -->
-     </component>
-     <component name="Eminfo" long-name="EM Info">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Eminfo/group"/> -->
-     </component>
-     <component name="NWE">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/NWE/group"/> -->
-     </component>
-     <component name="Notify">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Notify/group"/> -->
-     </component>
-     <component name="SEC">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SEC/group"/> -->
-     </component>
-     <component name="SIM">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SIM/group"/> -->
-     </component>
-     <component name="SMS">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SMS/group"/> -->
-     </component>
-     <component name="SupplementaryService" long-name="Supplementary Service">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/SupplementaryService/group"/> -->
-     </component>
-     <component name="USSD">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/USSD/group"/> -->
-     </component>
-     <component name="Voice">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/Voice/group"/> -->
-     </component>
-     <component name="VoiceCore" long-name="Voice Core">
-      <!-- <unit bldFile="os/cellularsrv/stif_tsy_test_tool/VoiceCore/group"/> -->
+    <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+     <component name="mocksy" long-name="MockSY" introduced="tb91" plugin="Y">
+      <unit bldFile="os\cellularsrv\hwpluginsimulation\mocksy\group" mrp="os\cellularsrv\hwpluginsimulation\mocksy\group\telephony_tools_mocksy.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Short Link Services" level="services" name="shortlinksrv" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="bluetooth" long-name="Bluetooth" level="framework">
-     <component name="btcomm" long-name="Bluetooth CSY" plugin="Y" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetooth/btcomm" mrp="os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-     </component>
-     <component name="btdocs" long-name="Bluetooth Documentation" class="doc">
-      <unit mrp="os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-     </component>
-     <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" class="test">
-      <unit mrp="os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
-     </component>
-     <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1">
-      <unit bldFile="os/shortlinksrv/bluetooth/gavdp/group" mrp="os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-     </component>
-     <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" class="test">
-      <unit bldFile="os/shortlinksrv/bluetooth/btlogger/group" mrp="os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-     </component>
-     <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1">
-      <unit bldFile="os/shortlinksrv/bluetooth/btextnotifiers" mrp="os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-     </component>
-     <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1">
-      <unit bldFile="os/shortlinksrv/bluetooth/btsdp" mrp="os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-     </component>
-     <component name="btstack" long-name="Bluetooth Stack" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetooth/btstack" mrp="os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
-     </component>
-    </collection>
+   <block name="shortlinksrv" long-name="Short Link Services" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-     <component name="bluetoothsvs" long-name="Bluetooth SVS" introduced="9.2" class="test"/>
-    </collection>
-    <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-     <component name="btpan" long-name="Bluetooth PAN Profile" plugin="Y" introduced="8.1">
-      <unit bldFile="os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-     <component name="btcommon" long-name="Bluetooth Build Utilities">
-      <unit mrp="os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
-     </component>
-     <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-     </component>
-     <component name="btconfig" long-name="Bluetooth Config" class="config">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btconfig" mrp="os/shortlinksrv/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-     </component>
-     <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btmgr" mrp="os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-     </component>
-     <component name="btrom" long-name="Bluetooth ROM" introduced="9.1">
-      <unit bldFile="os/shortlinksrv/bluetoothmgmt/btrom" mrp="os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-     </component>
-    </collection>
-    <collection name="bthci" long-name="Host Controller Interface" level="server">
-     <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" plugin="Y" introduced="9.2">
-      <unit bldFile="os/shortlinksrv/bthci/hci2implementations/group" mrp="os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-     </component>
-     <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1">
-      <unit bldFile="os/shortlinksrv/bthci/hciextensioninterface" mrp="os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-     </component>
-     <component name="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0">
-      <unit bldFile="os/shortlinksrv/bthci/bthci1" mrp="os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
-     </component>
-     <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2">
-      <unit bldFile="os/shortlinksrv/bthci/bthci2/group" mrp="os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-     </component>
-    </collection>
-    <collection name="irda" long-name="IrDA" level="plugin">
-     <component name="irdaconfig" long-name="IrDA Config" introduced="6.0" class="config">
-      <unit bldFile="os/shortlinksrv/irda/irdaconfig" mrp="os/shortlinksrv/irda/irdaconfig/infra-red_config.mrp"/>
-     </component>
-     <component name="irdadocs" long-name="IrDA Documentation" class="doc">
-      <unit mrp="os/shortlinksrv/irda/irdadocs/infra-red_documentation.mrp"/>
-     </component>
-     <component name="irdastack" long-name="IrDA Stack">
-      <unit bldFile="os/shortlinksrv/irda/irdastack/group" mrp="os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
-     </component>
-     <component name="irdatest" long-name="IrDA Test" introduced="9.2" class="test">
-      <unit mrp="os/shortlinksrv/irda/irdatest/group/infra-red_irda_test.mrp"/>
+     <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" class="placeholder test" introduced="tb91">
+      <!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/shortlinksrv/bluetoothapitest/group/bluetoothsvs.mrp"/>
+			-->
      </component>
     </collection>
     <collection name="usbldd" long-name="Shortlink Logical Device Drivers" level="hw-if">
      <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b">
-      <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+      <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="os\kernelhwsrv\kernel\eka\drivers\usbc\base_e32_drivers_usbcli.mrp"/>
+     </component>
+    </collection>
+    <collection name="bluetooth" long-name="Bluetooth" level="framework">
+     <component name="btstack" long-name="Bluetooth Stack" introduced="6.0">
+      <unit bldFile="os\shortlinksrv\bluetooth\btstack" mrp="os\shortlinksrv\bluetooth\btstack\bluetooth_stack.mrp"/>
+     </component>
+     <component name="btcomm" long-name="Bluetooth CSY" plugin="Y" introduced="6.0">
+      <unit bldFile="os\shortlinksrv\bluetooth\btcomm" mrp="os\shortlinksrv\bluetooth\btcomm\bluetooth_btcomm.mrp"/>
+     </component>
+     <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1">
+      <unit bldFile="os\shortlinksrv\bluetooth\btsdp" mrp="os\shortlinksrv\bluetooth\btsdp\bluetooth_sdp.mrp"/>
+     </component>
+     <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1">
+      <unit bldFile="os\shortlinksrv\bluetooth\btextnotifiers" mrp="os\shortlinksrv\bluetooth\btextnotifiers\bluetooth_btextnotifiers.mrp"/>
+     </component>
+     <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1">
+      <unit bldFile="os\shortlinksrv\bluetooth\gavdp\group" mrp="os\shortlinksrv\bluetooth\gavdp\group\bluetooth_gavdp.mrp"/>
+     </component>
+     <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" class="test">
+      <unit mrp="os\shortlinksrv\bluetooth\btexample\test\bluetooth_tests_examples.mrp"/>
+     </component>
+     <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" class="test">
+      <unit bldFile="os\shortlinksrv\bluetooth\btlogger\group" mrp="os\shortlinksrv\bluetooth\btlogger\group\bluetooth_logger.mrp"/>
+     </component>
+     <component name="btdocs" long-name="Bluetooth Documentation" class="doc">
+      <unit mrp="os\shortlinksrv\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">
+      <unit bldFile="os\shortlinksrv\bluetoothmgmt\btmgr" mrp="os\shortlinksrv\bluetoothmgmt\btmgr\bluetooth_manager.mrp"/>
+     </component>
+     <component name="btconfig" long-name="Bluetooth Config" class="config">
+      <unit bldFile="os\shortlinksrv\bluetoothmgmt\btconfig" mrp="os\shortlinksrv\bluetoothmgmt\btconfig\bluetooth_config.mrp"/>
+     </component>
+     <component name="btrom" long-name="Bluetooth ROM" introduced="9.1">
+      <unit bldFile="os\shortlinksrv\bluetoothmgmt\btrom" mrp="os\shortlinksrv\bluetoothmgmt\btrom\bluetooth_rom.mrp"/>
+     </component>
+     <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0">
+      <unit bldFile="os\shortlinksrv\bluetoothmgmt\bluetoothclientlib" mrp="os\shortlinksrv\bluetoothmgmt\bluetoothclientlib\bluetooth_user.mrp"/>
+     </component>
+     <component name="btcommon" long-name="Bluetooth Build Utilities">
+      <unit mrp="os\shortlinksrv\bluetoothmgmt\btcommon\bluetooth_common.mrp"/>
+     </component>
+    </collection>
+    <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+     <component name="btpan" long-name="Bluetooth PAN Profile" plugin="Y" introduced="8.1">
+      <unit bldFile="os\shortlinksrv\bluetoothcommsprofiles\btpan\group" mrp="os\shortlinksrv\bluetoothcommsprofiles\btpan\group\bluetooth_pan.mrp"/>
+     </component>
+    </collection>
+    <collection name="bthci" long-name="Host Controller Interface" level="server">
+     <component name="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0">
+      <unit bldFile="os\shortlinksrv\bthci\bthci1" mrp="os\shortlinksrv\bthci\bthci1\bluetooth_hci.mrp"/>
+     </component>
+     <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2">
+      <unit bldFile="os\shortlinksrv\bthci\bthci2\group" mrp="os\shortlinksrv\bthci\bthci2\group\bluetooth_hci_v2_framework.mrp"/>
+     </component>
+     <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1">
+      <unit bldFile="os\shortlinksrv\bthci\hciextensioninterface" mrp="os\shortlinksrv\bthci\hciextensioninterface\bluetooth_hciproxy.mrp"/>
+     </component>
+     <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" plugin="Y" introduced="9.2">
+      <unit bldFile="os\shortlinksrv\bthci\hci2implementations\group" mrp="os\shortlinksrv\bthci\hci2implementations\group\bluetooth_hci_v2_implementations.mrp"/>
      </component>
     </collection>
     <collection name="usbmgmt" long-name="USB Management" level="server">
-     <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" class="doc">
-      <unit mrp="os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-     </component>
      <component name="usbmgr" long-name="USB Manager">
-      <unit version="1" bldFile="os/unref/orphan/comgen/ser-comms/usb/group" mrp="os/unref/orphan/comgen/ser-comms/usb/group/ser-comms_usb.mrp"/>
-      <unit version="2" bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+      <unit version="2" bldFile="os\shortlinksrv\usbmgmt\usbmgr\group" mrp="os\shortlinksrv\usbmgmt\usbmgr\group\usb_manager.mrp"/>
      </component>
      <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" class="test">
-      <unit version="1" mrp="os/unref/orphan/comgen/ser-comms/usb_test/group/ser-comms_usb_test.mrp"/>
-      <unit version="2" mrp="os/shortlinksrv/usbmgmt/usbmgrtest/group/usb_test.mrp"/>
+      <unit version="2" mrp="os\shortlinksrv\usbmgmt\usbmgrtest\group\usb_test.mrp"/>
+     </component>
+     <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" class="doc">
+      <unit mrp="os\shortlinksrv\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
      </component>
     </collection>
-    <collection name="usbbsptemplate" long-name="USB BSP Template" level="adaptation"/>
+    <collection name="irda" long-name="IrDA" level="plugin">
+     <component name="irdastack" long-name="IrDA Stack">
+      <unit bldFile="os\shortlinksrv\irda\irdastack\group" mrp="os\shortlinksrv\irda\irdastack\group\infra-red_irda.mrp"/>
+     </component>
+    </collection>
    </block>
-   <block long-name="Multimedia" level="services" name="mm" levels="adaptation hw-if device-fw devices middleware app-if">
-    <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-     <component name="camerafw" long-name="Camera Framework" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/camerafw/framework/group" mrp="os/mm/imagingandcamerafws/camerafw/framework/group/multimedia_ecam_framework.mrp"/>
-     </component>
-     <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" class="test">
-      <unit mrp="os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
-     </component>
-     <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-     </component>
-     <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" class="test">
-      <unit mrp="os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
-     </component>
-     <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" class="test">
-      <unit mrp="os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
+   <block name="mm" long-name="Multimedia" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
+    <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
+     <component name="mmsvs" long-name="Multimedia Verification Suite" class="placeholder test" introduced="tb91">
+      <!-- PLACEHOLDER="DS.1603"
+				<unit mrp="os/mm/mmapitest/group/mmsvs.mrp"/>
+				-->
      </component>
     </collection>
-    <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-     <component name="mmsvs" long-name="Multimedia SVS" introduced="8.1"/>
-    </collection>
-    <collection name="mmdataplane" long-name="Multimedia Data Plane Adaptation" level="hw-if"/>
-    <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-     <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" class="test">
-      <unit mrp="os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
-     </component>
-     <component name="mdf" long-name="Media Device Framework" introduced="9.2">
-      <unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-     </component>
-     <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
+    <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+     <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s">
+      <unit bldFile="os\mm\imagingandcamerafws\imagingfws\group" mrp="os\mm\imagingandcamerafws\imagingfws\group\multimedia_icl.mrp"/>
+     </component>
+     <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" class="test">
+      <unit mrp="os\mm\imagingandcamerafws\imagingunittest\group\multimedia_unittest_icl_source.mrp"/>
+     </component>
+     <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" class="test">
+      <unit mrp="os\mm\imagingandcamerafws\imaginginttest\group\multimedia_inttest_icl_source.mrp"/>
+     </component>
+     <component name="camerafw" long-name="Camera Framework" introduced="7.0s">
+      <unit bldFile="os\mm\imagingandcamerafws\camerafw\framework\group" mrp="os\mm\imagingandcamerafws\camerafw\framework\group\multimedia_ecam_framework.mrp"/>
+     </component>
+     <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" class="test">
+      <unit mrp="os\mm\imagingandcamerafws\cameraunittest\group\multimedia_unittest_ecam_source.mrp"/>
      </component>
     </collection>
-    <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-     <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-     </component>
-     <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-     </component>
-     <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
-     </component>
-     <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="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="tb92" class="test">
-      <unit mrp="os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
-     </component>
-     <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92">
-      <unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-     </component>
-     <component name="videohai" long-name="Video HAI" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group/multimedia_mdf_devvideo.mrp"/>
+    <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+     <component name="imagingplugins" long-name="Imaging Plugins" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\mm\imagingandcamerafws\imagingfws\plugins\group" mrp="os\mm\imagingandcamerafws\imagingfws\plugins\group\multimedia_icl_plugin.mrp"/>
+     </component>
+     <component name="cameraplugins" long-name="Camera Plugins" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\mm\imagingandcamerafws\camerafw\plugins\group" mrp="os\mm\imagingandcamerafws\camerafw\plugins\group\multimedia_ecam_plugins.mrp"/>
+     </component>
+     <component name="3gplib" long-name="3GP Library" introduced="Future">
+      <unit bldFile="os\mm\mmplugins\3gplib\group" mrp="os\mm\mmplugins\3gplib\group\multimedia_3gplibrary.mrp"/>
+     </component>
+     <component name="3gpunittest" long-name="3GP Unit Tests" introduced="Future" class="test">
+      <unit mrp="os\mm\mmplugins\3gpunittest\group\multimedia_unittest_3gplibrary_source.mrp"/>
      </component>
     </collection>
-    <collection name="mmhostprocess" long-name="Multimedia Host Process" level="devices"/>
-    <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-     <component name="3gplib" long-name="3GP Library" introduced="Future">
-      <unit bldFile="os/mm/mmplugins/3gplib/group" mrp="os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
-     </component>
-     <component name="3gpunittest" long-name="3GP Unit Tests" introduced="Future" class="test">
-      <unit mrp="os/mm/mmplugins/3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
-     </component>
-     <component name="cameraplugins" long-name="Camera Plugins" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/camerafw/plugins/group" mrp="os/mm/imagingandcamerafws/camerafw/plugins/group/multimedia_ecam_plugins.mrp"/>
-     </component>
-     <component name="imagingplugins" long-name="Imaging Plugins" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
+    <collection name="mm_info" long-name="Multimedia Info" level="app-if">
+     <component name="mmdocs" long-name="Multimedia Documentation">
+      <unit mrp="os\mm\mm_info\mmdocs\multimedia_documentation.mrp"/>
      </component>
     </collection>
     <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
      <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92">
-      <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+      <unit bldFile="os\mm\mmresourcemgmt\mmresctrl\group" mrp="os\mm\mmresourcemgmt\mmresctrl\group\multimedia_a3f_refmmrc.mrp"/>
      </component>
     </collection>
-    <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation"/>
+    <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+     <component name="mdf" long-name="Media Device Framework" introduced="9.2">
+      <unit bldFile="os\mm\mmdevicefw\mdf\group" mrp="os\mm\mmdevicefw\mdf\group\multimedia_mdf.mrp"/>
+     </component>
+     <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" class="test">
+      <unit mrp="os\mm\mmdevicefw\mdfunittest\group\multimedia_unittest_mdf_source.mrp"/>
+     </component>
+     <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s">
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\ASR\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\ASR\group\multimedia_mmf_ASR.mrp"/>
+     </component>
+    </collection>
     <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-     <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" class="test">
-      <unit mrp="os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
-     </component>
      <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" class="test">
-      <unit mrp="os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtestfw\group\multimedia_testframework_source.mrp"/>
      </component>
      <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" class="test">
-      <unit mrp="os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtestfwunittest\group\multimedia_unittest_testframework_source.mrp"/>
+     </component>
+     <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" class="test">
+      <unit mrp="os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp"/>
      </component>
      <component name="mmtesttools" long-name="Multimedia Test Tools">
-      <unit mrp="os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtesttools\Group\multimedia_testtools_source.mrp"/>
      </component>
     </collection>
     <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
      <component name="openmax" long-name="OpenMAX" introduced="tb91">
-      <unit bldFile="os/mm/omxil/openmax/group" mrp="os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
+      <unit bldFile="os\mm\omxil\openmax\group" mrp="os\mm\omxil\openmax\group\multimedia_openmax.mrp"/>
      </component>
     </collection>
     <collection name="devsound" long-name="Sound Device" level="devices">
-     <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-     </component>
-     <component name="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" class="test">
-      <unit mrp="os/mm/devsound/a3fcharacterisationtest/group/multimedia_a3f_devsound_char.mrp"/>
+     <component name="devsoundapi" long-name="DevSound API" introduced="7.0s">
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_api" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_api\multimedia_mdf_devsound_api.mrp"/>
      </component>
      <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-     </component>
-     <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92">
-      <unit mrp="os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
-     </component>
-     <component name="a3fsrvstart" long-name="A3F Server Start" plugin="Y" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-     </component>
-     <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92">
-      <unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+      <unit bldFile="os\mm\devsound\a3fdevsound\group" mrp="os\mm\devsound\a3fdevsound\group\multimedia_a3f_devsound.mrp"/>
+     </component>
+     <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92">
+      <unit bldFile="os\mm\devsound\a3facf\group" mrp="os\mm\devsound\a3facf\group\multimedia_a3f_acf.mrp"/>
+     </component>
+     <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s">
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_pluginsupport" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_pluginsupport\multimedia_mdf_devsound_pluginsupport.mrp"/>
+     </component>
+     <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s">
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin\multimedia_mdf_devsound_refplugin.mrp"/>
      </component>
      <component name="btdevsound" long-name="Bluetooth DevSound Plugin" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-     </component>
-     <component name="devsoundapi" long-name="DevSound API" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
-     </component>
-     <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
-     </component>
-     <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="codecs" long-name="Codecs" level="middleware">
-     <component name="audio" long-name="Audio">
-      <!-- <unit bldFile="os/mm/codecs/audio/group"/> -->
-     </component>
-     <component name="codecs_dom" long-name="Codecs DOM">
-      <!-- <unit bldFile="os/mm/codecs/codecs_dom/group"/> -->
-     </component>
-     <component name="video" long-name="Video">
-      <!-- <unit bldFile="os/mm/codecs/video/group"/> -->
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\sounddevbt\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\sounddevbt\group\multimedia_mdf_devsound_refbtplugin.mrp"/>
+     </component>
+     <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92">
+      <unit bldFile="os\mm\devsound\a3ftrace\group" mrp="os\mm\devsound\a3ftrace\group\multimedia_a3f_traces.mrp"/>
+     </component>
+     <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92">
+      <unit mrp="os\mm\devsound\a3fintegrationtest\group\multimedia_inttest_a3f_devsound_source.mrp"/>
+     </component>
+     <component name="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" class="test">
+      <unit mrp="os\mm\devsound\a3fcharacterisationtest\group\multimedia_a3f_devsound_char.mrp"/>
+     </component>
+     <component name="a3fsrvstart" long-name="A3F Server Start" plugin="Y" introduced="tb92">
+      <unit bldFile="os\mm\devsound\a3fsrvstart\group" mrp="os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
      </component>
     </collection>
-    <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-     <component name="addeddevsoundcontrol" long-name="Added DevSound Control">
-      <!-- <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/> -->
-     </component>
-     <component name="audiorouting" long-name="Audio Routing">
-      <!-- <unit bldFile="os/mm/devsoundextensions/audiorouting/group"/> -->
-     </component>
-     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins">
-      <!-- <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/> -->
-     </component>
-     <component name="drmaudioplayer" long-name="DRM Audio Player">
-      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/> -->
-     </component>
-     <component name="effects" long-name="Effects">
-      <!-- <unit bldFile="os/mm/devsoundextensions/effects/group"/> -->
-     </component>
-     <component name="effectspresets" long-name="Effects Presets">
-      <!-- <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/> -->
-     </component>
-     <component name="globalaudiosettings" long-name="Global Audio Settings">
-      <!-- <unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/> -->
-     </component>
-     <component name="mmextfw" long-name="MM Ext Framework">
-      <!-- <unit bldFile="os/mm/devsoundextensions/mmextfw/group"/> -->
-     </component>
-     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces">
-      <!-- <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/> -->
-     </component>
-     <component name="mmfdevsoundserverplatsec" long-name="MMF DevSound Server PlatSec">
-      <!-- <unit bldFile="os/mm/devsoundextensions/mmfdevsoundserverplatsec/group"/> -->
-     </component>
-     <component name="restrictedaudiooutput" long-name="Restricted Audio Output">
-      <!-- <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/> -->
-     </component>
-     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing">
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/> -->
-     </component>
-    </collection>
-    <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
-     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor">
-      <!-- <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/> -->
-     </component>
-    </collection>
-    <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-     <component name="mmdocs" long-name="Multimedia Documentation">
-      <unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
-     <component name="postingsurface" long-name="Posting Surface">
-      <!-- <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/> -->
+    <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+     <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s">
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_hwdev" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_hwdev\multimedia_mdf_devsound_hwdev.mrp"/>
+     </component>
+     <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92">
+      <unit bldFile="os\mm\mmhais\a3facl\group" mrp="os\mm\mmhais\a3facl\group\multimedia_a3f_acl.mrp"/>
+     </component>
+     <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92">
+      <unit bldFile="os\mm\mmhais\a3fdevsoundcustomisation\group" mrp="os\mm\mmhais\a3fdevsoundcustomisation\group\multimedia_a3f_devsoundadaptationinfo.mrp"/>
+     </component>
+     <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92">
+      <unit bldFile="os\mm\mmhais\refacladapt\group" mrp="os\mm\mmhais\refacladapt\group\multimedia_a3f_refacladaptation.mrp"/>
+     </component>
+     <component name="videohai" long-name="Video HAI" introduced="7.0s">
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\DevVideo\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\DevVideo\group\multimedia_mdf_devvideo.mrp"/>
+     </component>
+     <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92">
+      <unit bldFile="os\mm\mmhais\dvbhreceiverhai\hai\dvbh\group" mrp="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="tb92" class="test">
+      <unit mrp="os\mm\mmhais\dvbhunittest\hai\dvbh\group\multimedia_unittest_dvbhhai.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Imaging Extensions" level="services" name="imagingext" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-     <component name="IclExtJpegApi" long-name="ICL Ext JPEG API">
-      <!-- <unit bldFile="os/imagingext/imageadaptationextensions/IclExtJpegApi/group"/> -->
+   <block name="graphics" long-name="Graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+    <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
+     <component name="graphicssvs" long-name="Graphics Verification Suite" class="placeholder test" introduced="tb91">
+      <!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/graphics/graphcisapitest/group/graphicssvs.mrp"/>
+			-->
      </component>
     </collection>
-    <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-     <component name="ExifLib" long-name="Exif Lib">
-      <!-- <unit bldFile="os/imagingext/imagingmodules/ExifLib/group"/> -->
-     </component>
-     <component name="JP2KCodec" long-name="JP2K Codec">
-      <!-- <unit bldFile="os/imagingext/imagingmodules/JP2KCodec/group"/> -->
+    <collection name="graphicstest" long-name="Graphics Test" level="app-if">
+     <component name="graphicstestharness" long-name="Graphics Test Harness" class="test" introduced="8.1">
+      <unit mrp="os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
+     </component>
+     <component name="uibench" long-name="UI Bench" introduced="9.2" class="test">
+      <unit bldFile="os\graphics\graphicstest\uibench\group" mrp="os\graphics\graphicstest\uibench\group\graphics_ui_bench.mrp"/>
+     </component>
+    </collection>
+    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+     <component name="graphicsdocs" long-name="Graphics Documentation" class="doc">
+      <unit mrp="os\graphics\graphics_info\graphicsdocs\graphics_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="windowing" long-name="Windowing" level="app-if">
+     <component name="windowserver" long-name="Window Server">
+      <unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
      </component>
     </collection>
-   </block>
-   <block long-name="Graphics" level="services" name="graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection name="egl" long-name="EGL" level="internal-adaptations">
-     <component name="eglimplementation" long-name="EGL Implementation" introduced="tb91">
-      <unit bldFile="os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/>
-     </component>
-     <component name="eglinterface" long-name="EGL Interface" introduced="tb91">
-      <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+    <collection name="printingservices" long-name="Printing Services" level="app-if">
+     <component name="printerdriversupport" long-name="Printer Driver Support">
+      <unit bldFile="os\graphics\printingservices\printerdriversupport\group" mrp="os\graphics\printingservices\printerdriversupport\group\graphics_pdrstore.mrp"/>
+     </component>
+     <component name="printerdrivers" long-name="Printer Drivers" plugin="Y">
+      <unit bldFile="os\graphics\printingservices\printerdrivers\group" mrp="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">
+      <unit bldFile="os\graphics\fbs\fontandbitmapserver\group" mrp="os\graphics\fbs\fontandbitmapserver\group\graphics_fbserv.mrp"/>
+     </component>
+     <component name="itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" plugin="Y" introduced="tb92">
+      <unit bldFile="os\graphics\fbs\itypefontrasteriser\group" mrp="os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp"/>
      </component>
     </collection>
-    <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
-     <component name="graphicssvs" long-name="Graphics SVS" introduced="9.2"/>
+    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+     <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0">
+      <unit bldFile="os\graphics\opengles\openglesinterface\group" mrp="os\graphics\opengles\openglesinterface\group\graphics_openglesheaders.mrp"/>
+     </component>
+     <component name="openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0">
+      <unit bldFile="os\graphics\opengles\openglesimplementation\group\" mrp="os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp"/>
+     </component>
+     <component name="openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0">
+      <unit bldFile="os\graphics\opengles\openglesdisplayproperties\group" mrp="os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp"/>
+     </component>
     </collection>
-    <collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
-     <component name="compositionengineadaptation" long-name="Composition Engine Adaptation" introduced="tb92">
-      <unit bldFile="os/graphics/graphicscomposition/compositionengineadaptation/group" mrp="os/graphics/graphicscomposition/compositionengineadaptation/group/graphics_compositionbackend.mrp"/>
-     </component>
-     <component name="graphicscompositionengine" long-name="Graphics Composition Engine" introduced="tb92">
-      <unit bldFile="os/graphics/graphicscomposition/graphicscompositionengine/group" mrp="os/graphics/graphicscomposition/graphicscompositionengine/group/graphics_gce.mrp"/>
-     </component>
-     <component name="surfaceupdate" long-name="Surface Update" introduced="tb92">
-      <unit bldFile="os/graphics/graphicscomposition/surfaceupdate/group" mrp="os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+     <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91">
+      <unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
+     </component>
+    </collection>
+    <collection name="egl" long-name="EGL" level="internal-adaptations">
+     <component name="eglinterface" long-name="EGL Interface" introduced="tb91">
+      <unit bldFile="os\graphics\egl\eglinterface\group" mrp="os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
+     </component>
+     <component name="eglimplementation" long-name="EGL Implementation" introduced="tb91">
+      <unit bldFile="os\graphics\egl\eglimplementation\group\" mrp="os\graphics\egl\eglimplementation\group\graphics_egl.mrp"/>
      </component>
     </collection>
     <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
      <component name="bitgdi" long-name="BitGDI">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+      <unit bldFile="os\graphics\graphicsdeviceinterface\bitgdi\group" mrp="os\graphics\graphicsdeviceinterface\bitgdi\group\graphics_bitgdi.mrp"/>
      </component>
      <component name="colourpalette" long-name="Colour Palette" introduced="7.0s">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+      <unit bldFile="os\graphics\graphicsdeviceinterface\colourpalette\group" mrp="os\graphics\graphicsdeviceinterface\colourpalette\group\graphics_palette.mrp"/>
      </component>
      <component name="screendriver" long-name="Screen Driver" plugin="Y" introduced="6.1">
-      <unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-     <component name="surfacemgr" long-name="Surface Manager" introduced="tb92">
-      <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines"/>
-    <collection name="graphicstest" long-name="Graphics Test" level="app-if">
-     <component name="graphicstestharness" long-name="Graphics Test Harness" class="test" introduced="8.1">
-      <unit mrp="os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
-     </component>
-     <component name="uibench" long-name="UI Bench" introduced="9.2" class="test">
-      <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+      <unit bldFile="os\graphics\graphicsdeviceinterface\screendriver\group" mrp="os\graphics\graphicsdeviceinterface\screendriver\group\graphics_screendriver.mrp"/>
      </component>
     </collection>
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+     <component name="gdi_tools" long-name="GDI Tools" class="PC">
+      <unit bldFile="os\graphics\graphicstools\gdi_tools\group" mrp="os\graphics\graphicstools\gdi_tools\group\graphics_gditools.mrp"/>
+     </component>
      <component name="bitmapfonttools" long-name="Bitmap Font Tools" class="PC">
-      <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-     </component>
-     <component name="gdi_tools" long-name="GDI Tools" class="PC">
-      <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-     <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92">
-      <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
-     </component>
-    </collection>
-    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-     <component name="openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0">
-      <unit bldFile="os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/>
-     </component>
-     <component name="openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0">
-      <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/>
-     </component>
-     <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0">
-      <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-     </component>
-    </collection>
-    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-     <component name="openvgimplementation" long-name="OpenVG Implementation" introduced="tb91">
-      <unit bldFile="os/graphics/openvg/openvgimplementation/group/" mrp="os/graphics/openvg/openvgimplementation/group/graphics_openvg.mrp"/>
-     </component>
-     <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91">
-      <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-     </component>
-    </collection>
-    <collection name="printingservices" long-name="Printing Services" level="app-if">
-     <component name="printerdriversupport" long-name="Printer Driver Support">
-      <unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-     </component>
-     <component name="printerdrivers" long-name="Printer Drivers" plugin="Y">
-      <unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-     </component>
-    </collection>
-    <collection name="windowing" long-name="Windowing" level="app-if">
-     <component name="windowserver" long-name="Window Server">
-      <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-     <component name="fontandbitmapserver" long-name="Font and Bitmap Server">
-      <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-     </component>
-     <component name="itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" plugin="Y" introduced="tb92">
-      <unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-     <component name="graphicsdocs" long-name="Graphics Documentation" class="doc">
-      <unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
-     <component name="2D_OpenVG_1_0" long-name="2D Open VG 1.0">
-      <!-- <unit bldFile="os/graphics/graphicsaccelaration/2D_OpenVG_1_0/group"/> -->
-     </component>
-     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1">
-      <!-- <unit bldFile="os/graphics/graphicsaccelaration/3d_opengl_es_1_1/group"/> -->
-     </component>
-    </collection>
-    <collection name="m3g" long-name="M3G" level="internal-adaptations">
-     <component name="m3gapi">
-      <!-- <unit bldFile="os/graphics/m3g/m3gapi/group"/> -->
-     </component>
-     <component name="m3gcore11">
-      <!-- <unit bldFile="os/graphics/m3g/m3gcore11/group"/> -->
+      <unit bldFile="os\graphics\graphicstools\bitmapfonttools\group" mrp="os\graphics\graphicstools\bitmapfonttools\group\graphics_gdtran.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Text and Localisation" level="services" name="textandloc" levels="device encoding fonts text">
+   <block name="textandloc" long-name="Text and Localisation" level="services" levels="device encoding fonts text">
     <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
-     <component name="AknJapaneseReading" long-name="Akn Japanese Reading">
-      <!-- <unit bldFile="os/textandloc/charconvfw/AknJapaneseReading/group"/> -->
-     </component>
      <component name="charconv_fw" long-name="Character Encoding and Conversion Framework">
-      <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+      <unit bldFile="os\textandloc\charconvfw\charconv_fw\group" mrp="os\textandloc\charconvfw\charconv_fw\group\syslibs_charconv.mrp"/>
      </component>
      <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" plugin="Y">
-      <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-     </component>
-     <component name="CommonAdapter" long-name="Common Adapter">
-      <!-- <unit bldFile="os/textandloc/charconvfw/CommonAdapter/group"/> -->
-     </component>
-     <component name="Findutil" long-name="Find Util">
-      <!-- <unit bldFile="os/textandloc/charconvfw/Findutil/group"/> -->
-     </component>
-     <component name="JPLangUtil" long-name="JP Lang Util">
-      <!-- <unit bldFile="os/textandloc/charconvfw/JPLangUtil/group"/> -->
-     </component>
-     <component name="Localizer" long-name="Localizer">
-      <!-- <unit bldFile="os/textandloc/charconvfw/Localizer/group"/> -->
-     </component>
-     <component name="SortUtil" long-name="Sort Util">
-      <!-- <unit bldFile="os/textandloc/charconvfw/SortUtil/group"/> -->
-     </component>
-     <component name="charconv" long-name="Charconv">
-      <!-- <unit bldFile="os/textandloc/charconvfw/charconv/group"/> -->
-     </component>
-     <component name="charconvplugin" long-name="Charconv Plugin">
-      <!-- <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/> -->
-     </component>
-     <component name="gamerecognizer" long-name="Game Recognizer">
-      <!-- <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/> -->
-     </component>
-     <component name="inlinetext" long-name="Inline Text">
-      <!-- <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/> -->
-     </component>
-     <component name="numbergrouping" long-name="Number Grouping">
-      <!-- <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/> -->
+      <unit bldFile="os\textandloc\charconvfw\charconvplugins\group" mrp="os\textandloc\charconvfw\charconvplugins\group\syslibs_charconv_plugins.mrp"/>
      </component>
     </collection>
     <collection name="fontservices" long-name="Font Services" level="fonts">
+     <component name="textshaperplugin" long-name="Text Shaper Plugin" plugin="Y" introduced="9.2">
+      <unit bldFile="os\textandloc\fontservices\textshaperplugin\group" mrp="os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
+     </component>
      <component name="fontstore" long-name="Font Store">
-      <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+      <unit bldFile="os\textandloc\fontservices\fontstore\group" mrp="os\textandloc\fontservices\fontstore\group\graphics_fntstore.mrp"/>
      </component>
      <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" plugin="Y">
-      <unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-     </component>
-     <component name="graphicstestfonts" long-name="Graphics Test Fonts" introduced="tb91">
-      <unit bldFile="os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/>
+      <unit bldFile="os\textandloc\fontservices\freetypefontrasteriser\group" mrp="os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
      </component>
      <component name="referencefonts" long-name="Reference Fonts" introduced="6.0">
-      <unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-     </component>
-     <component name="textshaperplugin" long-name="Text Shaper Plugin" plugin="Y" introduced="9.2">
-      <unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+      <unit bldFile="os\textandloc\fontservices\referencefonts\group" mrp="os\textandloc\fontservices\referencefonts\group\graphics_fonts.mrp"/>
+     </component>
+     <component name="graphicstestfonts" long-name="Graphics Test Fonts" filter="gt" introduced="tb91">
+      <unit bldFile="os\textandloc\fontservices\graphicstestfonts\group" mrp="os\textandloc\fontservices\graphicstestfonts\group\graphics_testfonts.mrp"/>
      </component>
     </collection>
     <collection name="graphicsdevif" long-name="Graphics Device Interface" level="device">
      <component name="gdi" long-name="GDI">
-      <unit bldFile="os/textandloc/graphicsdevif/gdi/group" mrp="os/textandloc/graphicsdevif/gdi/group/graphics_gdi.mrp"/>
+      <unit bldFile="os\textandloc\graphicsdevif\gdi\group" mrp="os\textandloc\graphicsdevif\gdi\group\graphics_gdi.mrp"/>
      </component>
     </collection>
     <collection name="textrendering" long-name="Text Rendering" level="text">
      <component name="numberformatting" long-name="Number Formatting" introduced="7.0s">
-      <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+      <unit bldFile="os\textandloc\textrendering\numberformatting\group" mrp="os\textandloc\textrendering\numberformatting\group\app-framework_numberconversion.mrp"/>
+     </component>
+     <component name="texthandling" long-name="Text Handling">
+      <unit bldFile="os\textandloc\textrendering\texthandling\group" mrp="os\textandloc\textrendering\texthandling\group\app-framework_etext.mrp"/>
      </component>
      <component name="textformatting" long-name="Text Formatting">
-      <unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-     </component>
-     <component name="texthandling" long-name="Text Handling">
-      <unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+      <unit bldFile="os\textandloc\textrendering\textformatting\group" mrp="os\textandloc\textrendering\textformatting\group\app-framework_form.mrp"/>
      </component>
      <component name="word" long-name="Word" class="test">
-      <unit mrp="os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
+      <unit mrp="os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Build Tools" level="hw" name="buildtools" levels="bld mw fw ui">
-    <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-     <component name="buildsystemtools" long-name="Build System Tools">
-      <unit bldFile="os/buildtools/bldsystemtools/buildsystemtools/group" mrp="os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
-     </component>
-     <component name="commonbldutils" long-name="Common Utils">
-      <unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-     </component>
-     <component name="gttechviewbaseline" long-name="GT Techview Baseline">
-      <unit mrp="os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
-      <!-- DEF087736 This is needed for generating export tables but shouldn't appear otherwise it is included in techview and gt -->
-     </component>
-    </collection>
-    <collection name="devlib" long-name="Developer Library" level="ui">
-     <component name="devlibhtml" long-name="Developer Library HTML">
-      <unit mrp="os/buildtools/devlib/devlibhelp/group/shared/developerlibrary_doc_plain_html.mrp"/>
-     </component>
-     <component name="devlibhelp" long-name="Developer Library Help">
-      <unit version="9.4" bldFile="os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp"/>
-      <unit version="9.5" bldFile="os/buildtools/devlib/devlibhelp/group/devlib95" mrp="os/buildtools/devlib/devlibhelp/group/devlib95/developerlibrary_doc_html.mrp"/>
-     </component>
-     <component name="devlibsrc" long-name="Developer Library Source" filter="gt">
-      <unit bldFile="os/buildtools/devlib/devlibhelp/securitysupplement/doc_source" mrp="os/buildtools/devlib/devlibhelp/developerlibrary_doc_source.mrp"/>
-     </component>
-     <component name="toolsdocs" long-name="Tools Documentation">
-      <unit mrp="os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="fileconv" long-name="File Converters" level="mw">
-     <component name="alp2csh" long-name="ALP to CSH">
-      <unit bldFile="os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/>
-     </component>
-     <component name="cjpeg" long-name="CJpeg">
-      <unit bldFile="os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/>
-     </component>
-     <component name="rtf2ptml" long-name="RTF to PTML">
-      <unit bldFile="os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/>
-     </component>
-    </collection>
-    <collection name="javatoolsplat" long-name="Java Tools Platform" level="mw">
-     <component name="javalib" long-name="Java Library " filter="gt">
-      <unit bldFile="os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/>
-     </component>
-    </collection>
-    <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-     <component name="autotest" long-name="Autotest">
-      <unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-     </component>
-     <component name="additionalredistribution" long-name="Additional Redistribution">
-      <unit mrp="os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
-     </component>
-     <component name="burtestserver" long-name="BUR Test Server">
-      <unit bldFile="os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/>
-     </component>
-     <component name="prf" long-name="Product Realisation Framework">
-      <unit bldFile="os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/>
-     </component>
-     <component name="cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt">
-      <unit bldFile="os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/>
-     </component>
-     <component name="cdb" long-name="Code Database">
-      <unit bldFile="os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/>
-     </component>
-     <component name="ctsfunctionalitycheckers" long-name="CTS Functionality Checkers">
-      <unit mrp="os/buildtools/toolsandutils/ctsfunctionalitycheckers/Group/testtools_cts_functionalitycheckers.mrp"/>
-     </component>
-     <component name="e32tools" long-name="E32 Tools" class="PC" deprecated="tb91">
-      <unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-     </component>
-     <component name="kitcomparator" long-name="Kit Comparator">
-      <unit bldFile="os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/>
-     </component>
-     <component name="kitsetupapp" long-name="Kit Setup App" filter="gt">
-      <unit mrp="os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
-     </component>
-     <component name="navigationpages" long-name="Navigation Pages">
-      <unit mrp="os/buildtools/toolsandutils/navigationpages/tools_sdk_eng_NavigationPages.mrp"/>
-     </component>
-     <component name="productinstaller" long-name="Product Installer" filter="gt">
-      <unit bldFile="os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/>
-     </component>
-     <component name="productionbldtools" long-name="Production Build Tools" filter="gt">
-      <unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-     </component>
-     <component name="statdesktop" long-name="STAT Desktop" filter="gt">
-      <unit bldFile="os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/>
-     </component>
-     <component name="stlport" long-name="STL Port">
-      <unit bldFile="os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/>
-     </component>
-     <component name="systemmonitor" long-name="System Monitor" introduced="8.0">
-      <unit bldFile="os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/>
-     </component>
-     <component name="statapi" long-name="STAT API" filter="gt">
-      <unit bldFile="os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
-     </component>
-     <component name="statsource" long-name="STAT Source" filter="gt">
-      <unit mrp="os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
-     </component>
-     <component name="testconfigfileparser" long-name="Test Config File Parser">
-      <unit bldFile="os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/>
-     </component>
-     <component name="testdriver" long-name="Test Driver">
-      <unit bldFile="os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/>
-     </component>
-     <component name="testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91">
-      <unit bldFile="os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/>
-     </component>
-     <component name="usecasecontroller" long-name="Use Case Controller">
-      <unit bldFile="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/>
-     </component>
-     <component name="wincredistribution" long-name="WinC Redistribution">
-      <unit mrp="os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
-     </component>
-     <component name="wintunnel" long-name="Wintunnel">
-      <unit mrp="os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
-     </component>
-    </collection>
-    <collection name="binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
-     <component name="captools" long-name="Capability Tools">
-      <unit bldFile="os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/>
-     </component>
-     <component name="depcheck" long-name="Dependency Checker">
-      <unit bldFile="os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/>
-     </component>
-    </collection>
-    <collection name="bintools_os" long-name="Binary Tools" level="fw">
-     <component name="evalid" long-name="Evalid">
-      <unit bldFile="os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/>
-     </component>
-     <component name="rcomp" long-name="Resource Compiler">
-      <unit bldFile="os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/>
-     </component>
-    </collection>
-    <collection name="dist_os" long-name="Redistribution" level="mw">
-     <component name="redistributionwinceka2" long-name="Redistribution WINC EKA2">
-      <unit bldFile="os/buildtools/dist_os/redistributionwinceka2" mrp="os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_cedar.mrp"/>
-     </component>
-    </collection>
-    <collection name="imgtools_os" long-name="Image Tools" level="fw">
-     <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91">
-      <unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-     </component>
-    </collection>
-    <collection name="misccomponents" long-name="Misc Components" level="mw">
-     <component name="assertion" long-name="Assertion" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/>
-     </component>
-     <component name="bspbuilder" long-name="BSP Builder" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/>
-     </component>
-     <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-     </component>
-     <component name="enum" long-name="Enum" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/>
-     </component>
-     <component name="envvar" long-name="Envvar" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/>
-     </component>
-     <component name="filesys" long-name="Filesys" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/>
-     </component>
-     <component name="installutils" long-name="Install Utils" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/>
-     </component>
-     <component name="jade" long-name="Jade " filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/>
-     </component>
-     <component name="javahelp" long-name="Java Help" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/>
-     </component>
-     <component name="langconfig" long-name="Language Config" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/>
-     </component>
-     <component name="launch" long-name="Launch" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/>
-     </component>
-     <component name="logger" long-name="Logger" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/>
-     </component>
-     <component name="mnemonicfix" long-name="Mnemonic Fix" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/>
-     </component>
-     <component name="pathbrowser" long-name="Path Browser" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/>
-     </component>
-     <component name="pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/>
-     </component>
-     <component name="runperl" long-name="Run PERL" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/>
-     </component>
-     <component name="sdkbuilder" long-name="SDK Building Tools">
-      <unit bldFile="os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/>
-     </component>
-     <component name="sdkpackagemgr" long-name="SDK Package Manager" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/>
-     </component>
-     <component name="sdkinfo" long-name="SDK Info" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/>
-     </component>
-     <component name="sdkpkgtools" long-name="SDK Package Tools" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/>
-     </component>
-     <component name="shellexec" long-name="Shell Exec" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/>
-     </component>
-     <component name="splash" long-name="Splash Screen">
-      <unit bldFile="os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/>
-     </component>
-     <component name="swingworker" long-name="Swing Worker" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/>
-     </component>
-     <component name="testcaserunner" long-name="Test Case Runner" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/>
-     </component>
-     <component name="toolbarpanel" long-name="Tool Bar Panel" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/>
-     </component>
-     <component name="toolsstubs" long-name="Devices Tools Stubs" filter="gt">
-      <unit bldFile="os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/>
-     </component>
-    </collection>
-    <collection name="packaging" long-name="Packaging" level="ui">
-     <component name="additionalutils" long-name="Additional Utils">
-      <unit mrp="os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
-     </component>
-     <component name="dummy" long-name="Dummy">
-      <unit bldFile="os/buildtools/packaging/dummy" mrp="os/buildtools/packaging/dummy/additional_dummy.mrp"/>
-     </component>
-    </collection>
-    <collection name="perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
-     <component name="legacycommonperl" long-name="Legacy Common Perl Libraries">
-      <unit bldFile="os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/>
-     </component>
-     <component name="commonperl" long-name="Common Perl Libraries">
-      <unit bldFile="os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/>
-     </component>
-     <component name="redistribution" long-name="Redistribution" filter="gt">
-      <unit bldFile="os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-     <component name="bldtools" long-name="Build Tools" filter="gt">
-      <unit bldFile="os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/>
-     </component>
-     <component name="e32toolp" long-name="E32 Perl Tools" class="PC">
-      <unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
-     </component>
-    </collection>
-    <collection name="srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
-     <component name="leavescan" long-name="Leavescan">
-      <unit bldFile="os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/>
-     </component>
-     <component name="migrationtool" long-name="Migration Tool">
-      <unit bldFile="os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/>
-     </component>
-     <component name="programchecker" long-name="Program Checker" deprecated="tb91">
-      <unit bldFile="os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/>
+   <block name="xmlsrv" long-name="XML Services" level="services" levels="plugin server framework generic specific">
+    <collection name="xml" long-name="XML" level="generic">
+     <component name="xmlfw" long-name="XML Framework" introduced="7.0s">
+      <unit bldFile="os\xmlsrv\xml\xmlfw\group" mrp="os\xmlsrv\xml\xmlfw\group\syslibs_xml.mrp"/>
+     </component>
+     <component name="xmlexpatparser" long-name="XML Expat Parser" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\xmlsrv\xml\xmlexpatparser\group" mrp="os\xmlsrv\xml\xmlexpatparser\group\syslibs_xmlparser.mrp"/>
+     </component>
+     <component name="wbxmlparser" long-name="WBXML Parser" plugin="Y" introduced="7.0s">
+      <unit bldFile="os\xmlsrv\xml\wbxmlparser\group" mrp="os\xmlsrv\xml\wbxmlparser\group\syslibs_wbxmlparser.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="XML Services" level="services" name="xmlsrv" levels="plugin server framework generic specific">
-    <collection name="xml" long-name="XML" level="generic">
-     <component name="wbxmlparser" long-name="WBXML Parser" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-     </component>
-     <component name="xmlexpatparser" long-name="XML Expat Parser" plugin="Y" introduced="7.0s">
-      <unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-     </component>
-     <component name="xmlfw" long-name="XML Framework" introduced="7.0s">
-      <unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-     </component>
-    </collection>
-    <collection name="xmlengine" long-name="XML Engine" level="server">
-     <component name="domxpathwrapper" long-name="DOM XPath Wrapper">
-      <!-- <unit bldFile="os/xmlsrv/xmlengine/domxpathwrapper/group"/> -->
-     </component>
-     <component name="libxml2" long-name="Libxml2">
-      <!-- <unit bldFile="os/xmlsrv/xmlengine/libxml2/group"/> -->
-     </component>
-     <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin">
-      <!-- <unit bldFile="os/xmlsrv/xmlengine/xmlenginesaxplugin/group"/> -->
-     </component>
-     <component name="xmlengineserializer" long-name="XML Engines Erializer">
-      <!-- <unit bldFile="os/xmlsrv/xmlengine/xmlengineserializer/group"/> -->
-     </component>
-     <component name="xmlengineutils" long-name="XML Engine Utils">
-      <!-- <unit bldFile="os/xmlsrv/xmlengine/xmlengineutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-     <component name="xmlsec" long-name="XML Security">
-      <!-- <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/> -->
-     </component>
-     <component name="xmlseccertman" long-name="XML Security Certman">
-      <!-- <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/> -->
-     </component>
-     <component name="xmlseccrypto" long-name="XML Security Crypto">
-      <!-- <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/> -->
-     </component>
-     <component name="xmlsecwrapper" long-name="XML Security Wrapper">
-      <!-- <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Device Platform Release" level="services" name="deviceplatformrelease" levels="bld mid top">
-    <collection name="S60Extras" long-name="S60 Extras" level="mid">
-     <component name="S60Extras compo" long-name="S60 Extras Component">
-      <!-- <unit bldFile="os/deviceplatformrelease/S60Extras/S60Extras compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="S60Helps" long-name="S60 Helps" level="mid">
-     <component name="S60Helps compo" long-name="S60 Helps Component">
-      <!-- <unit bldFile="os/deviceplatformrelease/S60Helps/S60Helps compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="S60LocFiles" long-name="S60 Loc Files" level="mid">
-     <component name="S60LocFiles compo" long-name="S60 Loc Files Component">
-      <!-- <unit bldFile="os/deviceplatformrelease/S60LocFiles/S60LocFiles compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="Version" long-name="Version" level="top">
-     <component name="Version compo" long-name="Version Component">
-      <!-- <unit bldFile="os/deviceplatformrelease/Version/Version compo/group"/> -->
+   <block name="deviceplatformrelease" long-name="Device Platform Release" level="services" levels="bld mid top">
+    <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+     <component name="cedarutils" long-name="Cedar Utils">
+      <unit mrp="os\deviceplatformrelease\symbianosbld\cedarutils\tools_utils_cedar.mrp"/>
+     </component>
+     <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt">
+      <unit mrp="os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\product_cbr_config.mrp"/>
      </component>
     </collection>
     <collection name="foundation_system" long-name="Foundation System" level="top">
      <component name="systemdocs" long-name="System Documentation" class="doc">
-      <unit mrp="os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
-     </component>
-    </collection>
-    <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-     <component name="cedarutils" long-name="Cedar Utils">
-      <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-     </component>
-     <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt">
-      <unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+      <unit mrp="os\deviceplatformrelease\foundation_system\systemdocs\group\system.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="OS RD tools" level="services" name="osrndtools" levels="fw trace">
-    <collection name="opensystemtrace" long-name="Open System Trace" level="trace">
-     <component name="tracecompiler" long-name="Trace Compiler">
-      <!-- <unit bldFile="os/osrndtools/opensystemtrace/tracecompiler/group"/> -->
-     </component>
-    </collection>
-    <collection name="stif" long-name="STIF" level="fw">
-     <component name="ATSInterface" long-name="ATS Interface">
-      <!-- <unit bldFile="os/osrndtools/stif/ATSInterface/group"/> -->
-     </component>
-     <component name="ATSLogger" long-name="ATS Logger">
-      <!-- <unit bldFile="os/osrndtools/stif/ATSLogger/group"/> -->
-     </component>
-     <component name="ConsoleUI" long-name="Console UI">
-      <!-- <unit bldFile="os/osrndtools/stif/ConsoleUI/group"/> -->
-     </component>
-     <component name="DemoModule" long-name="Demo Module">
-      <!-- <unit bldFile="os/osrndtools/stif/DemoModule/group"/> -->
-     </component>
-     <component name="SUEvent" long-name="SU Event">
-      <!-- <unit bldFile="os/osrndtools/stif/SUEvent/group"/> -->
-     </component>
-     <component name="StifKernelTestClassBase" long-name="STIF Kernel Test Class Base">
-      <!-- <unit bldFile="os/osrndtools/stif/StifKernelTestClassBase/group"/> -->
-     </component>
-     <component name="StifTFwIf" long-name="STIF TFwIf">
-      <!-- <unit bldFile="os/osrndtools/stif/StifTFwIf/group"/> -->
-     </component>
-     <component name="TestCombiner" long-name="Test Combiner">
-      <!-- <unit bldFile="os/osrndtools/stif/TestCombiner/group"/> -->
-     </component>
-     <component name="TestEngine" long-name="Test Engine">
-      <!-- <unit bldFile="os/osrndtools/stif/TestEngine/group"/> -->
-     </component>
-     <component name="TestInterface" long-name="Test Interface">
-      <!-- <unit bldFile="os/osrndtools/stif/TestInterface/group"/> -->
-     </component>
-     <component name="TestModuleTemplates" long-name="Test Module Templates">
-      <!-- <unit bldFile="os/osrndtools/stif/TestModuleTemplates/group"/> -->
-     </component>
-     <component name="TestScripter" long-name="Test Scripter">
-      <!-- <unit bldFile="os/osrndtools/stif/TestScripter/group"/> -->
-     </component>
-     <component name="TestServer" long-name="Test Server">
-      <!-- <unit bldFile="os/osrndtools/stif/TestServer/group"/> -->
-     </component>
-     <component name="TestServerStarter" long-name="Test Server Starter">
-      <!-- <unit bldFile="os/osrndtools/stif/TestServerStarter/group"/> -->
-     </component>
-     <component name="examples" long-name="Examples">
-      <!-- <unit bldFile="os/osrndtools/stif/examples/group"/> -->
-     </component>
-    </collection>
+   <block name="osrndtools" long-name="OS RD tools" level="services" levels="fw trace">
     <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
      <component name="cinidata" long-name="CINI Data">
-      <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
+      <unit bldFile="os\osrndtools\testexecfw1\cinidata" mrp="os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp"/>
      </component>
      <component name="testexecute" long-name="Test Execute" deprecated="tb91">
-      <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block long-name="Software Config Tools" level="services" name="swconfigtools">
-    <collection name="gid_pc_tool" long-name="GID PC Tool">
-     <component name="DBImporter" long-name="DB Importer">
-      <!-- <unit bldFile="os/swconfigtools/gid_pc_tool/DBImporter/group"/> -->
+      <unit bldFile="os\osrndtools\testexecfw1\testexecute\Group" mrp="os\osrndtools\testexecfw1\testexecute\Group\tools_testexecute.mrp"/>
      </component>
     </collection>
    </block>
   </layer>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block long-name="Generic Application Support" level="generic" name="appsupport" levels="system plugin framework server generic specific">
-    <collection name="appfw" long-name="Application Framework" level="framework">
-     <component name="apparchitecture" long-name="Application Architecture">
-      <unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-     </component>
-     <component name="uiftestfw" long-name="UIF Test Framework" class="test" introduced="9.2">
-      <unit mrp="mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
-     </component>
-     <component name="viewserver" long-name="View Server" introduced="6.0">
-      <unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+   <block name="appsupport" long-name="Generic Application Support" level="generic" levels="system plugin framework server generic specific">
+    <collection name="filehandling" long-name="File Handling" level="server">
+     <component name="fileconverterfw" long-name="File Converter Framework">
+      <unit bldFile="mw\appsupport\filehandling\fileconverterfw\group" mrp="mw\appsupport\filehandling\fileconverterfw\group\app-framework_conarc.mrp"/>
+     </component>
+     <component name="fileconverterplugins" long-name="Other File Converter Plugins" plugin="Y" introduced="5.0" deprecated="9.3">
+      <unit bldFile="mw\appsupport\filehandling\fileconverterplugins\group" mrp="mw\appsupport\filehandling\fileconverterplugins\group\app-engines_convert.mrp"/>
+     </component>
+     <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" plugin="Y" introduced="7.0">
+      <unit bldFile="mw\appsupport\filehandling\htmltorichtextconverter\group" mrp="mw\appsupport\filehandling\htmltorichtextconverter\group\app-services_chtmltocrtconv.mrp"/>
+     </component>
+     <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" plugin="Y" introduced="7.0s">
+      <unit bldFile="mw\appsupport\filehandling\richtexttohtmlconverter\Group" mrp="mw\appsupport\filehandling\richtexttohtmlconverter\Group\app-services_richtexttohtmlconv.mrp"/>
      </component>
     </collection>
-    <collection name="applaunchservices" long-name="Application Launch Services" level="generic"/>
+    <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+     <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91">
+      <unit bldFile="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group" mrp="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">
-      <unit bldFile="mw/appsupport/commonappservices/alarmserver/Group" mrp="mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+      <unit bldFile="mw\appsupport\commonappservices\alarmserver\Group" mrp="mw\appsupport\commonappservices\alarmserver\Group\app-services_alarmserver.mrp"/>
      </component>
      <component name="alarmservertest" long-name="Alarm Server Test" introduced="8.1" class="test" deprecated="tb92">
-      <unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-     </component>
-     <component name="appservicesdocs" long-name="Application Services Documentation" class="doc">
-      <unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-     </component>
-     <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1">
-      <unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+      <unit bldFile="mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv" mrp="mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv\app-services_testalarmsrv.mrp"/>
      </component>
      <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" class="test">
       <!-- XML Previous Location: Application Services/Other Application Services/ -->
-      <unit mrp="mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp"/>
+      <unit mrp="mw\appsupport\commonappservices\coreappstest\Group\app-services_CoreAppsTest.mrp"/>
+     </component>
+     <component name="appservicesdocs" long-name="Application Services Documentation" class="doc">
+      <unit mrp="mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp"/>
+     </component>
+     <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1">
+      <unit bldFile="mw\appsupport\commonappservices\backuprestorenotification\group" mrp="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">
+      <unit bldFile="mw\appsupport\tzservices\tzserver\group" mrp="mw\appsupport\tzservices\tzserver\group\app-services_tz.mrp"/>
+     </component>
+     <component name="tzloc" long-name="Time Zone Localization" introduced="9.1">
+      <unit bldFile="mw\appsupport\tzservices\tzloc\group" mrp="mw\appsupport\tzservices\tzloc\group\app-services_timezonelocalization.mrp"/>
+     </component>
+     <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" class="config">
+      <unit bldFile="mw\appsupport\tzservices\tzlocrscfactory\group" mrp="mw\appsupport\tzservices\tzlocrscfactory\group\app-services_tzlocalizationrscfactory.mrp"/>
+     </component>
+     <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" class="config">
+      <unit bldFile="mw\appsupport\tzservices\tzdatabase\group" mrp="mw\appsupport\tzservices\tzdatabase\group\app-services_tzdb.mrp"/>
+     </component>
+     <component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1">
+      <unit bldFile="mw\appsupport\tzservices\worldserver\group" mrp="mw\appsupport\tzservices\worldserver\group\app-services_worldserver.mrp"/>
+     </component>
+     <component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" class="test">
+      <unit bldFile="mw\appsupport\tzservices\worldservertest\TestWorldSrv" mrp="mw\appsupport\tzservices\worldservertest\TestWorldSrv\app-services_testworldsrv.mrp"/>
      </component>
     </collection>
     <collection name="contenthandling" long-name="Content Handling" level="plugin">
      <component name="contenthandlingfw" long-name="Content Handling Framework" introduced="8.0">
-      <unit bldFile="mw/appsupport/contenthandling/contenthandlingfw/Group" mrp="mw/appsupport/contenthandling/contenthandlingfw/Group/content-handling.mrp"/>
-     </component>
-     <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0">
-      <unit bldFile="mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group" mrp="mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+      <unit bldFile="mw\appsupport\contenthandling\contenthandlingfw\Group" mrp="mw\appsupport\contenthandling\contenthandlingfw\Group\content-handling.mrp"/>
      </component>
      <component name="webrecognisers" long-name="Web Recognisers" plugin="Y">
-      <unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-     </component>
-    </collection>
-    <collection name="filehandling" long-name="File Handling" level="server">
-     <component name="fileconverterfw" long-name="File Converter Framework">
-      <unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-     </component>
-     <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" plugin="Y" introduced="7.0">
-      <unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-     </component>
-     <component name="fileconverterplugins" long-name="Other File Converter Plugins" plugin="Y" introduced="5.0" deprecated="9.3">
-      <unit bldFile="mw/appsupport/filehandling/fileconverterplugins/group" mrp="mw/appsupport/filehandling/fileconverterplugins/group/app-engines_convert.mrp"/>
-     </component>
-     <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="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="tb91">
-      <unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-     <component name="commandshell" long-name="Command Shell" introduced="tb92">
-      <unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-     </component>
-     <component name="telnetserver" long-name="Telnet Server" introduced="tb92">
-      <unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+      <unit bldFile="mw\appsupport\contenthandling\webrecognisers\group" mrp="mw\appsupport\contenthandling\webrecognisers\group\application-protocols_recognisers.mrp"/>
+     </component>
+     <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0">
+      <unit bldFile="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group" mrp="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
      </component>
     </collection>
     <collection name="printingsupport" long-name="Printing Support" level="generic">
      <component name="printinguisupport" long-name="Printing UI Support">
-      <unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-     </component>
-    </collection>
-    <collection name="sensorsupport" long-name="Sensor Support" level="generic"/>
-    <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-     <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" class="config PC">
-      <unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-     </component>
-     <component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" class="config PC">
-      <unit bldFile="mw/appsupport/tzpcside/worlddatabasekit/group" mrp="mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/>
-     </component>
-     <component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" class="config PC">
-      <unit bldFile="mw/appsupport/tzpcside/worldtools/group" mrp="mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
-     </component>
-    </collection>
-    <collection name="tzservices" long-name="Time Zone Services" level="plugin">
-     <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" class="config">
-      <unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-     </component>
-     <component name="tzloc" long-name="Time Zone Localization" introduced="9.1">
-      <unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-     </component>
-     <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" class="config">
-      <unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-     </component>
-     <component name="tzserver" long-name="Time Zone Server" introduced="9.1">
-      <unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-     </component>
-     <component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1">
-      <unit bldFile="mw/appsupport/tzservices/worldserver/group" mrp="mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
-     </component>
-     <component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" class="test">
-      <unit bldFile="mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
-     </component>
-    </collection>
-    <collection name="contextframework" long-name="Context Framework" level="framework">
-     <component name="cfw" long-name="Context Framework">
-      <!-- <unit bldFile="mw/appsupport/contextframework/cfw/group"/> -->
-     </component>
-     <component name="cfwplugins" long-name="Context Framework Plugins">
-      <!-- <unit bldFile="mw/appsupport/contextframework/cfwplugins/group"/> -->
+      <unit bldFile="mw\appsupport\printingsupport\printinguisupport\group" mrp="mw\appsupport\printingsupport\printinguisupport\group\app-framework_print.mrp"/>
      </component>
     </collection>
-    <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-     <component name="DbRecovery" long-name="Db Recovery">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/DbRecovery/group"/> -->
-     </component>
-     <component name="GSServer" long-name="GS Server">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/GSServer/group"/> -->
-     </component>
-     <component name="GSServerEngine" long-name="GS Server Engine">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/GSServerEngine/group"/> -->
-     </component>
-     <component name="NspsWsPlugin" long-name="Nsps WS Plugin">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/NspsWsPlugin/group"/> -->
-     </component>
-     <component name="Rfs" long-name="RFS">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/Rfs/group"/> -->
-     </component>
-     <component name="SysAp" long-name="Sys Ap">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/SysAp/group"/> -->
-     </component>
-     <component name="VariatedSettings" long-name="Variated Settings">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/VariatedSettings/group"/> -->
-     </component>
-     <component name="accfwuinotifier" long-name="ACC Framework UI Notifier">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/> -->
-     </component>
-     <component name="advancedtspcontroller" long-name="Advanced TSP Controller">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/> -->
-     </component>
-     <component name="gsserverenginestub" long-name="GS Server Engine Stub">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/> -->
-     </component>
-     <component name="kefmapper" long-name="Key Event Framework Mapper">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/> -->
-     </component>
-     <component name="powersaveutilities" long-name="Power Save Utilities">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/> -->
-     </component>
-     <component name="rfsplugins" long-name="Rfs Plugins">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/> -->
-     </component>
-    </collection>
-    <collection name="flashliteapi_3_0" long-name="Flashlite API 3.0" level="specific">
-     <component name="flashliteapi_3_0_compo" long-name="Flashlite API 3.0 Component">
-      <!-- <unit bldFile="mw/appsupport/flashliteapi_3_0/flashliteapi_3_0_compo/group"/> -->
+    <collection name="appfw" long-name="Application Framework" level="framework">
+     <component name="apparchitecture" long-name="Application Architecture">
+      <unit bldFile="mw\appsupport\appfw\apparchitecture\group" mrp="mw\appsupport\appfw\apparchitecture\group\app-framework_apparc.mrp"/>
+     </component>
+     <component name="viewserver" long-name="View Server" introduced="6.0">
+      <unit bldFile="mw\appsupport\appfw\viewserver\group" mrp="mw\appsupport\appfw\viewserver\group\app-framework_viewsrv.mrp"/>
+     </component>
+     <component name="uiftestfw" long-name="UIF Test Framework" class="test" introduced="9.2">
+      <unit mrp="mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
      </component>
     </collection>
-    <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
-     <component name="Gs" long-name="GS">
-      <!-- <unit bldFile="mw/appsupport/gssettingsuis/Gs/group"/> -->
-     </component>
-    </collection>
-    <collection name="mediakeys" long-name="Media Keys" level="plugin">
-     <component name="KeyPublisherPlugin" long-name="Key Publisher Plugin">
-      <!-- <unit bldFile="mw/appsupport/mediakeys/KeyPublisherPlugin/group"/> -->
-     </component>
-     <component name="MMKeyBearer" long-name="MM Key Bearer">
-      <!-- <unit bldFile="mw/appsupport/mediakeys/MMKeyBearer/group"/> -->
-     </component>
-    </collection>
-    <collection name="profilesservices" long-name="Profiles Services" level="server">
-     <component name="FileList" long-name="File List">
-      <!-- <unit bldFile="mw/appsupport/profilesservices/FileList/group"/> -->
-     </component>
-     <component name="MediaFileList" long-name="Media File List">
-      <!-- <unit bldFile="mw/appsupport/profilesservices/MediaFileList/group"/> -->
-     </component>
-     <component name="ProfileEngine" long-name="Profile Engine">
-      <!-- <unit bldFile="mw/appsupport/profilesservices/ProfileEngine/group"/> -->
-     </component>
-     <component name="RingingTone3DPlugin" long-name="Ringing Tone 3D Plugin">
-      <!-- <unit bldFile="mw/appsupport/profilesservices/RingingTone3DPlugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="startupservices" long-name="Startup Services" level="system">
-     <component name="SplashScreen" long-name="Splash Screen">
-      <!-- <unit bldFile="mw/appsupport/startupservices/SplashScreen/group"/> -->
-     </component>
-     <component name="Startup">
-      <!-- <unit bldFile="mw/appsupport/startupservices/Startup/group"/> -->
-     </component>
-     <component name="startupanimation" long-name="Startup Animation">
-      <!-- <unit bldFile="mw/appsupport/startupservices/startupanimation/group"/> -->
-     </component>
-    </collection>
-    <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-     <component name="oodmonitor" long-name="OOD Monitor">
-      <!-- <unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/> -->
-     </component>
-     <component name="oommonitor" long-name="OOM Monitor">
-      <!-- <unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/> -->
-     </component>
-    </collection>
-    <collection name="systemsettings" long-name="System Settings" level="system">
-     <component name="GSAccessoryPlugin" long-name="GS Accessory Plugin">
-      <!-- <unit bldFile="mw/appsupport/systemsettings/GSAccessoryPlugin/group"/> -->
-     </component>
-     <component name="gssensorplugin" long-name="GS Sensor Plugin">
-      <!-- <unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/> -->
+    <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
+     <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" class="config PC">
+      <unit bldFile="mw\appsupport\tzpcside\tzcompiler\group" mrp="mw\appsupport\tzpcside\tzcompiler\group\app-services_tzcompiler.mrp"/>
+     </component>
+     <component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" class="config PC">
+      <unit bldFile="mw\appsupport\tzpcside\worlddatabasekit\group" mrp="mw\appsupport\tzpcside\worlddatabasekit\group\app-services_wlddatabasekit_cedar.mrp"/>
+     </component>
+     <component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" class="config PC">
+      <unit bldFile="mw\appsupport\tzpcside\worldtools\group" mrp="mw\appsupport\tzpcside\worldtools\group\app-services_wldtools.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Security Services" level="generic" name="securitysrv" levels="plugin framework server generic specific">
-    <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-     <component name="IntegrityCheck.exe=binary">
-      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/IntegrityCheck.exe=binary/group"/> -->
-     </component>
-     <component name="IntegrityCheckClient.dll=binary">
-      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/IntegrityCheckClient.dll=binary/group"/> -->
-     </component>
-     <component name="IntegrityCheckServer.exe=binary">
-      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/IntegrityCheckServer.exe=binary/group"/> -->
-     </component>
-     <component name="TrkDummy" long-name="Trk Dummy">
-      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/TrkDummy/group"/> -->
-     </component>
-    </collection>
-    <collection name="cms" long-name="Certificate Management Services" level="generic">
-     <component name="CMS.Dll=binary" long-name="CMS">
-      <!-- <unit bldFile="mw/securitysrv/cms/CMS.Dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="gba" long-name="Generic Boot Architecture" level="specific">
-     <component name="bootstrap" long-name="Bootstrap">
-      <!-- <unit bldFile="mw/securitysrv/gba/bootstrap/group"/> -->
-     </component>
-     <component name="gbaapi" long-name="GBA API">
-      <!-- <unit bldFile="mw/securitysrv/gba/gbaapi/group"/> -->
-     </component>
-     <component name="gbafilter" long-name="GBA Filter">
-      <!-- <unit bldFile="mw/securitysrv/gba/gbafilter/group"/> -->
-     </component>
-     <component name="gbaserver" long-name="GBA Server">
-      <!-- <unit bldFile="mw/securitysrv/gba/gbaserver/group"/> -->
-     </component>
-     <component name="uicc" long-name="Uicc">
-      <!-- <unit bldFile="mw/securitysrv/gba/uicc/group"/> -->
-     </component>
-    </collection>
-    <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-     <component name="CTSecurityDialogs" long-name="CT Security Dialogs">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/CTSecurityDialogs/group"/> -->
-     </component>
-     <component name="CertSaver" long-name="Cert Saver">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/CertSaver/group"/> -->
-     </component>
-     <component name="Certificates">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/Certificates/group"/> -->
-     </component>
-     <component name="CertmanUi" long-name="Certman UI">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/CertmanUi/group"/> -->
-     </component>
-     <component name="DeviceToken" long-name="Device Token">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/DeviceToken/group"/> -->
-     </component>
-     <component name="PKCS12">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/PKCS12/group"/> -->
-     </component>
-     <component name="SecModUI" long-name="Sec Mod UI">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/SecModUI/group"/> -->
-     </component>
-     <component name="x509certnameparser" long-name="X509cert Name Parser">
-      <!-- <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/> -->
-     </component>
-    </collection>
-    <collection name="remotelock" long-name="Remote Lock" level="server">
-     <component name="RemoteLockEngine" long-name="Remote Lock Engine">
-      <!-- <unit bldFile="mw/securitysrv/remotelock/RemoteLockEngine/group"/> -->
-     </component>
-     <component name="RemotelockSettings" long-name="Remote Lock Settings">
-      <!-- <unit bldFile="mw/securitysrv/remotelock/RemotelockSettings/group"/> -->
-     </component>
-    </collection>
-    <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-     <component name="Autolock">
-      <!-- <unit bldFile="mw/securitysrv/securitydialogs/Autolock/group"/> -->
-     </component>
-     <component name="SecUi" long-name="Sec UI">
-      <!-- <unit bldFile="mw/securitysrv/securitydialogs/SecUi/group"/> -->
-     </component>
-     <component name="Securitynotifier" long-name="Security Notifier">
-      <!-- <unit bldFile="mw/securitysrv/securitydialogs/Securitynotifier/group"/> -->
-     </component>
-     <component name="Securityobserver" long-name="Security Observer">
-      <!-- <unit bldFile="mw/securitysrv/securitydialogs/Securityobserver/group"/> -->
-     </component>
-     <component name="keylockpolicyapi" long-name="Keylock Policy Api">
-      <!-- <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/> -->
-     </component>
-    </collection>
-    <collection name="wim" long-name="WIM" level="framework">
-     <component name="Scard" long-name="S Card">
-      <!-- <unit bldFile="mw/securitysrv/wim/Scard/group"/> -->
-     </component>
-     <component name="SwimReader" long-name="Swim Reader">
-      <!-- <unit bldFile="mw/securitysrv/wim/SwimReader/group"/> -->
-     </component>
-     <component name="WimClient" long-name="WIM Client">
-      <!-- <unit bldFile="mw/securitysrv/wim/WimClient/group"/> -->
-     </component>
-     <component name="WimPlugin" long-name="WIM Plugin">
-      <!-- <unit bldFile="mw/securitysrv/wim/WimPlugin/group"/> -->
-     </component>
-     <component name="WimServer" long-name="WIM Server">
-      <!-- <unit bldFile="mw/securitysrv/wim/WimServer/group"/> -->
-     </component>
-     <component name="WimUtil" long-name="WIM Util">
-      <!-- <unit bldFile="mw/securitysrv/wim/WimUtil/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="DRM" level="generic" name="drm" levels="plugin framework server generic specific">
-    <collection name="commondrm" long-name="Common DRM" level="generic">
-     <component name="drmencryptor" long-name="DRM Encryptor">
-      <!-- <unit bldFile="mw/drm/commondrm/drmencryptor/group"/> -->
-     </component>
-     <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI">
-      <!-- <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/group"/> -->
-     </component>
-     <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper">
-      <!-- <unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/> -->
-     </component>
-     <component name="drmsettingsplugin" long-name="DRM Settings Plugin">
-      <!-- <unit bldFile="mw/drm/commondrm/drmsettingsplugin/group"/> -->
-     </component>
-     <component name="drmutility" long-name="DRM Utility">
-      <!-- <unit bldFile="mw/drm/commondrm/drmutility/group"/> -->
-     </component>
-    </collection>
-    <collection name="omadrm" long-name="OMA DRM" level="server">
-     <component name="drmengine" long-name="DRM Engine">
-      <!-- <unit bldFile="mw/drm/omadrm/drmengine/group"/> -->
-     </component>
-     <component name="drmhelper" long-name="DRM Helper">
-      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/group"/> -->
-     </component>
-     <component name="drmlicensemanager" long-name="Drm License Manager">
-      <!-- <unit bldFile="mw/drm/omadrm/drmlicensemanager/group"/> -->
-     </component>
-     <component name="drmplugins" long-name="DRM Plugins">
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/group"/> -->
-     </component>
-     <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser">
-      <!-- <unit bldFile="mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
-     </component>
-    </collection>
-    <collection name="wmdrm" long-name="WM DRM" level="framework">
-     <component name="camese" long-name="Camese">
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/group"/> -->
-     </component>
-     <component name="wmdrmengine" long-name="WM DRM Engine">
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/group"/> -->
-     </component>
-     <component name="wmdrmplugins" long-name="WM DRM Plugins">
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmplugins/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Access Security" level="generic" name="accesssec" levels="plugin framework server generic specific">
-    <collection name="eapol" long-name="EAPOL" level="framework">
-     <component name="eapol_framework" long-name="EAPOL Framework">
-      <!-- <unit bldFile="mw/accesssec/eapol/eapol_framework/group"/> -->
+   <block name="netprotocols" long-name="High-level Internet Protocols" level="generic" levels="plugin framework server generic specific">
+    <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+     <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2">
+      <unit bldFile="mw\netprotocols\applayerprotocols\httptransportfw\group" mrp="mw\netprotocols\applayerprotocols\httptransportfw\group\http_transport-framework.mrp"/>
+     </component>
+     <component name="httpexamples" long-name="HTTP Examples" introduced="6.2">
+      <unit bldFile="mw\netprotocols\applayerprotocols\httpexamples\group" mrp="mw\netprotocols\applayerprotocols\httpexamples\group\http_examples.mrp"/>
+     </component>
+     <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2">
+      <unit bldFile="mw\netprotocols\applayerprotocols\wappushsupport\Group" mrp="mw\netprotocols\applayerprotocols\wappushsupport\Group\wap-browser_wappushsupport.mrp"/>
+     </component>
+     <component name="wapbase" long-name="WAP Base" introduced="6.0">
+      <unit bldFile="mw\netprotocols\applayerprotocols\wapbase\Group" mrp="mw\netprotocols\applayerprotocols\wapbase\Group\wap-browser_wapbase.mrp"/>
+     </component>
+     <component name="ftpengine" long-name="FTP Engine" introduced="6.0">
+      <unit bldFile="mw\netprotocols\applayerprotocols\ftpengine\group" mrp="mw\netprotocols\applayerprotocols\ftpengine\group\networking_ftp_e.mrp"/>
+     </component>
+     <component name="telnetengine" long-name="Telnet Engine" introduced="6.0">
+      <unit bldFile="mw\netprotocols\applayerprotocols\telnetengine\group" mrp="mw\netprotocols\applayerprotocols\telnetengine\group\networking_telnet_e.mrp"/>
      </component>
     </collection>
-    <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-     <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI">
-      <!-- <unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/group"/> -->
-     </component>
-     <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI">
-      <!-- <unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/> -->
-     </component>
-     <component name="wifiprotectedsetup" long-name="WIFI Protected Setup">
-      <!-- <unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/> -->
-     </component>
-     <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI">
-      <!-- <unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/> -->
-     </component>
-     <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI">
-      <!-- <unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Location Services" level="specific" name="locationsrv" levels="plugins fw interface">
-    <collection name="landmarks" long-name="Landmarks" level="fw">
-     <component name="locationlandmarks" long-name="Location Landmarks">
-      <!-- <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationmapnavfw" long-name="Location Map Nav Framework" level="fw">
-     <component name="aiwprovider" long-name="Application Inter-Working Provider">
-      <!-- <unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/> -->
-     </component>
-     <component name="library" long-name="Library">
-      <!-- <unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationsystemui" long-name="Location System UI" level="interface">
-     <component name="locationsysui" long-name="Location Sys UI">
-      <!-- <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationtriggering" long-name="Location Triggering" level="interface">
-     <component name="lbtmgmtui" long-name="LBT Management UI">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/> -->
-     </component>
-     <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/> -->
-     </component>
-     <component name="ltclientlib" long-name="LT Client Lib">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/> -->
-     </component>
-     <component name="ltcontainer" long-name="LT Container">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/> -->
-     </component>
-     <component name="ltlogger" long-name="LT Logger">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/> -->
-     </component>
-     <component name="ltmanagementlib" long-name="LT Management Library">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/> -->
-     </component>
-     <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/> -->
-     </component>
-     <component name="ltserver" long-name="LT Server">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/> -->
-     </component>
-     <component name="ltstrategyengine" long-name="LT Strategy Engine">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/> -->
-     </component>
-     <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/> -->
-     </component>
-    </collection>
-    <collection name="supl" long-name="SUPL" level="plugins">
-     <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester">
-      <!-- <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/group"/> -->
-     </component>
-     <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler">
-      <!-- <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/> -->
-     </component>
-     <component name="locationsuplfw" long-name="Location SUPL Framework">
-      <!-- <unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="IP Connectivity Management" level="generic" name="ipconnmgmt" levels="plugin framework server generic utils">
-    <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-     <component name="apcontrollistplugin" long-name="Access Point Control List Plugin">
-      <!-- <unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="alwayson_net_plugin" long-name="Always On Net Plugin" level="server">
-     <component name="pdpcontextmanager2" long-name="PDP Context Manager 2">
-      <!-- <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/> -->
-     </component>
-    </collection>
-    <collection name="apengine" long-name="Application Engine" level="framework">
-     <component name="apeng" long-name="Access Point Engine">
-      <!-- <unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/> -->
-     </component>
-     <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI">
-      <!-- <unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/> -->
-     </component>
-     <component name="apsettingsplugin" long-name="Access Point Settings Plugin">
-      <!-- <unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="bearermanagement" long-name="Bearer Management" level="framework">
-     <component name="bearermanager" long-name="Bearer Manager">
-      <!-- <unit bldFile="mw/ipconnmgmt/bearermanagement/bearermanager/group"/> -->
-     </component>
-     <component name="mpm" long-name="MPM">
-      <!-- <unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/> -->
-     </component>
-    </collection>
-    <collection name="cmmanager" long-name="CM Manager" level="framework">
-     <component name="cmmgr" long-name="CM Manager">
-      <!-- <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/> -->
-     </component>
-    </collection>
-    <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-     <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin">
-      <!-- <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/> -->
-     </component>
-     <component name="connectionmonitorui" long-name="Connection Monitor UI">
-      <!-- <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/> -->
-     </component>
-     <component name="connmon" long-name="Connection Monitor">
-      <!-- <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/group"/> -->
-     </component>
-     <component name="connmonext" long-name="Connection Monitor Ext">
-      <!-- <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/> -->
-     </component>
-    </collection>
-    <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-     <component name="connectiondialogs" long-name="ConnectionDialogs">
-      <!-- <unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/> -->
-     </component>
-    </collection>
-    <collection name="dbcreator" long-name="DB Creator" level="utils">
-     <component name="commsdatcreator" long-name="Comms Database Creator">
-      <!-- <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/> -->
-     </component>
-     <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr">
-      <!-- <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/> -->
-     </component>
-     <component name="commsdatstartup" long-name="Comms Database Startup">
-      <!-- <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/> -->
-     </component>
-     <component name="dbcreatorexe" long-name="DB Creator">
-      <!-- <unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="High-level Internet Protocols" level="generic" name="netprotocols" levels="plugin framework server generic specific">
     <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+     <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91">
+      <unit bldFile="mw\netprotocols\applayerpluginsandutils\uripermissionservices\group" mrp="mw\netprotocols\applayerpluginsandutils\uripermissionservices\group\application-protocols_ineturilist.mrp"/>
+     </component>
      <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+      <unit bldFile="mw\netprotocols\applayerpluginsandutils\bookmarksupport\group" mrp="mw\netprotocols\applayerpluginsandutils\bookmarksupport\group\application-protocols_bookmarks.mrp"/>
      </component>
      <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" plugin="Y" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+      <unit bldFile="mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group\http_protocol-plugin.mrp"/>
      </component>
      <component name="httptransportplugins" long-name="HTTP Transport Plugins" plugin="Y" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-     </component>
-     <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-     </component>
-    </collection>
-    <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-     <component name="ftpengine" long-name="FTP Engine" introduced="6.0">
-      <unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-     </component>
-     <component name="httpexamples" long-name="HTTP Examples" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-     </component>
-     <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-     </component>
-     <component name="telnetengine" long-name="Telnet Engine" introduced="6.0">
-      <unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-     </component>
-     <component name="wapbase" long-name="WAP Base" introduced="6.0">
-      <unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-     </component>
-     <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2">
-      <unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+      <unit bldFile="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group\http_transport-plugin.mrp"/>
      </component>
     </collection>
     <collection name="wapstack" long-name="WAP Stack" level="plugin">
      <component name="wapmessageapi" long-name="WAP Message API">
-      <unit bldFile="mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
-     </component>
-    </collection>
-    <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-     <component name="Cookie">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/Cookie/group"/> -->
-     </component>
-     <component name="HttpFilterAcceptHeader" long-name="HTTP Filter Accept Header">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/HttpFilterAcceptHeader/group"/> -->
-     </component>
-     <component name="HttpFilterAuthentication" long-name="HTTP Filter Authentication">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/HttpFilterAuthentication/group"/> -->
-     </component>
-     <component name="HttpFilterCommon" long-name="HTTP Filter Common">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/HttpFilterCommon/group"/> -->
-     </component>
-     <component name="HttpFilterConnHandler" long-name="HTTP Filter Conn Handler">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/HttpFilterConnHandler/group"/> -->
-     </component>
-     <component name="HttpFilterIop" long-name="HTTP Filter Iop">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/HttpFilterIop/group"/> -->
-     </component>
-     <component name="HttpFilterProxy" long-name="HTTP Filter Proxy">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/HttpFilterProxy/group"/> -->
-     </component>
-     <component name="deflatefilter" long-name="Deflate Filter">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/> -->
-     </component>
-     <component name="uaproffilter" long-name="UAProf Filter">
-      <!-- <unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="IP App Protocols" level="generic" name="ipappprotocols" levels="plugin framework server generic specific">
-    <collection name="sipconnproviderplugins" long-name="SIP Connection Provider Plugins" level="conn">
-     <component name="sipconnectionplugins" long-name="SIP Connection Plugins" plugin="Y" introduced="tb92" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnectionplugins/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipconnectionplugins/group/mm-protocols_sipproviders.mrp"/>
-     </component>
-     <component name="sipconnprovider" long-name="SIP Connection Provider" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group/mm-protocols_SIPCPR.mrp"/>
-     </component>
-     <component name="sipdummyprt" long-name="SIP Dummy PRT" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group/mm-protocols_SIPDummyPRT.mrp"/>
-     </component>
-     <component name="sipparams" long-name="SIP Params" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipparams/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipparams/group/mm-protocols_SIPParams.mrp"/>
-     </component>
-     <component name="sipstatemachine" long-name="SIP State Machine" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group/mm-protocols_SipStateMachine.mrp"/>
-     </component>
-     <component name="sipsubconnprovider" long-name="SIP Subconnection Provider" plugin="Y" introduced="9.2" filter="gt">
-      <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group/mm-protocols_SIPSCPR.mrp"/>
-     </component>
-    </collection>
-    <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-     <component name="rtp" long-name="RTP" introduced="9.0">
-      <!-- Real Time Data Protocol -->
-      <unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-     </component>
-     <component name="sipfw" long-name="SIP Framework" introduced="9.2" filter="gt">
-      <unit version="2" bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
-     </component>
-    </collection>
-    <collection name="rtp" long-name="RTP" level="server">
-     <component name="rtpstack" long-name="RTP Stack">
-      <!-- <unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/> -->
-     </component>
-     <component name="srtpstack" long-name="SRTP Stack">
-      <!-- <unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/> -->
-     </component>
-    </collection>
-    <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter">
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/> -->
-     </component>
-     <component name="sippsipadapter" long-name="SIP Adapter">
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/> -->
-     </component>
-     <component name="sippsipsettingsui" long-name="SIP Settings UI">
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/> -->
-     </component>
-     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor">
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/> -->
-     </component>
-     <component name="sippwlanplugin" long-name="SIP WLAN Plugin">
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Wireless Access" level="specific" name="wirelessacc" levels="framework generic ui">
-    <collection name="connectscreen" long-name="Connect Screen" level="ui">
-     <component name="connectscreen compo" long-name="Connect Screen Component">
-      <!-- <unit bldFile="mw/wirelessacc/connectscreen/connectscreen compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
-     <component name="HotSpotServer.exe=binary" long-name="HotSpot Server EXE">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/HotSpotServer.exe=binary/group"/> -->
-     </component>
-     <component name="NetCfgExtnHotSpot.dll=binary" long-name="Net Config Extension HotSpot">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/NetCfgExtnHotSpot.dll=binary/group"/> -->
-     </component>
-     <component name="hotspotclient.dll=binary" long-name="HotSpot Client">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hotspotclient.dll=binary/group"/> -->
-     </component>
-     <component name="hsbrowser" long-name="HotSpot Browser">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
-     </component>
-     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
-     </component>
-     <component name="hsserver" long-name="HotSpot Server">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsserver/group"/> -->
-     </component>
-     <component name="hssmgmtimpl.dll=binary" long-name="HotSpot Management Imlpementation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hssmgmtimpl.dll=binary/group"/> -->
-     </component>
-     <component name="hssscanlist.lib=binary" long-name="HotSpot Scan List">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hssscanlist.lib=binary/group"/> -->
-     </component>
-     <component name="ictsdialogs" long-name="ICTS Dialogs">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
-     </component>
-     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin">
-      <!-- <unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/> -->
-     </component>
-     <component name="wlanplugin" long-name="WLAN Plugin">
-      <!-- <unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/> -->
-     </component>
-     <component name="wlansettingsui" long-name="WLAN Settings UI">
-      <!-- <unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/> -->
-     </component>
-     <component name="wlansniffer" long-name="WLAN Sniffer">
-      <!-- <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/> -->
+      <unit bldFile="mw\netprotocols\wapstack\wapmessageapi\group" mrp="mw\netprotocols\wapstack\wapmessageapi\group\wap-stack_wapmessage.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="VPN Client" level="specific" name="vpnclient" levels="engine ui api">
-    <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-     <component name="vpnapi.dll=binary" long-name="VPN API">
-      <!-- <unit bldFile="mw/vpnclient/vpnapiimpl/vpnapi.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
-     <component name="vpnclient_sis compo" long-name="VPN Client SIS Component">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/vpnclient_sis compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="vpnengine" long-name="VPN Engine" level="engine">
-     <component name="acuagent" long-name="ACU Agent">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/acuagent/group"/> -->
-     </component>
-     <component name="acuagentcrypto" long-name="ACU Agent Crypto">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/acuagentcrypto/group"/> -->
-     </component>
-     <component name="acuagentmessage" long-name="ACU Agent Message">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/acuagentmessage/group"/> -->
-     </component>
-     <component name="acuagenttransport" long-name="ACU Agent Transport">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/acuagenttransport/group"/> -->
-     </component>
-     <component name="acuins" long-name="ACU INS">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/acuins/group"/> -->
-     </component>
-     <component name="acupluginlib" long-name="ACU Plugin Lib">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/acupluginlib/group"/> -->
-     </component>
-     <component name="dmadengine" long-name="DM Adapter Engine">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/> -->
-     </component>
-     <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/> -->
-     </component>
-     <component name="dmadpki" long-name="DM Adapter PKI">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/> -->
-     </component>
-     <component name="eventmediator" long-name="Event Mediator">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/> -->
-     </component>
-     <component name="eventmediatorapi" long-name="Event Mediator API">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/> -->
-     </component>
-     <component name="eventviewer" long-name="Event Viewer">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/> -->
-     </component>
-     <component name="ikecert" long-name="Ike Cert">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/> -->
-     </component>
-     <component name="ikepolparser" long-name="IKE Policy Parser">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/> -->
-     </component>
-     <component name="ikesocketplugin" long-name="IKE Socket Plugin">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/ikesocketplugin/group"/> -->
-     </component>
-     <component name="ikev1lib" long-name="Ikev1 Library">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/> -->
-     </component>
-     <component name="ikev2lib" long-name="Ikev2 Library">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/> -->
-     </component>
-     <component name="ipsecacuplugin" long-name="IPseca Cu Plugin">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/ipsecacuplugin/group"/> -->
-     </component>
-     <component name="kmdapi" long-name="KMD API">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/> -->
-     </component>
-     <component name="kmdserver" long-name="Kmd Server">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/> -->
-     </component>
-     <component name="pkiservice" long-name="PKI Service">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/> -->
-     </component>
-     <component name="pkiserviceapi" long-name="PKI Service API">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/> -->
-     </component>
-     <component name="sit" long-name="Sit">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/sit/group"/> -->
-     </component>
-     <component name="utlbase64" long-name="UTL Base64">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/> -->
-     </component>
-     <component name="utlcrypto" long-name="UTL Crypto">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/> -->
-     </component>
-     <component name="utlpkcs10" long-name="UTL PKCS10">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/> -->
-     </component>
-     <component name="utlpkcs12" long-name="UTL PKCS12">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/> -->
-     </component>
-     <component name="utlxml" long-name="UTL XML">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/> -->
-     </component>
-     <component name="vpnawapi" long-name="VPN AW API">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnawapi/group"/> -->
-     </component>
-     <component name="vpncleaner" long-name="VPN Cleaner">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/> -->
-     </component>
-     <component name="vpnconnagt" long-name="VPN Connagt">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/> -->
-     </component>
-     <component name="vpnextapi" long-name="VPN Ext. API">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnextapi/group"/> -->
-     </component>
-     <component name="vpnins" long-name="VPN Ins">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/> -->
-     </component>
-     <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/> -->
-     </component>
-     <component name="vpnmanager" long-name="VPN Manager">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/> -->
-     </component>
-     <component name="vpnnif" long-name="VPN NIF">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnnif/group"/> -->
-     </component>
-     <component name="vpnpfkey" long-name="VPN Pf Key">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpnpfkey/group"/> -->
-     </component>
-     <component name="vpntcwrapper" long-name="VP NTC Wrapper">
-      <!-- <unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/> -->
+   <block name="ipappprotocols" long-name="IP App Protocols" level="generic" levels="plugin framework conn server">
+    <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
+     <component name="rtp" long-name="RTP" introduced="9.0">
+      <!-- Real Time Data Protocol -->
+      <unit bldFile="mw\ipappprotocols\realtimenetprots\rtp\group" mrp="mw\ipappprotocols\realtimenetprots\rtp\group\mm-protocols_rtp.mrp"/>
+     </component>
+     <component name="sipfw" long-name="SIP Framework" introduced="9.2" filter="gt">
+      <unit version="2" bldFile="mw\ipappprotocols\realtimenetprots\sipfw\Group" mrp="mw\ipappprotocols\realtimenetprots\sipfw\Group\mm-protocols_SIP2_Com.mrp"/>
      </component>
     </collection>
-    <collection name="vpnui" long-name="VPN UI" level="ui">
-     <component name="vpndialogmanager" long-name="VPN Dialog Manager">
-      <!-- <unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/> -->
-     </component>
-     <component name="vpnecomnotifier" long-name="VPN ECOM Notifier">
-      <!-- <unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/> -->
-     </component>
-     <component name="vpnmanagementui" long-name="VPN Management UI">
-      <!-- <unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/> -->
-     </component>
-     <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer">
-      <!-- <unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/> -->
-     </component>
-     <component name="vpnpolins" long-name="VPN Policy Ins">
-      <!-- <unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="IP App Services" level="specific" name="ipappsrv" levels="framework  generic server  conn plugin">
-    <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="specific">
-     <component name="mmccamrpayloadformat" long-name="AMR Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
-     </component>
-     <component name="mmccanypayloadformat" long-name="ANY Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
-     </component>
-     <component name="mmccanysourcesink" long-name="Anysource Sink">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
-     </component>
-     <component name="mmccavcpayloadformat" long-name="AVC Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
-     </component>
-     <component name="mmcccontroller" long-name="MMCC Controller">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
-     </component>
-     <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
-     </component>
-     <component name="mmccfilesourcesink" long-name="MMCC File Source Sink">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
-     </component>
-     <component name="mmccg711payloadformat" long-name="G711 Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
-     </component>
-     <component name="mmccg729payloadformat" long-name="G729 Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
-     </component>
-     <component name="mmcch263payloadformat" long-name="H263 Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
-     </component>
-     <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
-     </component>
-     <component name="mmccinterface" long-name="MMCC Interface">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
-     </component>
-     <component name="mmccjitterbuffer" long-name="Jitter Buffer">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
-     </component>
-     <component name="mmccmultiplexer" long-name="MMCC Multiplexer">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
-     </component>
-     <component name="mmccqoscontroller" long-name="QoS Controller">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
-     </component>
-     <component name="mmccredpayloadformat" long-name="RED Payload Format">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
-     </component>
-     <component name="mmccrtpsourcesink" long-name="RTP Source Sink">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
-     </component>
-     <component name="mmccsubcontroller" long-name="MMCC Subcontroller">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
-     </component>
-     <component name="mmccvideosourcesink" long-name="Video Source Sink">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
-     </component>
-    </collection>
-    <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-     <component name="mmcecli" long-name="MMCE Client">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
-     </component>
-     <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
-     </component>
-     <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
-     </component>
-     <component name="mmcesrv" long-name="MMCE Server">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
-     </component>
-    </collection>
-    <collection name="natfw" long-name="NAT Framework" level="framework">
-     <component name="natfwclient" long-name="NAT Framework Client">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/group"/> -->
-     </component>
-     <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
-     </component>
-     <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
-     </component>
-     <component name="natfwsettings" long-name="NAT Framework Settings">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/group"/> -->
-     </component>
-     <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
-     </component>
-     <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
-     </component>
-     <component name="natfwstunserver" long-name="NAT Framework Stun Server">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/group"/> -->
-     </component>
-     <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
-     </component>
-     <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
-     </component>
-     <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
-     </component>
-    </collection>
-    <collection name="natplugins" long-name="NAT Plugins" level="plugin">
-     <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter">
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/> -->
-     </component>
-     <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter">
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/> -->
-     </component>
-     <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider">
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/> -->
-     </component>
-     <component name="natptraversalcontroller" long-name="NAT Traversal Controller">
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/> -->
+    <collection name="sipconnproviderplugins" long-name="SIP Connection Provider Plugins" level="conn">
+     <component name="sipconnprovider" long-name="SIP Connection Provider" plugin="Y" introduced="9.2" filter="gt">
+      <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipconnprovider\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipconnprovider\group\mm-protocols_SIPCPR.mrp"/>
+     </component>
+     <component name="sipdummyprt" long-name="SIP Dummy PRT" plugin="Y" introduced="9.2" filter="gt">
+      <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipdummyprt\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipdummyprt\group\mm-protocols_SIPDummyPRT.mrp"/>
+     </component>
+     <component name="sipstatemachine" long-name="SIP State Machine" introduced="9.2" filter="gt">
+      <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipstatemachine\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipstatemachine\group\mm-protocols_SipStateMachine.mrp"/>
+     </component>
+     <component name="sipparams" long-name="SIP Params" plugin="Y" introduced="9.2" filter="gt">
+      <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipparams\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipparams\group\mm-protocols_SIPParams.mrp"/>
+     </component>
+     <component name="sipsubconnprovider" long-name="SIP Subconnection Provider" plugin="Y" introduced="9.2" filter="gt">
+      <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group\mm-protocols_SIPSCPR.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Telephony and SIM Services" level="specific" name="phonesrv" levels="plugin framework server generic specific">
-    <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="CbsServer" long-name="CBS Server">
-      <!-- <unit bldFile="mw/phonesrv/cbs/CbsServer/group"/> -->
-     </component>
-     <component name="cbsui" long-name="CBS UI">
-      <!-- <unit bldFile="mw/phonesrv/cbs/cbsui/group"/> -->
-     </component>
-    </collection>
-    <collection name="cellular" long-name="Cellular" level="specific">
-     <component name="PsetNotesUi" long-name="Pset Notes UI">
-      <!-- <unit bldFile="mw/phonesrv/cellular/PsetNotesUi/group"/> -->
-     </component>
-     <component name="SSSettings" long-name="SS Settings">
-      <!-- <unit bldFile="mw/phonesrv/cellular/SSSettings/group"/> -->
-     </component>
-     <component name="ServiceRequest" long-name="Service Request">
-      <!-- <unit bldFile="mw/phonesrv/cellular/ServiceRequest/group"/> -->
-     </component>
-     <component name="telephonysettings" long-name="Telephony Settings">
-      <!-- <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/> -->
-     </component>
-    </collection>
-    <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-     <component name="callprovider" long-name="Call Provider">
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/> -->
-     </component>
-     <component name="cce" long-name="CCE">
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/> -->
-     </component>
-     <component name="cenrepdatabase" long-name="Cenrep Database">
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/> -->
-     </component>
-     <component name="csplugin" long-name="CS Plugin">
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/> -->
-     </component>
-     <component name="serviceselector" long-name="Service Selector">
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/> -->
-     </component>
-     <component name="spsettings" long-name="SP Settings">
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/> -->
-     </component>
-    </collection>
-    <collection name="networkhandling" long-name="Network Handling" level="plugin">
-     <component name="networkhandlingengine" long-name="Network Handling Engine">
-      <!-- <unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/> -->
-     </component>
-    </collection>
-    <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="CallUI" long-name="Call UI">
-      <!-- <unit bldFile="mw/phonesrv/phoneclientserver/CallUI/group"/> -->
-     </component>
-     <component name="EnPolicy" long-name="En Policy">
-      <!-- <unit bldFile="mw/phonesrv/phoneclientserver/EnPolicy/group"/> -->
-     </component>
-     <component name="aiwdialdata" long-name="AIW Dial Data">
-      <!-- <unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/> -->
-     </component>
-     <component name="dialutils" long-name="Dial Utils">
-      <!-- <unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/> -->
-     </component>
-     <component name="phoneclient" long-name="Phone Client">
-      <!-- <unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/> -->
-     </component>
-     <component name="phoneserver" long-name="Phones Erver">
-      <!-- <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-     <component name="phonecmdhnlr" long-name="Phone Command Handler">
-      <!-- <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/> -->
-     </component>
-    </collection>
-    <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="SatServer" long-name="Sat Server">
-      <!-- <unit bldFile="mw/phonesrv/satengine/SatServer/group"/> -->
-     </component>
-    </collection>
-    <collection name="satui" long-name="Sat UI" level="specific">
-     <component name="satapp" long-name="Sat App">
-      <!-- <unit bldFile="mw/phonesrv/satui/satapp/group"/> -->
-     </component>
-     <component name="satplugin" long-name="Sat Plugin">
-      <!-- <unit bldFile="mw/phonesrv/satui/satplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="telutils" long-name="Utilities" level="generic">
-     <component name="phoneparser" long-name="Phone Parser">
-      <!-- <unit bldFile="mw/phonesrv/telutils/phoneparser/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Messaging Middleware" level="specific" name="messagingmw" levels="stack fw api">
+   <block name="messagingmw" long-name="Messaging Middleware" level="specific" levels="stack fw api">
     <collection name="messagingfw" long-name="Messaging FW" level="fw">
-     <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0">
-      <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-     </component>
-     <component name="biowatchers" long-name="BIO Watchers" plugin="Y" introduced="8.0">
-      <unit bldFile="mw/messagingmw/messagingfw/biowatchers/Group" mrp="mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
+     <component name="scheduledsendmtm" long-name="Scheduled Send MTM" plugin="Y" introduced="6.0">
+      <unit bldFile="mw\messagingmw\messagingfw\scheduledsendmtm\group" mrp="mw\messagingmw\messagingfw\scheduledsendmtm\group\messaging_schedulesend.mrp"/>
      </component>
      <component name="msgsrvnstore" long-name="Message Server and Store">
-      <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-     </component>
-     <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0">
-      <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+      <unit bldFile="mw\messagingmw\messagingfw\msgsrvnstore\group" mrp="mw\messagingmw\messagingfw\msgsrvnstore\group\messaging_framework.mrp"/>
+     </component>
+     <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0">
+      <unit bldFile="mw\messagingmw\messagingfw\biomsgfw\group" mrp="mw\messagingmw\messagingfw\biomsgfw\group\messaging_biomsg.mrp"/>
      </component>
      <component name="msgconf" long-name="Messaging Config" introduced="tb91" class="config">
-      <unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+      <unit bldFile="mw\messagingmw\messagingfw\msgconf\group" mrp="mw\messagingmw\messagingfw\msgconf\group\messaging_config.mrp"/>
+     </component>
+     <component name="watcherfw" long-name="Watcher Framework">
+      <unit bldFile="mw\messagingmw\messagingfw\watcherfw\group" mrp="mw\messagingmw\messagingfw\watcherfw\group\messaging_watcher.mrp"/>
      </component>
      <component name="msgtest" long-name="Messaging Test">
       <!-- XML Previous Location: Application Services/Messaging Application Support/ -->
-      <unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-     </component>
-     <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92">
-      <unit mrp="mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
-     </component>
-     <component name="msgtestproduct" long-name="Messaging Test Product">
-      <unit mrp="mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
+      <unit bldFile="mw\messagingmw\messagingfw\msgtest\group" mrp="mw\messagingmw\messagingfw\msgtest\group\messaging_test.mrp"/>
      </component>
      <component name="msgtests" long-name="Messaging Tests">
-      <unit mrp="mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
-     </component>
-     <component name="suplsmshandler" long-name="SUPL SMS Handler" plugin="Y" introduced="tb92">
-      <unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-     </component>
-     <component name="suplwappushhandler" long-name="SUPL WAP Push Handler" plugin="Y" introduced="tb92">
-      <unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-     </component>
-     <component name="scheduledsendmtm" long-name="Scheduled Send MTM" plugin="Y" introduced="6.0">
-      <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+      <unit mrp="mw\messagingmw\messagingfw\msgtests\group\messaging.mrp"/>
+     </component>
+     <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92">
+      <unit mrp="mw\messagingmw\messagingfw\msgtestfw\group\messaging_testframework.mrp"/>
+     </component>
+     <component name="msgtestproduct" long-name="Messaging Test Product">
+      <unit mrp="mw\messagingmw\messagingfw\msgtestproduct\group\messaging_testproduct.mrp"/>
+     </component>
+     <component name="biowatchers" long-name="BIO Watchers" plugin="Y" introduced="8.0">
+      <unit bldFile="mw\messagingmw\messagingfw\biowatchers\Group" mrp="mw\messagingmw\messagingfw\biowatchers\Group\messaging_biomsg_biowatchers_cdma.mrp"/>
      </component>
      <component name="sendas" long-name="Send As">
-      <unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+      <unit bldFile="mw\messagingmw\messagingfw\sendas\group" mrp="mw\messagingmw\messagingfw\sendas\group\messaging_sendas2.mrp"/>
+     </component>
+     <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0">
+      <unit bldFile="mw\messagingmw\messagingfw\msgurlhandler\group" mrp="mw\messagingmw\messagingfw\msgurlhandler\group\messaging_urlhandler.mrp"/>
      </component>
      <component name="wappushfw" long-name="WAP Push Framework" introduced="6.1">
-      <unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-     </component>
-     <component name="watcherfw" long-name="Watcher Framework">
-      <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-     </component>
-     <component name="alwaysonline" long-name="Always Online">
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/> -->
-     </component>
-     <component name="msgcommonutils" long-name="Messaging Common Utils">
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="msgbranched" long-name="Messaging Branched" level="fw">
-     <component name="msgbranched.lib=binary">
-      <!-- <unit bldFile="mw/messagingmw/msgbranched/msgbranched.lib=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Instant Messaging and Presence Services" level="specific" name="imsrv" levels="plugin framework server generic specific">
-    <collection name="brandingserver" long-name="Branding Server" level="specific">
-     <component name="bsclient.dll=binary" long-name="BS Client">
-      <!-- <unit bldFile="mw/imsrv/brandingserver/bsclient.dll=binary/group"/> -->
-     </component>
-     <component name="bsserver.exe=binary" long-name="BS Server">
-      <!-- <unit bldFile="mw/imsrv/brandingserver/bsserver.exe=binary/group"/> -->
-     </component>
-     <component name="tools" long-name="Tools">
-      <!-- <unit bldFile="mw/imsrv/brandingserver/tools/group"/> -->
-     </component>
-    </collection>
-    <collection name="imservices" long-name="IM Services" level="generic">
-     <component name="imfeatureplugin" long-name="IM Feature Plugin">
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/> -->
-     </component>
-     <component name="instantmessagingcache" long-name="Instant Messaging Cache">
-      <!-- <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/> -->
-     </component>
-     <component name="searchfeatureplugin" long-name="Search Feature Plugin">
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/> -->
-     </component>
-     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi">
-      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/> -->
-     </component>
-     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher">
-      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/> -->
-     </component>
-    </collection>
-    <collection name="ximpfw" long-name="XIMP Framework" level="framework">
-     <component name="core" long-name="Core">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/core/group"/> -->
-     </component>
-     <component name="presence" long-name="Presence">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/presence/group"/> -->
+      <unit bldFile="mw\messagingmw\messagingfw\wappushfw\group" mrp="mw\messagingmw\messagingfw\wappushfw\group\wap-browser_wappush.mrp"/>
+     </component>
+     <component name="suplsmshandler" long-name="SUPL SMS Handler" plugin="Y" introduced="tb91">
+      <unit bldFile="mw\messagingmw\messagingfw\suplsmshandler\group" mrp="mw\messagingmw\messagingfw\suplsmshandler\group\lbs_suplsmstrigger.mrp"/>
+     </component>
+     <component name="suplwappushhandler" long-name="SUPL WAP Push Handler" plugin="Y" introduced="tb91">
+      <unit bldFile="mw\messagingmw\messagingfw\suplwappushhandler\group" mrp="mw\messagingmw\messagingfw\suplwappushhandler\group\lbs_suplwappush.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Legacy Presence Services" level="specific" name="legacypresence" levels="engine fw ui">
-    <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-     <component name="msgconnmanager.dll=binary">
-      <!-- <unit bldFile="mw/legacypresence/msgconnmanager/msgconnmanager.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
-     <component name="simpleplugin.dll=binary">
-      <!-- <unit bldFile="mw/legacypresence/presencefwsimpleadpt/simpleplugin.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-     <component name="psuigsplugin.dll=binary">
-      <!-- <unit bldFile="mw/legacypresence/presencesettingsui/psuigsplugin.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
-     <component name="engine" long-name="Engine">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/engine/group"/> -->
-     </component>
-     <component name="presencedm" long-name="Presence DM">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencedm/group"/> -->
-     </component>
-     <component name="presenceprovisioning" long-name="Presence Provisioning">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
-     </component>
-     <component name="presencesettingsapi" long-name="Presence Settings API">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
-     </component>
-     <component name="siputils" long-name="SIP Utils">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/siputils/group"/> -->
-     </component>
-     <component name="xdmrlspres" long-name="XDM Rlspres">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
-     </component>
-     <component name="xmlutils" long-name="XML Utils">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/xmlutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="xdmengine" long-name="XDM Engine" level="engine">
-     <component name="XdmDeviceManagement" long-name="XDM Device Management">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/XdmDeviceManagement/group"/> -->
-     </component>
-     <component name="XdmEngine.dll=binary" long-name="XDM Engine">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/XdmEngine.dll=binary/group"/> -->
-     </component>
-     <component name="XdmProvisioning" long-name="XDM Provisioning">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/XdmProvisioning/group"/> -->
-     </component>
-     <component name="XdmSettingsApi" long-name="XDM Settings Api">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/XdmSettingsApi/group"/> -->
-     </component>
-    </collection>
-    <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-     <component name="LocalProtocol" long-name="Local Protocol">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/LocalProtocol/group"/> -->
-     </component>
-     <component name="XcapProtocol" long-name="Xcap Protocol">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/XcapProtocol/group"/> -->
-     </component>
-     <component name="XdmXmlParser" long-name="XDM XML Parser">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/XdmXmlParser/group"/> -->
-     </component>
-    </collection>
-    <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-     <component name="GSXDMPlugin.dll=binary">
-      <!-- <unit bldFile="mw/legacypresence/xdmsettingsui/GSXDMPlugin.dll=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Open Services" level="specific" name="opensrv" levels="empty 1">
-    <collection name="loudmouth" long-name="Loudmouth" level="1">
-     <component name="loudmouth.DLL=binary">
-      <!-- <unit bldFile="mw/opensrv/loudmouth/loudmouth.DLL=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Remote Management" level="specific" name="remotemgmt" levels="plugin framework server generic specific">
+   <block name="remotemgmt" long-name="Remote Management" level="specific" levels="plugin framework server generic specific">
     <collection name="remotemgmttest" long-name="Remote Management Test" level="specific">
+     <component name="omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" class="test">
+      <unit bldFile="mw\remotemgmt\remotemgmttest\omasyncmlintegrationtest\group" mrp="mw\remotemgmt\remotemgmttest\omasyncmlintegrationtest\group\oma_syncml_integtest.mrp"/>
+     </component>
      <component name="omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" class="test">
-      <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/>
-     </component>
-     <component name="omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" class="test">
-      <unit bldFile="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/>
+      <unit bldFile="mw\remotemgmt\remotemgmttest\omadevicemgmtintegrationtest\group" mrp="mw\remotemgmt\remotemgmttest\omadevicemgmtintegrationtest\group\devprov_integtest.mrp"/>
      </component>
     </collection>
     <collection name="syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
-     <component name="clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/>
-     </component>
-     <component name="devicemgmtfw" long-name="Device Management Framework" introduced="8.0">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/>
+     <component name="omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s">
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmldatasync\Group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmldatasync\Group\oma_syncml_datasync.mrp"/>
      </component>
      <component name="omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/>
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmlcommonfw\Group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmlcommonfw\Group\oma_syncml_common_framework.mrp"/>
+     </component>
+     <component name="omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s">
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmldminterface\group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmldminterface\group\oma_syncml_dm_interface.mrp"/>
      </component>
      <component name="omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/>
-     </component>
-     <component name="omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/>
-     </component>
-     <component name="omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/>
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmlconfig\group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmlconfig\group\oma_syncml_config.mrp"/>
+     </component>
+     <component name="devicemgmtfw" long-name="Device Management Framework" introduced="8.0">
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\devicemgmtfw\group" mrp="mw\remotemgmt\syncandremotemgmtfw\devicemgmtfw\group\devprov_devman_framework.mrp"/>
+     </component>
+     <component name="clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1">
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\clientprovisioningfw\Group" mrp="mw\remotemgmt\syncandremotemgmtfw\clientprovisioningfw\Group\devprov_clientprov_framework.mrp"/>
      </component>
     </collection>
     <collection name="syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
-     <component name="clientprovisioningadaptors" long-name="Client Provisioning Adaptors" plugin="Y" introduced="9.1">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/>
-     </component>
      <component name="datasyncadaptors" long-name="Data Sync Adaptors" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/>
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtservices\datasyncadaptors\group" mrp="mw\remotemgmt\syncandremotemgmtservices\datasyncadaptors\group\data_sync_adaptors.mrp"/>
      </component>
      <component name="devicemgmtadaptors" long-name="Device Management Adaptors" plugin="Y" introduced="9.1">
-      <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/>
-     </component>
-    </collection>
-    <collection name="ahle" long-name="Adaptive History List" level="generic">
-     <component name="ahleclient" long-name="Adaptive History List Client">
-      <!-- <unit bldFile="mw/remotemgmt/ahle/ahleclient/group"/> -->
-     </component>
-     <component name="ahleserver" long-name="Adaptive History List Server">
-      <!-- <unit bldFile="mw/remotemgmt/ahle/ahleserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-     <component name="diagframework" long-name="Diagnostics Framework">
-      <!-- <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/> -->
-     </component>
-     <component name="diagpluginbase" long-name="Diagnostics Plugin Base">
-      <!-- <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/> -->
-     </component>
-     <component name="diagresultsdb" long-name="Diagnostics Results DB">
-      <!-- <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/group"/> -->
-     </component>
-    </collection>
-    <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-     <component name="pnputil">
-      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/> -->
-     </component>
-     <component name="provisioning" long-name="provisioning">
-      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/> -->
-     </component>
-    </collection>
-    <collection name="policymanagement" long-name="Policy Management" level="generic">
-     <component name="tarmpolicymng" long-name="Tarm Policy Mng">
-      <!-- <unit bldFile="mw/remotemgmt/policymanagement/tarmpolicymng/group"/> -->
-     </component>
-    </collection>
-    <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-     <component name="common" long-name="Common">
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/common/group"/> -->
-     </component>
-     <component name="dm" long-name="DM">
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/dm/group"/> -->
-     </component>
-     <component name="ds" long-name="DS">
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/ds/group"/> -->
-     </component>
-    </collection>
-    <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="tarmterminalcontrol" long-name="Tarm Terminal Control">
-      <!-- <unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/group"/> -->
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtservices\devicemgmtadaptors\devman\Group" mrp="mw\remotemgmt\syncandremotemgmtservices\devicemgmtadaptors\devman\Group\devprov_devman_adapters.mrp"/>
+     </component>
+     <component name="clientprovisioningadaptors" long-name="Client Provisioning Adaptors" plugin="Y" introduced="9.1">
+      <unit bldFile="mw\remotemgmt\syncandremotemgmtservices\clientprovisioningadaptors\group" mrp="mw\remotemgmt\syncandremotemgmtservices\clientprovisioningadaptors\group\devprov_clientprov_adapters.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Networking Device Management" level="generic" name="networkingdm" levels="plugin framework server generic specific">
-    <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
-     <component name="accesspointadapter" long-name="Access Point Adapter">
-      <!-- <unit bldFile="mw/networkingdm/clientprovisioning/accesspointadapter/group"/> -->
-     </component>
-     <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter">
-      <!-- <unit bldFile="mw/networkingdm/clientprovisioning/cpdestinationnwadapter/group"/> -->
-     </component>
-    </collection>
-    <collection name="devicemanagement" long-name="Device Management" level="specific">
-     <component name="globalwlansettings" long-name="Global WLAN Settings">
-      <!-- <unit bldFile="mw/networkingdm/devicemanagement/globalwlansettings/group"/> -->
-     </component>
-     <component name="nsmldinternet" long-name="NSMLD Internet">
-      <!-- <unit bldFile="mw/networkingdm/devicemanagement/nsmldinternet/group"/> -->
-     </component>
-     <component name="nsmldmalwaysonadapter" long-name="NSMLDM Always-On Adapter">
-      <!-- <unit bldFile="mw/networkingdm/devicemanagement/nsmldmalwaysonadapter/group"/> -->
-     </component>
-     <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter">
-      <!-- <unit bldFile="mw/networkingdm/devicemanagement/nsmldmbmadapter/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Remote Storage" level="generic" name="remotestorage" levels="framework">
-    <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-     <component name="mountstore" long-name="Mount Store">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/> -->
-     </component>
-     <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/> -->
-     </component>
-     <component name="remotefileengine" long-name="Remote File Engine">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/> -->
-     </component>
-     <component name="mountmanager" long-name="Mount Manager">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/> -->
-     </component>
-     <component name="webdavaccessplugin" long-name="WebDAV Access Plugin">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/> -->
-     </component>
-     <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/> -->
-     </component>
-     <component name="gsplugin" long-name="GS Plugin">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/> -->
-     </component>
-     <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control">
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/remotedriveconfigurationbiocontrol/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Remote Connectivity" level="generic" name="remoteconn" levels="plugin framework server generic specific">
-    <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
-     <component name="chatscripts" long-name="Chat Scripts">
-      <unit bldFile="mw/remoteconn/connectivitypcside/chatscripts/group" mrp="mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
-     </component>
-     <component name="connectqi" long-name="ConnectQI" introduced="9.1" class="PC">
-      <unit mrp="mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
-     </component>
-     <component name="connectqisdk" long-name="ConnectQI SDK" introduced="9.1" class="PC">
-      <unit mrp="mw/remoteconn/connectivitypcside/connectqisdk/connectqisdk_public.mrp"/>
-     </component>
-    </collection>
+   <block name="remoteconn" long-name="Remote Connectivity" level="generic" levels="plugin framework server generic specific">
     <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
-     <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0">
-      <unit bldFile="mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
+     <component name="mrouter" long-name="m-Router" filter="gt">
+      <unit bldFile="mw\remoteconn\connectivitytransports\mrouter\group" mrp="mw\remoteconn\connectivitytransports\mrouter\group\connectivity_mRouterSecure.mrp"/>
      </component>
      <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0">
-      <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp/connectivity_legacy_plp_plpgrp.mrp"/>
+      <unit bldFile="mw\remoteconn\connectivitytransports\plpremotelink\plpgrp" mrp="mw\remoteconn\connectivitytransports\plpremotelink\plpgrp\connectivity_legacy_plp_plpgrp.mrp"/>
      </component>
      <component name="plpvariant" long-name="PLP Variant" deprecated="9.0">
-      <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant/connectivity_legacy_plp_plpvariant.mrp"/>
-     </component>
-     <component name="mrouter" long-name="m-Router" filter="gt">
-      <unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-     <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" plugin="Y" introduced="tb91">
-      <unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-     </component>
-    </collection>
-    <collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
-     <component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92">
-      <unit bldFile="mw/remoteconn/usbfunctiondrivers/massstoragemgr/group" mrp="mw/remoteconn/usbfunctiondrivers/massstoragemgr/group/connectivity_usbms.mrp"/>
-     </component>
-    </collection>
-    <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-     <component name="backupengine" long-name="Backup Engine" introduced="9.0">
-      <unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-     </component>
-    </collection>
-    <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-     <component name="SeCon" long-name="Se Con">
-      <!-- <unit bldFile="mw/remoteconn/connectivitymodules/SeCon/group"/> -->
-     </component>
-    </collection>
-    <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-     <component name="mtpfw" long-name="MTP Framework" introduced="tb91">
-      <unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
-     </component>
-     <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" class="test">
-      <unit bldFile="mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
+      <unit bldFile="mw\remoteconn\connectivitytransports\plpremotelink\plpvariant" mrp="mw\remoteconn\connectivitytransports\plpremotelink\plpvariant\connectivity_legacy_plp_plpvariant.mrp"/>
+     </component>
+     <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0">
+      <unit bldFile="mw\remoteconn\connectivitytransports\eventbroadcast\group" mrp="mw\remoteconn\connectivitytransports\eventbroadcast\group\connectivity_legacy_brdcst.mrp"/>
      </component>
     </collection>
     <collection name="mtptransports" long-name="MTP Transports" level="plugin">
      <component name="mtpusbtransport" long-name="MTP USB Transport" plugin="Y" introduced="tb91">
-      <unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block long-name="Service Discovery and Usage" level="generic" name="srvdiscovery" levels="plugin framework server generic specific">
-    <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework"/>
-   </block>
-   <block long-name="DLNA Services" level="specific" name="dlnasrv" levels="framework server plugin">
-    <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia" long-name="Home Media">
-      <!-- <unit bldFile="mw/dlnasrv/homemedia/homemedia/group"/> -->
-     </component>
-    </collection>
-    <collection name="homesync" long-name="Home Sync" level="plugin">
-     <component name="contentmanager" long-name="Content Manager">
-      <!-- <unit bldFile="mw/dlnasrv/homesync/contentmanager/group"/> -->
-     </component>
-    </collection>
-    <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
-     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/> -->
-     </component>
-     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/> -->
-     </component>
-     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/> -->
-     </component>
-     <component name="upnpxmlparser" long-name="UPnP XML Parser">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/> -->
+      <unit bldFile="mw\remoteconn\mtptransports\mtpusbtransport\group" mrp="mw\remoteconn\mtptransports\mtpusbtransport\group\mtp_usbsic.mrp"/>
      </component>
     </collection>
-    <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-     <component name="avcontrolframework" long-name="A/V Control Famework">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/> -->
-     </component>
-     <component name="avcpengine" long-name="AVCP Engine">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcpengine/group"/> -->
-     </component>
-     <component name="avcpengineclient" long-name="Avcp Engine Client">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcpengineclient/group"/> -->
-     </component>
-     <component name="upnpaccessplugin" long-name="UPnP Access Plugin">
-      <!-- <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/upnpaccessplugin/group"/> -->
+    <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
+     <component name="mtpfw" long-name="MTP Framework" introduced="tb91">
+      <unit bldFile="mw\remoteconn\mtpfws\mtpfw\group" mrp="mw\remoteconn\mtpfws\mtpfw\group\mtp_framework.mrp"/>
+     </component>
+     <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" class="test">
+      <unit bldFile="mw\remoteconn\mtpfws\mtpintegrationtest\group" mrp="mw\remoteconn\mtpfws\mtpintegrationtest\group\mtp_test.mrp"/>
      </component>
     </collection>
-    <collection name="upnpframework" long-name="UPnP Framework" level="framework">
-     <component name="upnpaiwengine" long-name="UPnP AIW Engine">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/> -->
-     </component>
-     <component name="upnpaiwprovider" long-name="UPnP AIW Provider">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/> -->
-     </component>
-     <component name="upnpbrowse" long-name="UPnP Browse">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpbrowse/group"/> -->
-     </component>
-     <component name="upnpcommand" long-name="UPnP Command">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/> -->
-     </component>
-     <component name="upnpcommonui" long-name="UPnP Common UI">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/> -->
-     </component>
-     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/> -->
-     </component>
-     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/> -->
-     </component>
-     <component name="upnpmusicadapter" long-name="UPnP Musicadapter">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/> -->
-     </component>
-     <component name="upnputilities" long-name="UPnP Utilities">
-      <!-- <unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/> -->
+    <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
+     <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" plugin="Y" introduced="tb91">
+      <unit bldFile="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group" mrp="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group\mtp_filedp.mrp"/>
+     </component>
+    </collection>
+    <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
+     <component name="backupengine" long-name="Backup Engine" introduced="9.0">
+      <unit bldFile="mw\remoteconn\backupandrestore\backupengine\group" mrp="mw\remoteconn\backupandrestore\backupengine\group\connectivity_backupengine.mrp"/>
      </component>
     </collection>
-    <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
-     <component name="cdssync" long-name="CDS Sync">
-      <!-- <unit bldFile="mw/dlnasrv/upnpharvester/cdssync/group"/> -->
-     </component>
-     <component name="common">
-      <!-- <unit bldFile="mw/dlnasrv/upnpharvester/common/group"/> -->
-     </component>
-     <component name="mdhserver" long-name="MDH Server">
-      <!-- <unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-     <component name="avobjects" long-name="A/V Objects">
-      <!-- <unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/> -->
-     </component>
-     <component name="connectionmanagerservice" long-name="Connection Manager Service">
-      <!-- <unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/> -->
-     </component>
-     <component name="contentdirectoryservice" long-name="Content Directory Service">
-      <!-- <unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/> -->
-     </component>
-     <component name="mediaserverclient" long-name="Media Server Client">
-      <!-- <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/> -->
-     </component>
-     <component name="mediaserverengine" long-name="Media Server Engine">
-      <!-- <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/> -->
-     </component>
-    </collection>
-    <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins">
-      <!-- <unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/> -->
+    <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
+     <component name="chatscripts" long-name="Chat Scripts">
+      <unit bldFile="mw\remoteconn\connectivitypcside\chatscripts\group" mrp="mw\remoteconn\connectivitypcside\chatscripts\group\testtools_chatscripts.mrp"/>
+     </component>
+     <component name="connectqi" long-name="ConnectQI" introduced="9.1" class="PC">
+      <unit mrp="mw\remoteconn\connectivitypcside\connectqi\connectqisdk_mr3.mrp"/>
+     </component>
+     <component name="connectqisdk" long-name="ConnectQI SDK" introduced="9.1" class="PC">
+      <unit mrp="mw\remoteconn\connectivitypcside\connectqisdk\connectqisdk_public.mrp"/>
      </component>
     </collection>
-    <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-     <component name="appwizard" long-name="App Wizard">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/> -->
-     </component>
-     <component name="multiselectionui" long-name="Multi-Selection UI">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/> -->
-     </component>
-     <component name="upnpgsplugin" long-name="UPnP GS Plugin">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/> -->
-     </component>
-     <component name="upnpsettingsengine" long-name="UPnP Settings Engine">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/> -->
-     </component>
-     <component name="upnpsharingui" long-name="UPnP Sharing UI">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/> -->
+    <collection name="connectivitytest" long-name="Connectivity Tests" level="utils">
+     <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91">
+      <unit bldFile="app\techview\connectivityapps\connectivityfw\group" mrp="app\techview\connectivityapps\connectivityfw\group\connectivity_framework.mrp"/>
+     </component>
+     <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91">
+      <unit bldFile="app\techview\connectivityapps\connectivityservices\group" mrp="app\techview\connectivityapps\connectivityservices\group\connectivity_services.mrp"/>
+     </component>
+    </collection>    
+   </block>
+   <block name="shortlinkconn" long-name="Shortlink Connectivity" level="generic" levels="framework server generic specific plugin">
+    <collection name="obex" long-name="OBEX" level="generic">
+     <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1">
+      <unit bldFile="mw\shortlinkconn\obex\obexprotocol\group" mrp="mw\shortlinkconn\obex\obexprotocol\group\obex.mrp"/>
+     </component>
+     <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2">
+      <unit bldFile="mw\shortlinkconn\obex\obexextensionapi\group" mrp="mw\shortlinkconn\obex\obexextensionapi\group\obex_extensionapis.mrp"/>
      </component>
     </collection>
-    <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-     <component name="applicationengine" long-name="Application Engine">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/> -->
-     </component>
-     <component name="upnpcontentserver" long-name="UPnP Content Server">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/> -->
-     </component>
-     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/> -->
-     </component>
-     <component name="upnpsecurity" long-name="UPnP Security">
-      <!-- <unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/> -->
-     </component>
-    </collection>
-    <collection name="upnpstack" long-name="UPnP Stack" level="framework">
-     <component name="controlpointbase" long-name="Control Point Base">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/controlpointbase/group"/> -->
-     </component>
-     <component name="dlnawebserver" long-name="DLNA Web Server">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/dlnawebserver/group"/> -->
-     </component>
-     <component name="messagehandler" long-name="Message Handler">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/messagehandler/group"/> -->
-     </component>
-     <component name="serviceframework" long-name="Service Framework">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/serviceframework/group"/> -->
-     </component>
-     <component name="ssdpserver" long-name="SSDP Server">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/ssdpserver/group"/> -->
-     </component>
-     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/> -->
-     </component>
-     <component name="upnpconnmanager" long-name="UPnP Connection Manager">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/upnpconnmanager/group"/> -->
-     </component>
-     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/upnphttptransfer/group"/> -->
-     </component>
-     <component name="upnputils" long-name="UPnP Utils">
-      <!-- <unit bldFile="mw/dlnasrv/upnpstack/upnputils/group"/> -->
+    <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
+     <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1">
+      <unit bldFile="mw\shortlinkconn\bluetoothappprofiles\avrcp" mrp="mw\shortlinkconn\bluetoothappprofiles\avrcp\bluetooth_avrcp.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Shortlink Connectivity" level="generic" name="shortlinkconn" levels="framework server generic specific plugin">
-    <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-     <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1">
-      <unit bldFile="mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-     </component>
-    </collection>
-    <collection name="obex" long-name="OBEX" level="generic">
-     <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2">
-      <unit bldFile="mw/shortlinkconn/obex/obexextensionapi/group" mrp="mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-     </component>
-     <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1">
-      <unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-     <component name="btaudioman" long-name="Bluetooth Audio Man">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudioman/group"/> -->
-     </component>
-     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/> -->
-     </component>
-     <component name="bteng" long-name="Bluetooth Engine">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/bteng/group"/> -->
-     </component>
-     <component name="bthid" long-name="BTHID">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/group"/> -->
-     </component>
-     <component name="btmac" long-name="Bluetooth Mac">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btmac/group"/> -->
-     </component>
-     <component name="btnotif" long-name="Bluetooth Notifier">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/group"/> -->
-     </component>
-     <component name="btpbap" long-name="Bluetooth PBAP">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btpbap/group"/> -->
-     </component>
-     <component name="btsac" long-name="Bluetooth SAC">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btsac/group"/> -->
-     </component>
-     <component name="btsap" long-name="Bluetooth SAP">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btsap/group"/> -->
-     </component>
-     <component name="btui" long-name="Bluetooth UI">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/group"/> -->
-     </component>
-    </collection>
-    <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-     <component name="atext" long-name="Atext">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/atext/group"/> -->
-     </component>
-     <component name="dun" long-name="Dun">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/> -->
-     </component>
-     <component name="generichid" long-name="Generic HID">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/> -->
-     </component>
-     <component name="irapp" long-name="Irapp">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/irapp/group"/> -->
-     </component>
-     <component name="lcstylustap" long-name="LC Stylus Tap">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/> -->
-     </component>
-     <component name="locod" long-name="Locod">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/> -->
-     </component>
-     <component name="obexreceiveservices" long-name="OBEX Receive Services">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/> -->
-     </component>
-     <component name="obexsendservices" long-name="Obex Send Services">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/> -->
-     </component>
-     <component name="obexserviceman" long-name="Obex Service Man">
-      <!-- <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/> -->
-     </component>
-    </collection>
-    <collection name="usbclasses" long-name="USB classes" level="framework">
-     <component name="pictbridgeengine" long-name="Pictbridge Engine">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/pictbridgeengine/group"/> -->
-     </component>
-     <component name="ptpserver" long-name="Ptp Server">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/group"/> -->
-     </component>
-     <component name="ptpstack" long-name="Ptp Stack">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpstack/group"/> -->
-     </component>
-     <component name="sicdusbplugin" long-name="Sicd USB Plugin">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/sicdusbplugin/group"/> -->
-     </component>
-     <component name="usbbasicpersonality" long-name="USB Basic Personality">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/> -->
-     </component>
-     <component name="usbmscpersonality" long-name="USB Msc Personality">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbmscpersonality/group"/> -->
-     </component>
-     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/> -->
-     </component>
-     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler">
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbosdescriptorhandler/group"/> -->
-     </component>
-    </collection>
-    <collection name="usbengines" long-name="USB Engines" level="generic">
-     <component name="usbdevcon" long-name="USB Devcon">
-      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usbdevcon/group"/> -->
-     </component>
-     <component name="usblocodplugin" long-name="USB Locod Plugin">
-      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/group"/> -->
-     </component>
-     <component name="usbremotepersonality" long-name="USB Remote Personality">
-      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usbremotepersonality/group"/> -->
-     </component>
-     <component name="usbwatcher" long-name="USB Watcher">
-      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usbwatcher/group"/> -->
-     </component>
-    </collection>
-    <collection name="usbuis" long-name="USB UIs" level="specific">
-     <component name="imageprintui" long-name="Image Print UI">
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/> -->
-     </component>
-     <component name="imageprintuiprovider" long-name="Image Print UI Provider">
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/> -->
-     </component>
-     <component name="usbui" long-name="USB UI">
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbui/group"/> -->
-     </component>
-     <component name="usbuinotif" long-name="USB UI Notif">
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Image Handling" level="specific" name="imghandling" levels="plugin framework server generic specific">
-    <collection name="3gplibrary" long-name="3GP Library" level="server">
-     <component name="3gpmp4lib" long-name="3GP MP4 Library">
-      <!-- <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/group"/> -->
-     </component>
-    </collection>
-    <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="IHL.dll=binary" long-name="IHL">
-      <!-- <unit bldFile="mw/imghandling/imagehandlinglib/IHL.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
-     <component name="imageinfopopup" long-name="Image Info Popup">
-      <!-- <unit bldFile="mw/imghandling/imagehandlingutilities/imageinfopopup/group"/> -->
-     </component>
-     <component name="imagepreview" long-name="Image Preview">
-      <!-- <unit bldFile="mw/imghandling/imagehandlingutilities/imagepreview/group"/> -->
-     </component>
-     <component name="thumbnailmanager" long-name="Thumbnail Manager">
-      <!-- <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/> -->
-     </component>
-     <component name="tvoutengine" long-name="TV Out Engine">
-      <!-- <unit bldFile="mw/imghandling/imagehandlingutilities/tvoutengine/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Legacy Metadata Services" level="specific" name="metadatasrv" levels="plugin framework server generic specific">
-    <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
-     <component name="CLFCollectionManagerImpl.dll=binary">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/CLFCollectionManagerImpl.dll=binary/group"/> -->
-     </component>
-     <component name="CLFDefaultSource.dll=binary">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/CLFDefaultSource.dll=binary/group"/> -->
-     </component>
-     <component name="CLFMetaDataManager.dll=binary">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/CLFMetaDataManager.dll=binary/group"/> -->
-     </component>
-     <component name="CLFMimeTypeManager.dll=binary">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/CLFMimeTypeManager.dll=binary/group"/> -->
-     </component>
-     <component name="CLFUtils.dll=binary" long-name="CLF Utils">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/CLFUtils.dll=binary/group"/> -->
-     </component>
-     <component name="ContentListingFramework.dll=binary" long-name="Content Listing Framework DLL">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/ContentListingFramework.dll=binary/group"/> -->
-     </component>
-     <component name="ContentListingServer.exe=binary">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/ContentListingServer.exe=binary/group"/> -->
-     </component>
-     <component name="MediaCollectionManager.dll=binary" long-name="Media Collection Manager DLL">
-      <!-- <unit bldFile="mw/metadatasrv/contentlistingframework/MediaCollectionManager.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
-     <component name="mediastylegrid" long-name="Media Style Grid">
-      <!-- <unit bldFile="mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/> -->
-     </component>
-    </collection>
-    <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
-     <component name="mediafetch" long-name="Media Fetch">
-      <!-- <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Metadata Services" level="specific" name="mds" levels="mgr eng int">
-    <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
-     <component name="ContentListingFramework.dll=binary">
-      <!-- <unit bldFile="mw/mds/clfwrapper/ContentListingFramework.dll=binary/group"/> -->
-     </component>
-     <component name="MediaCollectionManager.dll=binary">
-      <!-- <unit bldFile="mw/mds/clfwrapper/MediaCollectionManager.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="contextengine" long-name="Context Engine" level="eng">
-     <component name="contextengine.dll=binary">
-      <!-- <unit bldFile="mw/mds/contextengine/contextengine.dll=binary/group"/> -->
-     </component>
-     <component name="plugins" long-name="Plugins">
-      <!-- <unit bldFile="mw/mds/contextengine/plugins/group"/> -->
-     </component>
-    </collection>
-    <collection name="harvester" long-name="Harvester" level="eng">
-     <component name="blacklistclient" long-name="Blacklist Client">
-      <!-- <unit bldFile="mw/mds/harvester/blacklistclient/group"/> -->
-     </component>
-     <component name="blacklistserver" long-name="Blacklist Server">
-      <!-- <unit bldFile="mw/mds/harvester/blacklistserver/group"/> -->
-     </component>
-     <component name="client" long-name="Client">
-      <!-- <unit bldFile="mw/mds/harvester/client/group"/> -->
-     </component>
-     <component name="common">
-      <!-- <unit bldFile="mw/mds/harvester/common/group"/> -->
-     </component>
-     <component name="composerplugins" long-name="Composer Plugins">
-      <!-- <unit bldFile="mw/mds/harvester/composerplugins/group"/> -->
-     </component>
-     <component name="harvesterplugins" long-name="Harvester Plugins">
-      <!-- <unit bldFile="mw/mds/harvester/harvesterplugins/group"/> -->
-     </component>
-     <component name="monitorplugins" long-name="Monitor Plugins">
-      <!-- <unit bldFile="mw/mds/harvester/monitorplugins/group"/> -->
-     </component>
-     <component name="server" long-name="Server">
-      <!-- <unit bldFile="mw/mds/harvester/server/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationmanager" long-name="Location Manager" level="mgr">
-     <component name="client">
-      <!-- <unit bldFile="mw/mds/locationmanager/client/group"/> -->
-     </component>
-     <component name="locationtrail" long-name="Location Trail">
-      <!-- <unit bldFile="mw/mds/locationmanager/locationtrail/group"/> -->
-     </component>
-     <component name="server">
-      <!-- <unit bldFile="mw/mds/locationmanager/server/group"/> -->
-     </component>
-    </collection>
-    <collection name="metadataengine" long-name="Metadata Engine" level="eng">
-     <component name="client">
-      <!-- <unit bldFile="mw/mds/metadataengine/client/group"/> -->
-     </component>
-     <component name="common">
-      <!-- <unit bldFile="mw/mds/metadataengine/common/group"/> -->
-     </component>
-     <component name="server">
-      <!-- <unit bldFile="mw/mds/metadataengine/server/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Multimedia UI Framework" level="specific" name="mmuifw" levels="mgr mdl util ui">
-    <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
-     <component name="alfwidgetutils compo" long-name="ALF Widget Utils Component">
-      <!-- <unit bldFile="mw/mmuifw/alfwidgetutils/alfwidgetutils compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
-     <component name="alfcontainerwidget" long-name="ALF Container Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/> -->
-     </component>
-     <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/> -->
-     </component>
-     <component name="alfviewwidget" long-name="ALF View Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/> -->
-     </component>
-     <component name="common">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/common/group"/> -->
-     </component>
-     <component name="gesturehelper" long-name="Gesture Helper">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/> -->
-     </component>
-     <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/> -->
-     </component>
-     <component name="muldatamodel" long-name="Mul Data Model">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/> -->
-     </component>
-     <component name="mulgridwidget" long-name="Mul Grid Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/mulgridwidget/group"/> -->
-     </component>
-     <component name="mullistwidget" long-name="Mul List Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/mullistwidget/group"/> -->
-     </component>
-     <component name="mullogging" long-name="Mul Logging">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/> -->
-     </component>
-     <component name="mulsliderwidget" long-name="Mul Slider Widget">
-      <!-- <unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/> -->
-     </component>
-    </collection>
-    <collection name="osncore" long-name="OSN Core" level="util">
-     <component name="osncore" long-name="OSN Core">
-      <!-- <unit bldFile="mw/mmuifw/osncore/osncore/group"/> -->
-     </component>
-    </collection>
-    <collection name="resourcepool" long-name="Resource Pool" level="util">
-     <component name="resourcepool compo" long-name="Resource Pool Component">
-      <!-- <unit bldFile="mw/mmuifw/resourcepool/resourcepool compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="widgetmodel" long-name="Widget Model" level="mdl">
-     <component name="alfwidgetfactory" long-name="ALF Widget Factory">
-      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
-     </component>
-     <component name="alfwidgetmodel" long-name="ALF Widget Model">
-      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Video Utils" level="specific" name="videoutils" levels="empty eng util">
-    <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="CommonRecordingEngine" long-name="Common Recording Engine">
-      <!-- <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngine/group"/> -->
-     </component>
-     <component name="CommonRecordingEngineClient" long-name="Common Recording Engine Client">
-      <!-- <unit bldFile="mw/videoutils/dvrengine/CommonRecordingEngineClient/group"/> -->
-     </component>
-    </collection>
-    <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
-     <component name="connutilpsworker" long-name="Conn Util Ps Worker">
-      <!-- <unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/> -->
-     </component>
-     <component name="vcxconnectionutility.dll=binary">
-      <!-- <unit bldFile="mw/videoutils/videoconnutility/vcxconnectionutility.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="SchedulerClient" long-name="Scheduler Client">
-      <!-- <unit bldFile="mw/videoutils/videoscheduler/SchedulerClient/group"/> -->
-     </component>
-     <component name="SchedulerServer" long-name="Scheduler Server">
-      <!-- <unit bldFile="mw/videoutils/videoscheduler/SchedulerServer/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Multimedia Middleware" level="generic" name="mmmw" levels="plugin framework server generic specific">
-    <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
-     <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" class="test">
-      <unit bldFile="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
-     </component>
-     <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" class="test">
-      <unit mrp="mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
-     </component>
-     <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" class="test">
-      <unit mrp="mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
-     </component>
-    </collection>
+   <block name="mmmw" long-name="Multimedia Middleware" level="generic" levels="plugin framework server generic specific">
     <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
      <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\group\multimedia_mmf.mrp"/>
      </component>
      <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmutilitylib/group" mrp="mw/mmmw/mmmiddlewarefws/mmutilitylib/group/multimedia_common.mrp"/>
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmutilitylib\group" mrp="mw\mmmw\mmmiddlewarefws\mmutilitylib\group\multimedia_common.mrp"/>
      </component>
     </collection>
     <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
      <component name="mmfwplugins" long-name="Multimedia Framework Plugins" plugin="Y" introduced="7.0s">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
+      <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\group_plugin" mrp="mw\mmmw\mmmiddlewarefws\mmfw\group_plugin\multimedia_mmf_plugin.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
+     <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" class="test">
+      <unit mrp="mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
+     </component>
+     <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" class="test">
+      <unit mrp="mw\mmmw\mmfwtest\mmfintegrationtest\group\multimedia_inttest_mmf_source.mrp"/>
+     </component>
+     <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" class="test">
+      <unit bldFile="mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group" mrp="mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group\multimedia_mmf_char.mrp"/>
      </component>
     </collection>
     <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-     <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" class="test">
-      <unit mrp="mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
+     <component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" class="test">
+      <unit bldFile="mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group" mrp="mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group\multimedia_mvs_app.mrp"/>
      </component>
      <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91">
-      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
-     </component>
-     <component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" class="test">
-      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
-     </component>
-    </collection>
-    <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
-     <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant">
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/group"/> -->
-     </component>
-     <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin">
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="audioeffectsui" long-name="Audio Effects UI" level="specific">
-     <component name="equalizer" long-name="Equalizer">
-      <!-- <unit bldFile="mw/mmmw/audioeffectsui/equalizer/group"/> -->
-     </component>
-    </collection>
-    <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
-     <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/group"/> -->
-     </component>
-     <component name="callaudiocontrol">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/callaudiocontrol/group"/> -->
-     </component>
-     <component name="configurationcomponentsfactory" long-name="Configuration Components Factory">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/configurationcomponentsfactory/group"/> -->
-     </component>
-     <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/> -->
-     </component>
-     <component name="enhancedmediaclient" long-name="Enhanced Media Client">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/group"/> -->
-     </component>
-     <component name="profilesettingsmonitor" long-name="Profile Settings Monitor">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/profilesettingsmonitor/group"/> -->
-     </component>
-     <component name="progressivedownload" long-name="Progressive Download">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/group"/> -->
-     </component>
-     <component name="voipaudioservices" long-name="VoIP Audio Services">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/group"/> -->
-     </component>
-    </collection>
-    <collection name="drmmmfapitestapp" long-name="DRM MMF API Test App" level="specific">
-     <component name="DRMUtilApp.exe=binary">
-      <!-- <unit bldFile="mw/mmmw/drmmmfapitestapp/DRMUtilApp.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="metadatautility" long-name="Metadata Utility" level="generic">
-     <component name="MetaDataUtility.dll=binary">
-      <!-- <unit bldFile="mw/mmmw/metadatautility/MetaDataUtility.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="mmfw" long-name="Multimedia Framework" level="framework">
-     <component name="gstreamer" long-name="GStreamer">
-      <!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/group"/> -->
-     </component>
-    </collection>
-    <collection name="mtp" long-name="MTP" level="framework">
-     <component name="install" long-name="Install">
-      <!-- <unit bldFile="mw/mmmw/mtp/install/group"/> -->
-     </component>
-     <component name="mtpserver" long-name="Mtp Server">
-      <!-- <unit bldFile="mw/mmmw/mtp/mtpserver/group"/> -->
-     </component>
-     <component name="mtpusbclass" long-name="MTP USB Class">
-      <!-- <unit bldFile="mw/mmmw/mtp/mtpusbclass/group"/> -->
-     </component>
-    </collection>
-    <collection name="radioutility" long-name="Radio Utility" level="generic">
-     <component name="fmpresetutility">
-      <!-- <unit bldFile="mw/mmmw/radioutility/fmpresetutility/group"/> -->
-     </component>
-     <component name="radio_utility" long-name="Radio Utility">
-      <!-- <unit bldFile="mw/mmmw/radioutility/radio_utility/group"/> -->
-     </component>
-     <component name="radioserver" long-name="Radio Server">
-      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
-     <component name="TNEEngine.dll=binary" long-name="TNE Engine">
-      <!-- <unit bldFile="mw/mmmw/thumbnailengine/TNEEngine.dll=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Helix" level="generic" name="helix" levels="plugin framework server generic specific">
-    <collection name="helix_ren" long-name="Helix" level="framework">
-     <component name="helixrfsplugin" long-name="Helix RFS Plugin">
-      <!-- <unit bldFile="mw/helix/helix_ren/helixrfsplugin/group"/> -->
-     </component>
-     <component name="helix_binary" long-name="Helix Binary">
-      <!-- <unit bldFile="mw/helix/helix_ren/helix_binary/group"/> -->
-     </component>
-     <component name="src" long-name="Src">
-      <!-- <unit bldFile="mw/helix/helix_ren/src/group"/> -->
+      <unit bldFile="mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group" mrp="mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group\multimedia_mvs_agents.mrp"/>
+     </component>
+     <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" class="test">
+      <unit mrp="mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Camera Services" level="specific" name="camerasrv" levels="plugin fw api">
-    <collection name="camappengine" long-name="Camera App Engine" level="fw">
-     <component name="Engine">
-      <!-- <unit bldFile="mw/camerasrv/camappengine/Engine/group"/> -->
-     </component>
-     <component name="StillConverter" long-name="Still Converter">
-      <!-- <unit bldFile="mw/camerasrv/camappengine/StillConverter/group"/> -->
-     </component>
-     <component name="asynchfilesavequeue" long-name="Asynch File Save Queue">
-      <!-- <unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/> -->
-     </component>
-    </collection>
-    <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-     <component name="controller" long-name="Controller">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/controller/group"/> -->
-     </component>
-     <component name="filecomposer" long-name="File Composer">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/filecomposer/group"/> -->
-     </component>
-     <component name="mediarecorder" long-name="Media Recorder">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/mediarecorder/group"/> -->
-     </component>
-    </collection>
-    <collection name="configmanagers" long-name="Config Managers" level="api">
-     <component name="imagingconfigmanager" long-name="Imaging Config Manager">
-      <!-- <unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Multimedia App Framework" level="specific" name="mmappfw" levels="empty fw utils">
-    <collection name="mmappcomponents" long-name="MM App Components" level="utils">
-     <component name="asxparser" long-name="ASX Parser">
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/> -->
-     </component>
-     <component name="collectionhelper" long-name="Collection Helper">
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/> -->
-     </component>
-     <component name="harvester" long-name="Harvester">
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/> -->
-     </component>
-     <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine">
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/> -->
-     </component>
-     <component name="mmappcommonui" long-name="MM App Common UI">
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/> -->
-     </component>
-     <component name="playlistengine" long-name="Playlist Engine">
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/> -->
-     </component>
-    </collection>
-    <collection name="mpx" long-name="MPX" level="fw">
-     <component name="collectionframework" long-name="Collection Framework">
-      <!-- <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/> -->
-     </component>
-     <component name="commonframework" long-name="Common Framework">
-      <!-- <unit bldFile="mw/mmappfw/mpx/commonframework/group"/> -->
-     </component>
-     <component name="playbackframework" long-name="Playback Framework">
-      <!-- <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/> -->
-     </component>
-     <component name="viewframework" long-name="View Framework">
-      <!-- <unit bldFile="mw/mmappfw/mpx/viewframework/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Input Methods" level="generic" name="inputmethods" levels="plugin engine framework">
+   <block name="inputmethods" long-name="Input Methods" level="generic" levels="plugin engine framework">
     <collection name="fep" long-name="FEP" level="engine">
      <component name="frontendprocessor" long-name="Front End Processor">
-      <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-     </component>
-     <component name="aknfep" long-name="AKN FEP">
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/group"/> -->
-     </component>
-    </collection>
-    <collection name="textinput" long-name="Text Input" level="framework">
-     <component name="AknInputLanguage" long-name="Akn Input Language">
-      <!-- <unit bldFile="mw/inputmethods/textinput/AknInputLanguage/group"/> -->
-     </component>
-     <component name="GSLangPlugin.dll=binary" long-name="GS Lang Plugin">
-      <!-- <unit bldFile="mw/inputmethods/textinput/GSLangPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="Matsutake" long-name="Matsutake">
-      <!-- <unit bldFile="mw/inputmethods/textinput/Matsutake/group"/> -->
-     </component>
-     <component name="PtiAtokCore" long-name="PTI Atok Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/PtiAtokCore/group"/> -->
-     </component>
-     <component name="PtiDecumaJpCore" long-name="PTI Decuma JpCore">
-      <!-- <unit bldFile="mw/inputmethods/textinput/PtiDecumaJpCore/group"/> -->
-     </component>
-     <component name="PtiEngine" long-name="PTI Engine">
-      <!-- <unit bldFile="mw/inputmethods/textinput/PtiEngine/group"/> -->
-     </component>
-     <component name="PtiT9Core" long-name="PTI T9 Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/PtiT9Core/group"/> -->
-     </component>
-     <component name="ocrsrv" long-name="OCR Srv">
-      <!-- <unit bldFile="mw/inputmethods/textinput/ocrsrv/group"/> -->
-     </component>
-     <component name="peninputarc" long-name="Pen Input Arc">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/group"/> -->
-     </component>
-     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/> -->
-     </component>
-     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/> -->
-     </component>
-     <component name="peninputcommonlayout" long-name="Pen Input Common Layout">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/> -->
-     </component>
-     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/> -->
-     </component>
-     <component name="peninputgenericitut" long-name="Pen Input Generici Tut">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/> -->
-     </component>
-     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/> -->
-     </component>
-     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/> -->
-     </component>
-     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/> -->
-     </component>
-     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/> -->
-     </component>
-     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/> -->
-     </component>
-     <component name="peninputvkbcn" long-name="Pen Input Vkbcn">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/> -->
-     </component>
-     <component name="peninputvkbjp" long-name="Pen Input Vkbjp">
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/> -->
-     </component>
-     <component name="pticpicore" long-name="PTI CPI Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/pticpicore/group"/> -->
-     </component>
-     <component name="ptidecumacore" long-name="Pti Decuma Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/ptidecumacore/group"/> -->
-     </component>
-     <component name="ptienginev2" long-name="PTI Engine V2">
-      <!-- <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/> -->
-     </component>
-     <component name="ptiindicphoneticcore" long-name="PTI Indic Phone Tic Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/ptiindicphoneticcore/group"/> -->
-     </component>
-     <component name="ptivocore" long-name="PTI VO Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/ptivocore/group"/> -->
-     </component>
-     <component name="ptixt9core" long-name="PTI XT9 Core">
-      <!-- <unit bldFile="mw/inputmethods/textinput/ptixt9core/group"/> -->
+      <unit bldFile="mw\inputmethods\fep\frontendprocessor\group" mrp="mw\inputmethods\fep\frontendprocessor\group\app-framework_fepbase.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Classic UI" level="generic" name="classicui" levels="base support server generic specific">
+   <block name="classicui" long-name="Classic UI" level="generic" levels="base support server generic specific">
     <collection name="commonuisupport" long-name="Common UI Support" level="support">
+     <component name="uikon" long-name="Uikon" introduced="6.0">
+      <unit bldFile="mw\classicui\commonuisupport\uikon\group" mrp="mw\classicui\commonuisupport\uikon\group\app-framework_uikon.mrp"/>
+     </component>
      <component name="errorresolverdata" long-name="Error Resolver Data">
-      <unit bldFile="mw/classicui/commonuisupport/errorresolverdata/group" mrp="mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+      <unit bldFile="mw\classicui\commonuisupport\errorresolverdata\group" mrp="mw\classicui\commonuisupport\errorresolverdata\group\app-framework_errorresgt.mrp"/>
+     </component>
+     <component name="uilaf" long-name="UI Look and Feel" introduced="6.0">
+      <unit bldFile="mw\classicui\commonuisupport\uilaf\GROUP" mrp="mw\classicui\commonuisupport\uilaf\GROUP\app-framework_uiklafgt.mrp"/>
      </component>
      <component name="grid" long-name="Grid">
-      <unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+      <unit bldFile="mw\classicui\commonuisupport\grid\group" mrp="mw\classicui\commonuisupport\grid\group\app-framework_grid.mrp"/>
      </component>
      <component name="uifwsdocs" long-name="UI Frameworks Documentation" class="doc">
-      <unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-     </component>
-     <component name="uilaf" long-name="UI Look and Feel" introduced="6.0">
-      <unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-     </component>
-     <component name="uikon" long-name="Uikon" introduced="6.0">
-      <unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+      <unit mrp="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="animation" long-name="Animation" introduced="9.1">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-     </component>
-     <component name="bmpanimation" long-name="BMP Animation" introduced="6.0">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-     </component>
-     <component name="clockanim" long-name="Clock" plugin="Y">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-     </component>
      <component name="cone" long-name="Control Environment">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+      <unit bldFile="mw\classicui\lafagnosticuifoundation\cone\group" mrp="mw\classicui\lafagnosticuifoundation\cone\group\app-framework_cone.mrp"/>
      </component>
      <component name="graphicseffects" long-name="Graphics Effects" introduced="9.2">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+      <unit bldFile="mw\classicui\lafagnosticuifoundation\graphicseffects\group" mrp="mw\classicui\lafagnosticuifoundation\graphicseffects\group\app-framework_gfxtranseffect.mrp"/>
      </component>
      <component name="uigraphicsutils" long-name="UI Graphics Utilities">
-      <unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-     </component>
-    </collection>
-    <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-     <component name="ServiceHandler" long-name="Service Handler">
-      <!-- <unit bldFile="mw/classicui/applicationinterworkingfw/ServiceHandler/group"/> -->
-     </component>
-    </collection>
-    <collection name="commonuis" long-name="Common UIs" level="specific">
-     <component name="CommonDialogs" long-name="Common Dialogs">
-      <!-- <unit bldFile="mw/classicui/commonuis/CommonDialogs/group"/> -->
-     </component>
-     <component name="CommonUi" long-name="Common UI">
-      <!-- <unit bldFile="mw/classicui/commonuis/CommonUi/group"/> -->
-     </component>
-    </collection>
-    <collection name="psln" long-name="Personalization" level="specific">
-     <component name="PslnFramework" long-name="Personalization Framework">
-      <!-- <unit bldFile="mw/classicui/psln/PslnFramework/group"/> -->
-     </component>
-     <component name="PslnFramework.dll=binary">
-      <!-- <unit bldFile="mw/classicui/psln/PslnFramework.dll=binary/group"/> -->
-     </component>
-     <component name="PslnGSPlugin" long-name="Personalizaion GS Plugin">
-      <!-- <unit bldFile="mw/classicui/psln/PslnGSPlugin/group"/> -->
-     </component>
-     <component name="PslnLibraryLoaders" long-name="Personalization Library Loaders">
-      <!-- <unit bldFile="mw/classicui/psln/PslnLibraryLoaders/group"/> -->
-     </component>
-     <component name="psln.exe=binary" long-name="Psln">
-      <!-- <unit bldFile="mw/classicui/psln/psln.exe=binary/group"/> -->
-     </component>
-     <component name="pslnengine" long-name="Personalization Engine">
-      <!-- <unit bldFile="mw/classicui/psln/pslnengine/group"/> -->
-     </component>
-     <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog">
-      <!-- <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/> -->
-     </component>
-    </collection>
-    <collection name="uifw" long-name="UI Framework" level="server">
-     <component name="AknGlobalUI" long-name="Avkon Global UI">
-      <!-- <unit bldFile="mw/classicui/uifw/AknGlobalUI/group"/> -->
-     </component>
-     <component name="AvKon" long-name="AvKon">
-      <!-- <unit bldFile="mw/classicui/uifw/AvKon/group"/> -->
-     </component>
-     <component name="EikStd" long-name="EikStd">
-      <!-- <unit bldFile="mw/classicui/uifw/EikStd/group"/> -->
-     </component>
-     <component name="eikctl" long-name="Eikctl">
-      <!-- <unit bldFile="mw/classicui/uifw/eikctl/group"/> -->
-     </component>
-     <component name="tactilefeedback" long-name="Tactile Feedback">
-      <!-- <unit bldFile="mw/classicui/uifw/tactilefeedback/group"/> -->
-     </component>
-     <component name="uiklaf" long-name="UIKLAF">
-      <!-- <unit bldFile="mw/classicui/uifw/uiklaf/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="SVG Tiny" level="generic" name="svgt" levels="util ui">
-    <collection name="svgtopt" long-name="SVGT Opt" level="util">
-     <component name="SVG">
-      <!-- <unit bldFile="mw/svgt/svgtopt/SVG/group"/> -->
-     </component>
-     <component name="SVGEngineJI" long-name="SVG Engine JI">
-      <!-- <unit bldFile="mw/svgt/svgtopt/SVGEngineJI/group"/> -->
-     </component>
-     <component name="SVGTPlugin" long-name="SVGT Plugin">
-      <!-- <unit bldFile="mw/svgt/svgtopt/SVGTPlugin/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="UI Accelerator" level="generic" name="uiaccelerator" levels="plugin framework server generic specific">
-    <collection name="uiaccelexampleapps" long-name="UI Accelerator Example Apps" level="specific">
-     <component name="alfexanalogdialer" long-name="ALF Ex Analog Dialer">
-      <!-- <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexanalogdialer/group"/> -->
-     </component>
-     <component name="alfexstickers" long-name="ALF Ex Stickers">
-      <!-- <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexstickers/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiacceltk" long-name="UI Accelerator TK" level="framework">
-     <component name="hitchcock" long-name="Hitchcock">
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/> -->
-     </component>
-     <component name="widgeteditors" long-name="Widget Editors">
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/widgeteditors/group"/> -->
+      <unit bldFile="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group" mrp="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group\app-framework_egul.mrp"/>
+     </component>
+     <component name="clockanim" long-name="Clock" plugin="Y">
+      <unit bldFile="mw\classicui\lafagnosticuifoundation\clockanim\group" mrp="mw\classicui\lafagnosticuifoundation\clockanim\group\app-framework_clock.mrp"/>
+     </component>
+     <component name="bmpanimation" long-name="BMP Animation" introduced="6.0">
+      <unit bldFile="mw\classicui\lafagnosticuifoundation\bmpanimation\group" mrp="mw\classicui\lafagnosticuifoundation\bmpanimation\group\app-framework_bmpanim.mrp"/>
+     </component>
+     <component name="animation" long-name="Animation" introduced="9.1">
+      <unit bldFile="mw\classicui\lafagnosticuifoundation\animation\group" mrp="mw\classicui\lafagnosticuifoundation\animation\group\app-framework_animation.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="UI Resources" level="generic" name="uiresources" levels="compile plugin framework server generic specific">
-    <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-     <component name="aknlayoutcompiler compo" long-name="AKN Layout Compiler Component">
-      <!-- <unit bldFile="mw/uiresources/aknlayoutcompiler/aknlayoutcompiler compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-     <component name="cdlcompiler compo" long-name="CDL Compiler Component">
-      <!-- <unit bldFile="mw/uiresources/cdlcompiler/cdlcompiler compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-     <component name="cdlcompilertoolkit compo" long-name="CDL Compiler Toolkit Component">
-      <!-- <unit bldFile="mw/uiresources/cdlcompilertoolkit/cdlcompilertoolkit compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="fontsupport" long-name="Font Support" level="generic">
-     <component name="fontprovider" long-name="Font Provider">
-      <!-- <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/> -->
-     </component>
-     <component name="fontutils" long-name="Font Utils">
-      <!-- <unit bldFile="mw/uiresources/fontsupport/fontutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="layouts" long-name="Layouts" level="plugin">
-     <component name="aknlayout2" long-name="AKN Layout 2">
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/group"/> -->
-     </component>
-     <component name="cdl" long-name="Cdl">
-      <!-- <unit bldFile="mw/uiresources/layouts/cdl/group"/> -->
-     </component>
-    </collection>
-    <collection name="locales" long-name="Locales" level="framework">
-     <component name="locales compo" long-name="Locales Component">
-      <!-- <unit bldFile="mw/uiresources/locales/locales compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="pictographs" long-name="Pictographs" level="specific">
-     <component name="AknPictograph" long-name="AKN Picto Graph">
-      <!-- <unit bldFile="mw/uiresources/pictographs/AknPictograph/group"/> -->
-     </component>
-    </collection>
-    <collection name="skincompiler" long-name="Skin Compiler" level="compile">
-     <component name="AknSkinDescCompiler" long-name="AKN Skin Desc Compiler">
-      <!-- <unit bldFile="mw/uiresources/skincompiler/AknSkinDescCompiler/group"/> -->
-     </component>
-    </collection>
-    <collection name="skins" long-name="Skins" level="specific">
-     <component name="AknSkinContent" long-name="AKN Skin Content">
-      <!-- <unit bldFile="mw/uiresources/skins/AknSkinContent/group"/> -->
-     </component>
-     <component name="AknSkins" long-name="AKN Skins">
-      <!-- <unit bldFile="mw/uiresources/skins/AknSkins/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiconfig" long-name="UI Config" level="server">
-     <component name="s60config" long-name="S60 Config">
-      <!-- <unit bldFile="mw/uiresources/uiconfig/s60config/group"/> -->
-     </component>
-    </collection>
-    <collection name="uigraphics" long-name="UI Graphics" level="generic">
-     <component name="AknIcon" long-name="AKN Icon">
-      <!-- <unit bldFile="mw/uiresources/uigraphics/AknIcon/group"/> -->
-     </component>
-     <component name="Bitmaps2" long-name="Bitmaps 2">
-      <!-- <unit bldFile="mw/uiresources/uigraphics/Bitmaps2/group"/> -->
-     </component>
-     <component name="Icons">
-      <!-- <unit bldFile="mw/uiresources/uigraphics/Icons/group"/> -->
-     </component>
-     <component name="VariatedBitmaps" long-name="Variated Bitmaps">
-      <!-- <unit bldFile="mw/uiresources/uigraphics/VariatedBitmaps/group"/> -->
-     </component>
-     <component name="palette" long-name="Palette">
-      <!-- <unit bldFile="mw/uiresources/uigraphics/palette/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Home Screen Services" level="specific" name="homescreensrv" levels="plugin framework server generic specific">
-    <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
-     <component name="bsengine.exe=binary">
-      <!-- <unit bldFile="mw/homescreensrv/backsteppingsrv/bsengine.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-     <component name="contentharvester" long-name="Content Harvester">
-      <!-- <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/> -->
-     </component>
-     <component name="contentpublishingserver" long-name="Content Publishing Server">
-      <!-- <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/> -->
-     </component>
-     <component name="contentpublishingutils" long-name="Content Publishing Utils">
-      <!-- <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="homescreenpluginsrv" long-name="Homescreen Plugin Service" level="plugin">
-     <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-     </component>
-     <component name="hspsdom" long-name="Homescreen Plugin Server DOM">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdom/group"/> -->
-     </component>
-     <component name="hspsmanager" long-name="Homescreen Plugin Server Manager">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsmanager/group"/> -->
-     </component>
-     <component name="hspsodt" long-name="Homescreen Plugin Server ODT">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsodt/group"/> -->
-     </component>
-     <component name="hspspluginregistry" long-name="Homescreen Plugin Registry">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspspluginregistry/group"/> -->
-     </component>
-     <component name="hspsresource" long-name="Homescreen Plugin Server Resource">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresource/group"/> -->
-     </component>
-     <component name="hspsresult" long-name="Homescreen Plugin Server Result">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresult/group"/> -->
-     </component>
-     <component name="hspstools" long-name="Homescreen Plugin Server Tools">
-      <!-- <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspstools/group"/> -->
-     </component>
-    </collection>
-    <collection name="idlefw" long-name="Idle Framework" level="framework">
-     <component name="aifw.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/aifw.dll=binary/group"/> -->
-     </component>
-     <component name="aiidleint.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/aiidleint.dll=binary/group"/> -->
-     </component>
-     <component name="ailaunch.exe=binary">
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/ailaunch.exe=binary/group"/> -->
-     </component>
-     <component name="aiutils.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/aiutils.dll=binary/group"/> -->
-     </component>
-     <component name="plugins">
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/plugins/group"/> -->
-     </component>
-    </collection>
-    <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-     <component name="mcsextendedmenu.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcsextendedmenu.dll=binary/group"/> -->
-     </component>
-     <component name="mcsmenu.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcsmenu.dll=binary/group"/> -->
-     </component>
-     <component name="mcsmenueng.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcsmenueng.dll=binary/group"/> -->
-     </component>
-     <component name="mcsmenuhandler.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcsmenuhandler.dll=binary/group"/> -->
-     </component>
-     <component name="mcsmenuserver.exe=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcsmenuserver.exe=binary/group"/> -->
-     </component>
-     <component name="mcsmenuutils.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcsmenuutils.dll=binary/group"/> -->
-     </component>
-     <component name="mcssathandler.dll=binary">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/mcssathandler.dll=binary/group"/> -->
-     </component>
-     <component name="menusatinterface" long-name="Menu SAT Interface">
-      <!-- <unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/> -->
-     </component>
-    </collection>
-    <collection name="xcfw" long-name="XCFW" level="framework">
-     <component name="XCFW.dll=binary" long-name="XCFW">
-      <!-- <unit bldFile="mw/homescreensrv/xcfw/XCFW.dll=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Application Installation" level="generic" name="appinstall" levels="framework generic specific api">
+   <block name="appinstall" long-name="Application Installation" level="generic" levels="tool framework generic api">
     <collection name="installationservices" long-name="Installation Services" level="generic">
      <component name="swi" long-name="Secure Software Install">
-      <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+      <unit bldFile="mw\appinstall\installationservices\swi\group" mrp="mw\appinstall\installationservices\swi\group\security_swi.mrp"/>
      </component>
      <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1">
-      <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+      <unit bldFile="mw\appinstall\installationservices\swidevicetools\group" mrp="mw\appinstall\installationservices\swidevicetools\group\security_switools_device.mrp"/>
+     </component>
+     <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0">
+      <!-- PLACEHOLDER="PDEF137052"
+			<unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
+			-->
+     </component>
+     <component name="swiconfig" long-name="Software Install Config" introduced="9.1">
+      <!-- PLACEHOLDER="PDEF137052"
+			<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+			-->
      </component>
     </collection>
     <collection name="secureswitools" long-name="Secure Software Install Tools">
      <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" class="PC">
-      <unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-     </component>
-     <component name="openssllib" long-name="OpenSSL Library" class="PC">
-      <unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+      <unit bldFile="mw\appinstall\secureswitools\makekeys\group" mrp="mw\appinstall\secureswitools\makekeys\group\security_makekeys.mrp"/>
      </component>
      <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" class="PC">
-      <unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+      <unit bldFile="mw\appinstall\secureswitools\swianalysistoolkit\group" mrp="mw\appinstall\secureswitools\swianalysistoolkit\group\security_switools.mrp"/>
      </component>
      <component name="swisistools" long-name="Secure Software Install SIS Tools" class="PC">
-      <unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-     </component>
-    </collection>
-    <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="AppMngr2" long-name="App Mngr2">
-      <!-- <unit bldFile="mw/appinstall/appinstaller/AppMngr2/group"/> -->
-     </component>
-     <component name="AppinstUi" long-name="App Installer UI">
-      <!-- <unit bldFile="mw/appinstall/appinstaller/AppinstUi/group"/> -->
-     </component>
-    </collection>
-    <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="specific">
-     <component name="iaupdateapi_stub.dll=binary">
-      <!-- <unit bldFile="mw/appinstall/iaupdateapi_stub/iaupdateapi_stub.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="ncdengine" long-name="NCD Engine" level="framework">
-     <component name="debuglogger" long-name="Debug Logger">
-      <!-- <unit bldFile="mw/appinstall/ncdengine/debuglogger/group"/> -->
-     </component>
-     <component name="engine">
-      <!-- <unit bldFile="mw/appinstall/ncdengine/engine/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Service API Framework" level="specific" name="serviceapifw" levels="plugin framework server generic specific">
-    <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="servicehandler" long-name="Service Handler">
-      <!-- <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/> -->
-     </component>
-    </collection>
-    <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
-     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client">
-      <!-- <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/> -->
-     </component>
-     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver">
-      <!-- <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/> -->
-     </component>
-     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util">
-      <!-- <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Service API" level="specific" name="serviceapi" levels="os mw1 mw2 app">
-    <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
-     <component name="appmanagerprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_applicationmanager/appmanagerprovider.dll=binary/group"/> -->
-     </component>
-     <component name="appmanagerservice" long-name="App Manager Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_applicationmanager/appmanagerservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
-     <component name="calendarprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_calendar/calendarprovider.dll=binary/group"/> -->
-     </component>
-     <component name="calendarservice" long-name="Calendar Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_calendar/calendarservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
-     <component name="contactprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_contacts_vpbk/contactprovider.dll=binary/group"/> -->
-     </component>
-     <component name="contactservice" long-name="Contact Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_contacts_vpbk/contactservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
-     <component name="landmarkprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_landmarks/landmarkprovider.dll=binary/group"/> -->
-     </component>
-     <component name="landmarksservice" long-name="Landmarks Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_landmarks/landmarksservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_location" long-name="SAPI Location" level="mw2">
-     <component name="locationprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_location/locationprovider.dll=binary/group"/> -->
-     </component>
-     <component name="locationservice" long-name="Location Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_location/locationservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_logging" long-name="SAPI Logging" level="app">
-     <component name="loggingprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_logging/loggingprovider.dll=binary/group"/> -->
-     </component>
-     <component name="loggingservice" long-name="Logging Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_logging/loggingservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
-     <component name="mediamanagementprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_mediamanagement/mediamanagementprovider.dll=binary/group"/> -->
-     </component>
-     <component name="mediamanagementservice" long-name="Media Management Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_mediamanagement/mediamanagementservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
-     <component name="messagingprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_messaging/messagingprovider.dll=binary/group"/> -->
-     </component>
-     <component name="messagingservice" long-name="Messaging Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_messaging/messagingservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
-     <component name="sensorprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_sensor/sensorprovider.dll=binary/group"/> -->
-     </component>
-     <component name="sensorservice" long-name="Sensor Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_sensor/sensorservice/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
-     <component name="sysinfoprovider.dll=binary">
-      <!-- <unit bldFile="mw/serviceapi/sapi_sysinfo/sysinfoprovider.dll=binary/group"/> -->
-     </component>
-     <component name="sysinfoservice" long-name="Sysinfo Service">
-      <!-- <unit bldFile="mw/serviceapi/sapi_sysinfo/sysinfoservice/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Web" level="specific" name="web" levels="plugin framework server generic specific">
-    <collection name="browserutilities" long-name="Browser Utilities" level="generic">
-     <component name="aiwbrowserprovider" long-name="AIW Browser Provider">
-      <!-- <unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/> -->
-     </component>
-     <component name="browserdialogsprovider" long-name="Browser Dialogs Provider">
-      <!-- <unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/> -->
-     </component>
-     <component name="browsertelservice" long-name="Browser Tel Service">
-      <!-- <unit bldFile="mw/web/browserutilities/browsertelservice/group"/> -->
-     </component>
-     <component name="connectionmanager">
-      <!-- <unit bldFile="mw/web/browserutilities/connectionmanager/group"/> -->
-     </component>
-     <component name="cxmllibrary" long-name="CXml Library">
-      <!-- <unit bldFile="mw/web/browserutilities/cxmllibrary/group"/> -->
-     </component>
-     <component name="downloadmgr" long-name="Download Manager">
-      <!-- <unit bldFile="mw/web/browserutilities/downloadmgr/group"/> -->
-     </component>
-     <component name="favouritesengine" long-name="Favourites Engine">
-      <!-- <unit bldFile="mw/web/browserutilities/favouritesengine/group"/> -->
-     </component>
-     <component name="feedsengine" long-name="Feeds Engine">
-      <!-- <unit bldFile="mw/web/browserutilities/feedsengine/group"/> -->
-     </component>
-     <component name="multipartparser" long-name="Multipart Parser">
-      <!-- <unit bldFile="mw/web/browserutilities/multipartparser/group"/> -->
-     </component>
-     <component name="recenturlstore" long-name="Recent URL Store">
-      <!-- <unit bldFile="mw/web/browserutilities/recenturlstore/group"/> -->
-     </component>
-     <component name="schemehandler" long-name="Scheme Handler">
-      <!-- <unit bldFile="mw/web/browserutilities/schemehandler/group"/> -->
-     </component>
-     <component name="webutils" long-name="Web Utils">
-      <!-- <unit bldFile="mw/web/browserutilities/webutils/group"/> -->
-     </component>
-     <component name="xmlparser" long-name="XML Parser">
-      <!-- <unit bldFile="mw/web/browserutilities/xmlparser/group"/> -->
-     </component>
-    </collection>
-    <collection name="codhandler" long-name="COD Handler" level="specific">
-     <component name="coddownload" long-name="COD Download">
-      <!-- <unit bldFile="mw/web/codhandler/coddownload/group"/> -->
-     </component>
-     <component name="codeng" long-name="COD Engine">
-      <!-- <unit bldFile="mw/web/codhandler/codeng/group"/> -->
-     </component>
-     <component name="codrecog" long-name="COD Recogniser">
-      <!-- <unit bldFile="mw/web/codhandler/codrecog/group"/> -->
-     </component>
-     <component name="codui" long-name="COD UI">
-      <!-- <unit bldFile="mw/web/codhandler/codui/group"/> -->
-     </component>
-     <component name="codviewer" long-name="COD Viewer">
-      <!-- <unit bldFile="mw/web/codhandler/codviewer/group"/> -->
-     </component>
-     <component name="ddrecog" long-name="DD Recogniser">
-      <!-- <unit bldFile="mw/web/codhandler/ddrecog/group"/> -->
-     </component>
-     <component name="ddviewer" long-name="DD Viewer">
-      <!-- <unit bldFile="mw/web/codhandler/ddviewer/group"/> -->
-     </component>
-     <component name="roapapp" long-name="ROAP Application">
-      <!-- <unit bldFile="mw/web/codhandler/roapapp/group"/> -->
-     </component>
-    </collection>
-    <collection name="webengine" long-name="Web Engine" level="server">
-     <component name="browserrecognizers" long-name="Browser Recognizers">
-      <!-- <unit bldFile="mw/web/webengine/browserrecognizers/group"/> -->
-     </component>
-     <component name="device" long-name="Device">
-      <!-- <unit bldFile="mw/web/webengine/device/group"/> -->
-     </component>
-     <component name="memoryplugin" long-name="Memory Plugin">
-      <!-- <unit bldFile="mw/web/webengine/memoryplugin/group"/> -->
-     </component>
-     <component name="osswebengine" long-name="OSS Web Engine">
-      <!-- <unit bldFile="mw/web/webengine/osswebengine/group"/> -->
-     </component>
-     <component name="pagescaler" long-name="Page Scaler">
-      <!-- <unit bldFile="mw/web/webengine/pagescaler/group"/> -->
-     </component>
-     <component name="webkitutils" long-name="WebKit Utils">
-      <!-- <unit bldFile="mw/web/webengine/webkitutils/group"/> -->
-     </component>
-     <component name="widgetbackuprestore" long-name="Widget Backup Restore">
-      <!-- <unit bldFile="mw/web/webengine/widgetbackuprestore/group"/> -->
-     </component>
-     <component name="widgetengine" long-name="Widget Engine">
-      <!-- <unit bldFile="mw/web/webengine/widgetengine/group"/> -->
-     </component>
-     <component name="widgetinstaller" long-name="Widget Installer">
-      <!-- <unit bldFile="mw/web/webengine/widgetinstaller/group"/> -->
-     </component>
-     <component name="widgetmemoryplugin" long-name="Widget Memory Plugin">
-      <!-- <unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/> -->
-     </component>
-     <component name="widgetregistry" long-name="Widget Registry">
-      <!-- <unit bldFile="mw/web/webengine/widgetregistry/group"/> -->
-     </component>
-     <component name="wmlengine" long-name="WML Engine">
-      <!-- <unit bldFile="mw/web/webengine/wmlengine/group"/> -->
-     </component>
-    </collection>
-    <collection name="widgets" long-name="Widgets" level="generic">
-     <component name="widgetapp" long-name="Widget App">
-      <!-- <unit bldFile="mw/web/widgets/widgetapp/group"/> -->
-     </component>
-     <component name="widgetinstaller">
-      <!-- <unit bldFile="mw/web/widgets/widgetinstaller/group"/> -->
-     </component>
-     <component name="widgetlauncher" long-name="Widget Launcher">
-      <!-- <unit bldFile="mw/web/widgets/widgetlauncher/group"/> -->
-     </component>
-     <component name="widgetpreInstaller" long-name="Widget Pre Installer">
-      <!-- <unit bldFile="mw/web/widgets/widgetpreInstaller/group"/> -->
-     </component>
-     <component name="widgetrecognizer" long-name="Widget Recognizer">
-      <!-- <unit bldFile="mw/web/widgets/widgetrecognizer/group"/> -->
-     </component>
-     <component name="widgetstartup" long-name="Widget Startup">
-      <!-- <unit bldFile="mw/web/widgets/widgetstartup/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Web Services" level="generic" name="websrv" levels="plugin framework server generic specific">
-    <collection name="webservices" long-name="Web Services" level="generic">
-     <component name="wsnotifierplugins" long-name="WS Notifier Plugins">
-      <!-- <unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/> -->
-     </component>
-     <component name="wslogger" long-name="WS Logger">
-      <!-- <unit bldFile="mw/websrv/webservices/wslogger/group"/> -->
-     </component>
-     <component name="wsxml" long-name="WS XML">
-      <!-- <unit bldFile="mw/websrv/webservices/wsxml/group"/> -->
-     </component>
-     <component name="wsutils" long-name="WS Utils">
-      <!-- <unit bldFile="mw/websrv/webservices/wsutils/group"/> -->
-     </component>
-     <component name="wsfragment" long-name="WS Fragment">
-      <!-- <unit bldFile="mw/websrv/webservices/wsfragment/group"/> -->
-     </component>
-     <component name="wsdescription" long-name="WS Description">
-      <!-- <unit bldFile="mw/websrv/webservices/wsdescription/group"/> -->
-     </component>
-     <component name="wshttpchanneltransportplugin" long-name="WS HTTP Channel Transport Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/> -->
-     </component>
-     <component name="wsconnection" long-name="WS Connection">
-      <!-- <unit bldFile="mw/websrv/webservices/wsconnection/group"/> -->
-     </component>
-     <component name="wshostletconnection" long-name="WS Hostlet Connection">
-      <!-- <unit bldFile="mw/websrv/webservices/wshostletconnection/group"/> -->
-     </component>
-     <component name="wscredentialmanager" long-name="WS Credential Manager">
-      <!-- <unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/> -->
-     </component>
-     <component name="wsmanager" long-name="WS Manager">
-      <!-- <unit bldFile="mw/websrv/webservices/wsmanager/group"/> -->
-     </component>
-     <component name="wsidentitymanager" long-name="WS Identity Manager">
-      <!-- <unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/> -->
-     </component>
-     <component name="wsframework" long-name="WS Framework">
-      <!-- <unit bldFile="mw/websrv/webservices/wsframework/group"/> -->
-     </component>
-     <component name="wsmessages" long-name="WS Messages">
-      <!-- <unit bldFile="mw/websrv/webservices/wsmessages/group"/> -->
-     </component>
-     <component name="wsconnectionagent" long-name="WS Connection Agent">
-      <!-- <unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/> -->
-     </component>
-     <component name="idwsfplugin" long-name="IDWSF Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/idwsfplugin/group"/> -->
-     </component>
-     <component name="wsibasicplugin" long-name="WSI Basic Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/> -->
-     </component>
-     <component name="wsrestplugin" long-name="WS Rest Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/wsrestplugin/group"/> -->
-     </component>
-     <component name="idwsfsecuritymechanism" long-name="IDWSF Security Mechanism">
-      <!-- <unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/> -->
-     </component>
-     <component name="wspasswordtransforms" long-name="WS Password Transforms">
-      <!-- <unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/> -->
-     </component>
-     <component name="wscore" long-name="WS Core">
-      <!-- <unit bldFile="mw/websrv/webservices/wscore/group"/> -->
-     </component>
-     <component name="wsprovider" long-name="WS Provider">
-      <!-- <unit bldFile="mw/websrv/webservices/wsprovider/group"/> -->
-     </component>
-     <component name="wslocaltransportplugin" long-name="WS Local Transport Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/> -->
-     </component>
-     <component name="wshostlettransportplugin" long-name="WS Hostlet Transport Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/> -->
-     </component>
-     <component name="wsstar" long-name="WS Star">
-      <!-- <unit bldFile="mw/websrv/webservices/wsstar/group"/> -->
-     </component>
-     <component name="wsoviplugin" long-name="WS Ovi Plugin">
-      <!-- <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Conn Tools" level="generic" name="conntools" levels="1 2">
-    <collection name="emulatorlan" long-name="Emulator Lan" level="1">
-     <component name="emulatorlan compo" long-name="Emulator LAN Component">
-      <!-- <unit bldFile="mw/conntools/emulatorlan/emulatorlan compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="nettools" long-name="Net Tools" level="2">
-     <component name="conntest" long-name="Connection Test">
-      <!-- <unit bldFile="mw/conntools/nettools/conntest/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Platform Tools" level="generic" name="platformtools">
-    <collection name="gfxconversion" long-name="Graphics Conversion">
-     <component name="bmconv_s60" long-name="Bm Conv S60">
-      <!-- <unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/> -->
-     </component>
-     <component name="mifconv" long-name="Mifconv">
-      <!-- <unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="UI Tools" level="specific" name="uitools" levels="compile encode tool">
-    <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-     <component name="Color">
-      <!-- <unit bldFile="mw/uitools/gfxtools/Color/group"/> -->
-     </component>
-     <component name="gditools" long-name="GDI Tools">
-      <!-- <unit bldFile="mw/uitools/gfxtools/gditools/group"/> -->
-     </component>
-    </collection>
-    <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip.exe=binary">
-      <!-- <unit bldFile="mw/uitools/reszip/reszip.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-     <component name="svgtenc" long-name="SVGT Enc">
-      <!-- <unit bldFile="mw/uitools/svgtencoder/svgtenc/group"/> -->
-     </component>
-    </collection>
-    <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="Arabica">
-      <!-- <unit bldFile="mw/uitools/toollibraries/Arabica/group"/> -->
-     </component>
-     <component name="XercesC" long-name="Xerces C">
-      <!-- <unit bldFile="mw/uitools/toollibraries/XercesC/group"/> -->
+      <unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
+     </component>
+     <component name="openssllib" long-name="OpenSSL Library" class="PC">
+      <unit mrp="mw\appinstall\secureswitools\openssllib\security_openssl.mrp"/>
      </component>
     </collection>
    </block>
   </layer>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block long-name="Location Apps" level="apps" name="location" levels="engine ui apps">
-    <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-     <component name="blid" long-name="Blid">
-      <!-- <unit bldFile="app/location/basiclocationinfodisplay/blid/group"/> -->
-     </component>
-    </collection>
-    <collection name="eventsui" long-name="Events UI" level="ui">
-     <component name="eventseditor" long-name="Events Editor">
-      <!-- <unit bldFile="app/location/eventsui/eventseditor/group"/> -->
-     </component>
-     <component name="eventsengine" long-name="Events Engine">
-      <!-- <unit bldFile="app/location/eventsui/eventsengine/group"/> -->
-     </component>
-     <component name="eventshandlerui" long-name="Events Handler UI">
-      <!-- <unit bldFile="app/location/eventsui/eventshandlerui/group"/> -->
-     </component>
-     <component name="eventsmgmtui" long-name="Events Mgmt UI">
-      <!-- <unit bldFile="app/location/eventsui/eventsmgmtui/group"/> -->
-     </component>
-     <component name="eventsutils" long-name="Events Utils">
-      <!-- <unit bldFile="app/location/eventsui/eventsutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="landmarksui" long-name="Landmarks UI" level="ui">
-     <component name="app" long-name="Application">
-      <!-- <unit bldFile="app/location/landmarksui/app/group"/> -->
-     </component>
-     <component name="commonui" long-name="Common UI">
-      <!-- <unit bldFile="app/location/landmarksui/commonui/group"/> -->
-     </component>
-     <component name="engine">
-      <!-- <unit bldFile="app/location/landmarksui/engine/group"/> -->
-     </component>
-     <component name="msgviewer" long-name="Message Viewer">
-      <!-- <unit bldFile="app/location/landmarksui/msgviewer/group"/> -->
-     </component>
-     <component name="uicontrols" long-name="UI Controls">
-      <!-- <unit bldFile="app/location/landmarksui/uicontrols/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-     <component name="lmrefapp.exe=binary">
-      <!-- <unit bldFile="app/location/locationlandmarksrefappfors60/lmrefapp.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-     <component name="LmUiRefApp.exe=binary">
-      <!-- <unit bldFile="app/location/locationlandmarksuirefapp/LmUiRefApp.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationnokiaprivacyadaptationrefimpl" long-name="Privacy Adaptation Nokia Reference Implementation" level="engine">
-     <component name="privlistref.exe=binary">
-      <!-- <unit bldFile="app/location/locationnokiaprivacyadaptationrefimpl/privlistref.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationrefappfors60" long-name="Location Reference App for S60" level="apps">
-     <component name="LBSReference.exe=binary">
-      <!-- <unit bldFile="app/location/locationrefappfors60/LBSReference.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
-     <component name="SatelliteReference.exe=binary">
-      <!-- <unit bldFile="app/location/locationsatviewrefapp/SatelliteReference.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="locationsimulationpsy10" long-name="Location Simulation PSY10" level="engine">
-     <component name="epossimulationpsy.dll=binary">
-      <!-- <unit bldFile="app/location/locationsimulationpsy10/epossimulationpsy.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="mapnavproviderrefapp" long-name="Map Nav Provider Reference App" level="apps">
-     <component name="MnRefProviderPlugin.dll=binary">
-      <!-- <unit bldFile="app/location/mapnavproviderrefapp/MnRefProviderPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="mnrefprovider.exe=binary">
-      <!-- <unit bldFile="app/location/mapnavproviderrefapp/mnrefprovider.exe=binary/group"/> -->
-     </component>
-     <component name="mnrefproviderback.exe=binary">
-      <!-- <unit bldFile="app/location/mapnavproviderrefapp/mnrefproviderback.exe=binary/group"/> -->
-     </component>
-     <component name="mnrefproviderengine.dll=binary">
-      <!-- <unit bldFile="app/location/mapnavproviderrefapp/mnrefproviderengine.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
-     <component name="simpsyui.exe=binary">
-      <!-- <unit bldFile="app/location/simpsyconfigurator/simpsyui.exe=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Multimedia Sharing UIs" level="services" name="mmsharinguis" levels="base plugin">
-    <collection name="mmsharing" long-name="MM Sharing" level="base">
-     <component name="mmshavailability" long-name="Multimedia Sharing Availability">
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/> -->
-     </component>
-     <component name="mmshengine" long-name="Multimedia Sharing Engine">
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/> -->
-     </component>
-     <component name="mmshindicator" long-name="Multimedia Sharing Indicator">
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/> -->
-     </component>
-     <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client">
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/> -->
-     </component>
-     <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server">
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/> -->
-     </component>
-     <component name="mmshui" long-name="Multimedia Sharing UI">
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/> -->
-     </component>
-    </collection>
-    <collection name="mmshplugins" long-name="MM Sharing Plugins" level="plugin">
-     <component name="mmcctranscoder" long-name="MMCC Transcoder">
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/group"/> -->
-     </component>
-     <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin">
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/> -->
-     </component>
-     <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin">
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/> -->
-     </component>
-     <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin">
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/> -->
-     </component>
-     <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin">
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/> -->
-     </component>
-     <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin">
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Phone Apps" level="apps" span="2" name="phone" levels="engine ui apps">
-    <collection name="phoneapp" long-name="Phone App" level="apps">
-     <component name="Blacklist">
-      <!-- <unit bldFile="app/phone/phoneapp/Blacklist/group"/> -->
-     </component>
-     <component name="phoneui" long-name="Phone UI">
-      <!-- <unit bldFile="app/phone/phoneapp/phoneui/group"/> -->
-     </component>
-     <component name="phoneuicontrol" long-name="Phone UI Control">
-      <!-- <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/> -->
-     </component>
-     <component name="phoneuistates" long-name="Phone UI States">
-      <!-- <unit bldFile="app/phone/phoneapp/phoneuistates/group"/> -->
-     </component>
-     <component name="phoneuiutils" long-name="Phone UI Utils">
-      <!-- <unit bldFile="app/phone/phoneapp/phoneuiutils/group"/> -->
-     </component>
-     <component name="phoneuiview" long-name="Phone UI View">
-      <!-- <unit bldFile="app/phone/phoneapp/phoneuiview/group"/> -->
-     </component>
-     <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension">
-      <!-- <unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/> -->
-     </component>
-     <component name="silenceactionplugin" long-name="Silence Action Plugin">
-      <!-- <unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="phoneengine" long-name="Phone Engine" level="engine">
-     <component name="PhoneCntFinder" long-name="Phone Contact Finder">
-      <!-- <unit bldFile="app/phone/phoneengine/PhoneCntFinder/group"/> -->
-     </component>
-     <component name="audiohandling" long-name="Audio Handling">
-      <!-- <unit bldFile="app/phone/phoneengine/audiohandling/group"/> -->
-     </component>
-     <component name="callhandling" long-name="Call Handling">
-      <!-- <unit bldFile="app/phone/phoneengine/callhandling/group"/> -->
-     </component>
-     <component name="contacthandling" long-name="Contact Handling">
-      <!-- <unit bldFile="app/phone/phoneengine/contacthandling/group"/> -->
-     </component>
-     <component name="loghandling" long-name="Log Handling">
-      <!-- <unit bldFile="app/phone/phoneengine/loghandling/group"/> -->
-     </component>
-     <component name="phonemodel" long-name="Phone Model">
-      <!-- <unit bldFile="app/phone/phoneengine/phonemodel/group"/> -->
-     </component>
-     <component name="servicehandling" long-name="Service Handling">
-      <!-- <unit bldFile="app/phone/phoneengine/servicehandling/group"/> -->
-     </component>
-    </collection>
-    <collection name="phonesettings" long-name="Phone Settings" level="ui">
-     <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin">
-      <!-- <unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/> -->
-     </component>
-     <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin">
-      <!-- <unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="phoneuis" long-name="Phone UIs" level="ui">
-     <component name="BubbleManager" long-name="Bubble Manager">
-      <!-- <unit bldFile="app/phone/phoneuis/BubbleManager/group"/> -->
-     </component>
-     <component name="ConnectUtil" long-name="Connect Util">
-      <!-- <unit bldFile="app/phone/phoneuis/ConnectUtil/group"/> -->
-     </component>
-     <component name="SFIUtils" long-name="SFI Utils">
-      <!-- <unit bldFile="app/phone/phoneuis/SFIUtils/group"/> -->
-     </component>
-     <component name="TelephonyDeviceMode" long-name="Telephony Device Mode">
-      <!-- <unit bldFile="app/phone/phoneuis/TelephonyDeviceMode/group"/> -->
-     </component>
-     <component name="Ussd" long-name="USSD">
-      <!-- <unit bldFile="app/phone/phoneuis/Ussd/group"/> -->
-     </component>
-     <component name="dialer" long-name="Dialer">
-      <!-- <unit bldFile="app/phone/phoneuis/dialer/group"/> -->
-     </component>
-     <component name="vmbx" long-name="Vmbx">
-      <!-- <unit bldFile="app/phone/phoneuis/vmbx/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Video Telephony Apps" level="apps" name="videotelephony" levels="plugin engine ui">
-    <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
-     <component name="PacketVideoEngineBinaries" long-name="Packet Video Engine Binaries">
-      <!-- <unit bldFile="app/videotelephony/packetvideoengine/PacketVideoEngineBinaries/group"/> -->
-     </component>
-    </collection>
-    <collection name="packetvideoplugins" long-name="Packetvideo Plugins" level="plugin">
-     <component name="DisplaySink" long-name="Display Sink">
-      <!-- <unit bldFile="app/videotelephony/packetvideoplugins/DisplaySink/group"/> -->
-     </component>
-     <component name="VideoSource" long-name="Video Source">
-      <!-- <unit bldFile="app/videotelephony/packetvideoplugins/VideoSource/group"/> -->
-     </component>
-    </collection>
-    <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-     <component name="videotelcomms" long-name="Videotel Comms">
-      <!-- <unit bldFile="app/videotelephony/vtengines/videotelcomms/group"/> -->
-     </component>
-     <component name="videoteleng" long-name="Videotel Engine">
-      <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/group"/> -->
-     </component>
-    </collection>
-    <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-     <component name="videotelui" long-name="Video Telephony UI">
-      <!-- <unit bldFile="app/videotelephony/vtuis/videotelui/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="PoC" level="apps" name="poc" levels="engine ui">
-    <collection name="pocengine" long-name="PoC Engine" level="engine">
-     <component name="PoCEngineImplementation.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCEngineImplementation.dll=binary/group"/> -->
-     </component>
-     <component name="PoCEngineResolver.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCEngineResolver.dll=binary/group"/> -->
-     </component>
-     <component name="PoCOmaCommon.DLL=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaCommon.DLL=binary/group"/> -->
-     </component>
-     <component name="PoCOmaDeviceManagementAdapter.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaDeviceManagementAdapter.dll=binary/group"/> -->
-     </component>
-     <component name="PoCOmaEngine.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaEngine.dll=binary/group"/> -->
-     </component>
-     <component name="PoCOmaPresenceHandler.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaPresenceHandler.dll=binary/group"/> -->
-     </component>
-     <component name="PoCOmaPresenceHandlerResolver.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaPresenceHandlerResolver.dll=binary/group"/> -->
-     </component>
-     <component name="PoCOmaSIPClientResolver.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaSIPClientResolver.dll=binary/group"/> -->
-     </component>
-     <component name="PoCOmaServer.exe=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaServer.exe=binary/group"/> -->
-     </component>
-     <component name="PoCOmaSettingsAdapter.dll=binary">
-      <!-- <unit bldFile="app/poc/pocengine/PoCOmaSettingsAdapter.dll=binary/group"/> -->
-     </component>
-     <component name="sipclientresolver" long-name="SIP Client Resolver">
-      <!-- <unit bldFile="app/poc/pocengine/sipclientresolver/group"/> -->
-     </component>
-    </collection>
-    <collection name="pocui" long-name="PoC Ui" level="ui">
-     <component name="PoCActionPlugin.dll=binary">
-      <!-- <unit bldFile="app/poc/pocui/PoCActionPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="PoCBioPlugin.dll=binary">
-      <!-- <unit bldFile="app/poc/pocui/PoCBioPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="PoCGSPlugin.dll=binary">
-      <!-- <unit bldFile="app/poc/pocui/PoCGSPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="PoCIntegrationPlugin.dll=binary">
-      <!-- <unit bldFile="app/poc/pocui/PoCIntegrationPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="PoCSourcePlugin.dll=binary">
-      <!-- <unit bldFile="app/poc/pocui/PoCSourcePlugin.dll=binary/group"/> -->
-     </component>
-     <component name="PoCUiIndicatorPlugin.dll=binary">
-      <!-- <unit bldFile="app/poc/pocui/PoCUiIndicatorPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="PoCUiIntgr" long-name="PoC UI Intgr">
-      <!-- <unit bldFile="app/poc/pocui/PoCUiIntgr/group"/> -->
-     </component>
-     <component name="app">
-      <!-- <unit bldFile="app/poc/pocui/app/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="IP Telephony" level="apps" name="iptelephony" levels="plugin eng ui">
-    <collection name="commsconfig" long-name="Comms Config" level="ui">
-     <component name="cscapplicationui" long-name="CSC Application UI">
-      <!-- <unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/> -->
-     </component>
-     <component name="cscengine" long-name="CSC Engine">
-      <!-- <unit bldFile="app/iptelephony/commsconfig/cscengine/group"/> -->
-     </component>
-     <component name="cscsettingsui" long-name="CSC Settings UI">
-      <!-- <unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/> -->
-     </component>
-     <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin">
-      <!-- <unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="ui">
-     <component name="cchclient" long-name="CCH Client">
-      <!-- <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/> -->
-     </component>
-     <component name="cchclientapi" long-name="CCH Clientapi">
-      <!-- <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/> -->
-     </component>
-     <component name="cchserver" long-name="CCH Server">
-      <!-- <unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/> -->
-     </component>
-     <component name="cchui" long-name="CCH UI">
-      <!-- <unit bldFile="app/iptelephony/convergedconnectionhandler/cchui/group"/> -->
-     </component>
-    </collection>
-    <collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-     <component name="rcse2" long-name="Rcse2">
-      <!-- <unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/> -->
-     </component>
-    </collection>
-    <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
-     <component name="svp.dll=binary">
-      <!-- <unit bldFile="app/iptelephony/sipvoipprovider/svp.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-     <component name="accountcreationplugin" long-name="Account Creation Plugin">
-      <!-- <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/> -->
-     </component>
-     <component name="dhcppositionprovider" long-name="DHCP Position Provider">
-      <!-- <unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/> -->
-     </component>
-     <component name="ipapputils" long-name="IP App Utils">
-      <!-- <unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/> -->
-     </component>
-     <component name="sipconnectionprovider" long-name="SIP Connection Provider">
-      <!-- <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/> -->
-     </component>
-     <component name="sipmxresolver" long-name="SIP MX Resolver">
-      <!-- <unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/> -->
-     </component>
-     <component name="voipadapters" long-name="VOIP Adapters">
-      <!-- <unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Settings UIs" level="services" name="settingsuis" levels="empty rsc ui">
-    <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-     <component name="gsplugin">
-      <!-- <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/> -->
-     </component>
-     <component name="server">
-      <!-- <unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/> -->
-     </component>
-     <component name="service" long-name="Service">
-      <!-- <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/> -->
-     </component>
-     <component name="services_db" long-name="Services Db">
-      <!-- <unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/> -->
-     </component>
-    </collection>
-    <collection name="systemswuis" long-name="System SW UIs" level="ui">
-     <component name="touchscreencalib" long-name="Touchscreen Calib">
-      <!-- <unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Content Control Daemons" level="services" name="contentcontrol" levels="1 2">
-    <collection name="applicationmanagement" long-name="Application Management" level="1">
-     <component name="tarmappmng" long-name="Tarm App Mng">
-      <!-- <unit bldFile="app/contentcontrol/applicationmanagement/tarmappmng/group"/> -->
-     </component>
-    </collection>
-    <collection name="customization" long-name="Customization" level="2">
-     <component name="tarmcustomization" long-name="TARM Customization">
-      <!-- <unit bldFile="app/contentcontrol/customization/tarmcustomization/group"/> -->
-     </component>
-    </collection>
-    <collection name="omads" long-name="OMA DS" level="1">
-     <component name="omadsappui" long-name="OMA DS App UI">
-      <!-- <unit bldFile="app/contentcontrol/omads/omadsappui/group"/> -->
-     </component>
-     <component name="omadsextensions" long-name="OMA DS Extensions">
-      <!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/> -->
-     </component>
-     <component name="syncmlnotifier" long-name="SyncML Notifier">
-      <!-- <unit bldFile="app/contentcontrol/omads/syncmlnotifier/group"/> -->
-     </component>
-     <component name="syncservice" long-name="Sync Service">
-      <!-- <unit bldFile="app/contentcontrol/omads/syncservice/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Device Control Daemons" level="services" name="devicecontrol" levels="1 2">
-    <collection name="devicediagnostics" long-name="Device Diagnostics" level="2">
-     <component name="devdiagapp" long-name="Dev Diag App">
-      <!-- <unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/> -->
-     </component>
-     <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin">
-      <!-- <unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/> -->
-     </component>
-     <component name="diagplugins" long-name="Diag Plugins">
-      <!-- <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/> -->
-     </component>
-     <component name="diagsuites" long-name="Diag Suites">
-      <!-- <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/> -->
-     </component>
-    </collection>
-    <collection name="fotaapplication" long-name="FOTA Application" level="2">
-     <component name="fotaserver" long-name="FOTA Server">
-      <!-- <unit bldFile="app/devicecontrol/fotaapplication/fotaserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="omadm" long-name="OMA Device Management" level="1">
-     <component name="omadmappui" long-name="OMA DM App UI">
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmappui/group"/> -->
-     </component>
-     <component name="omadmextensions" long-name="OMA DM Extensions">
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/group"/> -->
-     </component>
-    </collection>
-    <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="1">
-     <component name="pnpms" long-name="PnP MS">
-      <!-- <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="pcsuite" level="apps" long-name="PC Suite" levels="pcsuite-lib pcsuite-control pcsuite-mm pcsuite">
-    <collection name="ApplicationInstaller" long-name="Application Installer" level="pcsuite-control">
-     <component name="ApplicationInstallerApp" long-name="Application Installer" Application="Application Installer 2.1" Modules="NAI2-UI">
-      <!-- <unit bldFile="app/pcsuite/ApplicationInstaller/ApplicationInstallerApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="ConnectionManager" long-name="Connection Manager" level="pcsuite-control">
-     <component name="ConneMgr" long-name="Connection Manager" Application="Connection Manager 2" Modules="Application, Cpl">
-      <!-- <unit bldFile="app/pcsuite/ConnectionManager/ConneMgr/group"/> -->
-     </component>
-    </collection>
-    <collection name="ContentCopier" long-name="Content Copier" level="pcsuite-control">
-     <component name="ContentCopierApp" long-name="Content Copier" Application="Content Copier 4" Modules="NCC4">
-      <!-- <unit bldFile="app/pcsuite/ContentCopier/ContentCopierApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="GetConnectedWizard" long-name="Get Connected Wizard" level="pcsuite-control">
-     <component name="GetConnectedWizard" long-name="Get Connected Wizard" Application="Getting Connected Wizard" Modules="GCWizard">
-      <!-- <unit bldFile="app/pcsuite/GetConnectedWizard/GetConnectedWizard/group"/> -->
-     </component>
-    </collection>
-    <collection name="Helps" level="pcsuite">
-     <component name="AppHelps" Application="Helps" Modules="Helps_Series60">
-      <!-- <unit bldFile="app/pcsuite/Helps/AppHelps/group"/> -->
-     </component>
-    </collection>
-    <collection name="ImageStore" long-name="Image Store" level="pcsuite-mm">
-     <component name="ImageStoreApp" long-name="Image Store" Application="ImageStore" Modules="ImageStore">
-      <!-- <unit bldFile="app/pcsuite/ImageStore/ImageStoreApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="Installer" level="pcsuite-lib">
-     <component name="InstallerEng" long-name="Installer Engine" Application="Installer" Modules="Core">
-      <!-- <unit bldFile="app/pcsuite/Installer/InstallerEng/group"/> -->
-     </component>
-     <component name="InstallerApp" long-name="Installer App" Application="Installer" Modules="UI">
-      <!-- <unit bldFile="app/pcsuite/Installer/InstallerApp/group"/> -->
-     </component>
-     <component name="PackerLibrary" long-name="Packer Library" Application="Installer" Modules="PackerLibrary">
-      <!-- <unit bldFile="app/pcsuite/Installer/PackerLibrary/group"/> -->
-     </component>
-    </collection>
-    <collection name="3rdparty" long-name="3rd Party" level="pcsuite-lib">
-     <component name="libpng" Application="Installer" Modules="PngLib">
-      <!-- <unit bldFile="app/pcsuite/3rdparty/libpng/group"/> -->
-     </component>
-     <component name="7zip" Application="Installer" Modules="7Zip">
-      <!-- <unit bldFile="app/pcsuite/3rdparty/7zip/group"/> -->
-     </component>
-     <component name="libjpeg" Application="PCSCM" Modules="PCSCM">
-      <!-- <unit bldFile="app/pcsuite/3rdparty/libjpeg/group"/> -->
-     </component>
-     <component name="zlib">
-      <!-- <unit bldFile="app/pcsuite/3rdparty/zlib/group"/> -->
-     </component>
-    </collection>
-    <collection name="LaunchApplication" long-name="Launch Application" level="pcsuite">
-     <component name="LaunchApplicationApp" long-name="Launch Application" Application="Launch Application NG" Modules="LaunchApplicationNG">
-      <!-- <unit bldFile="app/pcsuite/LaunchApplication/LaunchApplicationApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="MultimediaPlayer" long-name="Multimedia Player" level="pcsuite-mm">
-     <component name="MultimediaPlayerApp" long-name="Multimedia Player" Application="Multimedia Player" Modules="CoolPlayer">
-      <!-- <unit bldFile="app/pcsuite/MultimediaPlayer/MultimediaPlayerApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="ImageConverter" long-name="Image Converter" level="pcsuite-mm">
-     <component name="ImageConverterApp" long-name="Image Converter" Application="NIC" Modules="ImageConverter">
-      <!-- <unit bldFile="app/pcsuite/ImageConverter/ImageConverterApp/group"/> -->
-     </component>
-     <component name="ImageConverterCOC" long-name="Image Converter COC" Application="NIC" Modules="ImageConverter_COC">
-      <!-- <unit bldFile="app/pcsuite/ImageConverter/ImageConverterCOC/group"/> -->
-     </component>
-     <component name="ImageConverterGL" long-name="Image Converter GL" Application="NIC" Modules="ImageConverter_GL">
-      <!-- <unit bldFile="app/pcsuite/ImageConverter/ImageConverterGL/group"/> -->
-     </component>
-    </collection>
-    <collection name="MusicManager" long-name="Music Manager" level="pcsuite-mm">
-     <component name="MusicManagerApp" long-name="Music Manager" Application="Nokia Music Manager" Modules="NokiaMusicManager">
-      <!-- <unit bldFile="app/pcsuite/MusicManager/MusicManagerApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="OneTouchAccess" long-name="One Touch Access" level="pcsuite-lib">
-     <component name="OneTouchAccessApp" long-name="One Touch Access" Application="One Touch Access" Modules="QuickGPRS">
-      <!-- <unit bldFile="app/pcsuite/OneTouchAccess/OneTouchAccessApp/group"/> -->
-     </component>
-    </collection>
-    <collection name="PCSync" long-name="PC Sync" level="pcsuite-control">
-     <component name="PCSyncNgr" long-name="PC Sync Ngr" Application="PC Sync 2" Modules="S60_PCS2_ngr">
-      <!-- <unit bldFile="app/pcsuite/PCSync/PCSyncNgr/group"/> -->
-     </component>
-     <component name="PCSyncApp" License="Other/prorietary">
-      <!-- <unit bldFile="app/pcsuite/PCSync/PCSyncApp/group"/> -->
+   <block name="contacts" long-name="Contacts Apps" level="apps" span="2" levels="engine support services ui">
+    <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
+     <component name="contactsmodel" long-name="Contacts Model" introduced="ER5">
+      <unit version="1" bldFile="app\contacts\phonebookengines\contactsmodel\group" mrp="app\contacts\phonebookengines\contactsmodel\group\app-engines_cntmodel.mrp"/>
      </component>
     </collection>
-    <collection name="PhoneBrowser" long-name="Phone Browser" level="pcsuite">
-     <component name="ContactsEditor" long-name="Contacts Editor" Application="Phone Browser 2" Modules="ContactsEditor">
-      <!-- <unit bldFile="app/pcsuite/PhoneBrowser/ContactsEditor/group"/> -->
-     </component>
-     <component name="vCard" Application="Phone Browser 2" Modules="NokiaVCard">
-      <!-- <unit bldFile="app/pcsuite/PhoneBrowser/vCard/group"/> -->
-     </component>
-     <component name="PhoneBrowserExt" long-name="Phone Browser Ext" Application="Phone Browser 3" Modules="PhoneBrowser">
-      <!-- <unit bldFile="app/pcsuite/PhoneBrowser/PhoneBrowserExt/group"/> -->
-     </component>
-     <component name="TextMessageEditor" long-name="Text Message Editor" Application="Text Message Editor" Modules="TextMessageFactory">
-      <!-- <unit bldFile="app/pcsuite/PhoneBrowser/TextMessageEditor/group"/> -->
-     </component>
-    </collection>
-    <collection name="Common" level="pcsuite-lib">
-     <component name="PCSCM" Application="PCSCM" Modules="PCSCM">
-      <!-- <unit bldFile="app/pcsuite/Common/PCSCM/group"/> -->
-     </component>
-     <component name="PCSL">
-      <!-- <unit bldFile="app/pcsuite/Common/PCSL/group"/> -->
-     </component>
-     <component name="ConfigurationServer" long-name="Configuration Server">
-      <!-- <unit bldFile="app/pcsuite/Common/ConfigurationServer/group"/> -->
-     </component>
-     <component name="MMCL">
-      <!-- <unit bldFile="app/pcsuite/Common/MMCL/group"/> -->
-     </component>
-     <component name="MCL">
-      <!-- <unit bldFile="app/pcsuite/Common/MCL/group"/> -->
-     </component>
-     <component name="codecs">
-      <!-- <unit bldFile="app/pcsuite/Common/codecs/group"/> -->
-     </component>
-    </collection>
-    <collection name="tools" long-name="Tools" level="pcsuite-lib">
-     <component name="GUIDChangingTool" long-name="GUID Changing Tool">
-      <!-- <unit bldFile="app/pcsuite/tools/GUIDChangingTool/group"/> -->
-     </component>
-     <component name="WIXGenerateGUIDs" long-name="WIX Generate GUIDs">
-      <!-- <unit bldFile="app/pcsuite/tools/WIXGenerateGUIDs/group"/> -->
-     </component>
-     <component name="SearchAndReplace" long-name="Search and Replace">
-      <!-- <unit bldFile="app/pcsuite/tools/SearchAndReplace/group"/> -->
-     </component>
-     <component name="BrandingTools" long-name="Branding Tools">
-      <!-- <unit bldFile="app/pcsuite/tools/BrandingTools/group"/> -->
-     </component>
-     <component name="CommonSelectDevice_Tester" long-name="Common Select Device Tester">
-      <!-- <unit bldFile="app/pcsuite/tools/CommonSelectDevice_Tester/group"/> -->
-     </component>
-     <component name="PCSLInfo" long-name="PCSL Info">
-      <!-- <unit bldFile="app/pcsuite/tools/PCSLInfo/group"/> -->
-     </component>
-     <component name="ColorMapper" long-name="Color Mapper">
-      <!-- <unit bldFile="app/pcsuite/tools/ColorMapper/group"/> -->
-     </component>
-     <component name="FileTransferUtility" long-name="File Transfer Utility">
-      <!-- <unit bldFile="app/pcsuite/tools/FileTransferUtility/group"/> -->
-     </component>
-     <component name="LocalizedTextViewer" long-name="Localized Text Viewer">
-      <!-- <unit bldFile="app/pcsuite/tools/LocalizedTextViewer/group"/> -->
-     </component>
-    </collection>
-    <collection name="installation" long-name="Installation" level="pcsuite-lib">
-     <component name="pcsuite" long-name="PC Suite Install" Application="S60 PCSuite MSI Installation Project" Modules="PCSuite">
-      <!-- <unit bldFile="app/pcsuite/installation/pcsuite/group"/> -->
-     </component>
-     <component name="InstTools" long-name="Installation Tools">
-      <!-- <unit bldFile="app/pcsuite/installation/InstTools/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="pccs" level="services" long-name="PCCS" levels="lib plat pccs">
-    <collection name="pccs_sdk" long-name="PC SAPI" level="pccs">
-     <component name="pcsapi" long-name="PCS API">
-      <!-- <unit bldFile="app/pccs/pccs_sdk/pcsapi/group"/> -->
-     </component>
-    </collection>
-    <collection name="platform" long-name="Platform" level="plat">
-     <component name="PCConnectivitySolution" long-name="PC Connectivity Solution">
-      <!-- <unit bldFile="app/pccs/platform/PCConnectivitySolution/group"/> -->
-     </component>
-     <component name="SLTester" long-name="CC Driver">
-      <!-- <unit bldFile="app/pccs/platform/SLTester/group"/> -->
-     </component>
-    </collection>
-    <collection name="pccs_installation" long-name="PCCS Installation" level="lib">
-     <component name="pccs" long-name="PCCS Install">
-      <!-- <unit bldFile="app/pccs/pccs_installation/pccs/group"/> -->
-     </component>
-     <component name="instCcdriver" long-name="CC Driver Install">
-      <!-- <unit bldFile="app/pccs/pccs_installation/instCcdriver/group"/> -->
-     </component>
-    </collection>
-    <collection name="pccs_tools" long-name="PCCS Tools" level="lib">
-     <component name="ConfServerCRCTest" long-name="Conf Server CRC Test">
-      <!-- <unit bldFile="app/pccs/pccs_tools/ConfServerCRCTest/group"/> -->
-     </component>
-     <component name="SLTester">
-      <!-- <unit bldFile="app/pccs/pccs_tools/SLTester/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="File Manager Apps" level="apps" name="files" levels="support apps">
-    <collection name="filemanager" long-name="File Manager" level="apps">
-     <component name="FileManager.exe=binary">
-      <!-- <unit bldFile="app/files/filemanager/FileManager.exe=binary/group"/> -->
-     </component>
-     <component name="FileManagerEngine.dll=binary">
-      <!-- <unit bldFile="app/files/filemanager/FileManagerEngine.dll=binary/group"/> -->
-     </component>
-     <component name="FileManagerView.dll=binary">
-      <!-- <unit bldFile="app/files/filemanager/FileManagerView.dll=binary/group"/> -->
-     </component>
-     <component name="GFLM.dll=binary" long-name="GFLM">
-      <!-- <unit bldFile="app/files/filemanager/GFLM.dll=binary/group"/> -->
-     </component>
-     <component name="filemanageraiwprovider.dll=binary">
-      <!-- <unit bldFile="app/files/filemanager/filemanageraiwprovider.dll=binary/group"/> -->
-     </component>
-     <component name="filemanagerbkupengine.dll=binary">
-      <!-- <unit bldFile="app/files/filemanager/filemanagerbkupengine.dll=binary/group"/> -->
-     </component>
-     <component name="filemanagerbkupplugin.dll=binary">
-      <!-- <unit bldFile="app/files/filemanager/filemanagerbkupplugin.dll=binary/group"/> -->
-     </component>
-     <component name="filemanagerschbkup.exe=binary">
-      <!-- <unit bldFile="app/files/filemanager/filemanagerschbkup.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="filesystemuis" long-name="File System UIs" level="support">
-     <component name="memscaneng" long-name="Mem Scan Eng">
-      <!-- <unit bldFile="app/files/filesystemuis/memscaneng/group"/> -->
-     </component>
-     <component name="memstatepopup" long-name="Mem State Popup">
-      <!-- <unit bldFile="app/files/filesystemuis/memstatepopup/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Contacts Apps" level="apps" span="2" name="contacts" levels="engine support services ui">
     <collection name="pimprotocols" long-name="PIM Protocols" level="services">
-     <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2">
-      <unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-     </component>
      <component name="phonebooksync" long-name="Phonebook Sync" plugin="Y">
-      <unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-     </component>
-    </collection>
-    <collection name="ccservices" long-name="CC Services" level="services">
-     <component name="cmsservices" long-name="CMS Services">
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/group"/> -->
-     </component>
-    </collection>
-    <collection name="contactextensions" long-name="Contact Extensions" level="services">
-     <component name="predefinedcontacts" long-name="Predefined Contacts">
-      <!-- <unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/> -->
-     </component>
-    </collection>
-    <collection name="logsui" long-name="Logs UI" level="ui">
-     <component name="AocCtView.dll=binary" long-name="Aoc Ct View">
-      <!-- <unit bldFile="app/contacts/logsui/AocCtView.dll=binary/group"/> -->
-     </component>
-     <component name="Logs.exe=binary" long-name="Logs">
-      <!-- <unit bldFile="app/contacts/logsui/Logs.exe=binary/group"/> -->
-     </component>
-     <component name="LogsClient.dll=binary">
-      <!-- <unit bldFile="app/contacts/logsui/LogsClient.dll=binary/group"/> -->
-     </component>
-     <component name="LogsEng.dll=binary" long-name="Logs Engine">
-      <!-- <unit bldFile="app/contacts/logsui/LogsEng.dll=binary/group"/> -->
-     </component>
-     <component name="LogsIndicatorPlugin.dll=binary">
-      <!-- <unit bldFile="app/contacts/logsui/LogsIndicatorPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="LogsPlugin.dll=binary">
-      <!-- <unit bldFile="app/contacts/logsui/LogsPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="logsserviceextension" long-name="Logs Service Extension">
-      <!-- <unit bldFile="app/contacts/logsui/logsserviceextension/group"/> -->
-     </component>
-    </collection>
-    <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-     <component name="CntFindPlugin" long-name="Cnt Find Plugin">
-      <!-- <unit bldFile="app/contacts/phonebookengines/CntFindPlugin/group"/> -->
-     </component>
-     <component name="CntSortPlugin" long-name="Cnt Sort Plugin">
-      <!-- <unit bldFile="app/contacts/phonebookengines/CntSortPlugin/group"/> -->
-     </component>
-     <component name="contactsmodel" long-name="Contacts Model" introduced="ER5">
-      <unit version="1" bldFile="app/contacts/phonebookengines/contactsmodel/group" mrp="app/contacts/phonebookengines/contactsmodel/group/app-engines_cntmodel.mrp"/>
-      <unit version="2" bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
-     </component>
-     <component name="VirtualPhonebook" long-name="Virtual Phonebook">
-      <!-- <unit bldFile="app/contacts/phonebookengines/VirtualPhonebook/group"/> -->
-     </component>
-    </collection>
-    <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-     <component name="Phonebook">
-      <!-- <unit bldFile="app/contacts/phonebookui/Phonebook/group"/> -->
-     </component>
-     <component name="Phonebook2" long-name="Phone Book 2">
-      <!-- <unit bldFile="app/contacts/phonebookui/Phonebook2/group"/> -->
-     </component>
-     <component name="Speeddial" long-name="Speed Dial">
-      <!-- <unit bldFile="app/contacts/phonebookui/Speeddial/group"/> -->
-     </component>
-    </collection>
-    <collection name="predictivesearch" long-name="Predictive Search" level="support">
-     <component name="PcsAlgorithm" long-name="PCS Algorithm">
-      <!-- <unit bldFile="app/contacts/predictivesearch/PcsAlgorithm/group"/> -->
-     </component>
-     <component name="PcsServer" long-name="PCS Server">
-      <!-- <unit bldFile="app/contacts/predictivesearch/PcsServer/group"/> -->
-     </component>
-     <component name="PcsServerClientAPI" long-name="PCS Server Client API">
-      <!-- <unit bldFile="app/contacts/predictivesearch/PcsServerClientAPI/group"/> -->
-     </component>
-     <component name="PcsUtils" long-name="PCS Utils">
-      <!-- <unit bldFile="app/contacts/predictivesearch/PcsUtils/group"/> -->
-     </component>
-     <component name="adapters" long-name="Adapters">
-      <!-- <unit bldFile="app/contacts/predictivesearch/adapters/group"/> -->
-     </component>
-    </collection>
-    <collection name="presencecache" long-name="Presence Cache" level="support">
-     <component name="presencecacheclient2" long-name="Presence Cache Client2">
-      <!-- <unit bldFile="app/contacts/presencecache/presencecacheclient2/group"/> -->
-     </component>
-     <component name="presencecacheserver2" long-name="Presence Cache Server2">
-      <!-- <unit bldFile="app/contacts/presencecache/presencecacheserver2/group"/> -->
-     </component>
-     <component name="presencecacheutils" long-name="Presence Cache Utils">
-      <!-- <unit bldFile="app/contacts/presencecache/presencecacheutils/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Organizer Application Suite" level="apps" span="2" name="organizer" levels="support services engine ui">
-    <collection name="officeappeng" long-name="Office App Engines" level="engine">
-     <component name="charteng" long-name="Chart" introduced="5.0" deprecated="9.3" class="test">
-      <unit mrp="app/organizer/officeappeng/charteng/group/app-engines_chart.mrp"/>
-     </component>
-     <component name="datamodel" long-name="Data Engine" introduced="5.0" deprecated="9.3">
-      <unit bldFile="app/organizer/officeappeng/datamodel/group" mrp="app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/>
-     </component>
-     <component name="sheeteng" long-name="Sheet Engine" introduced="5.0" deprecated="9.3">
-      <unit bldFile="app/organizer/officeappeng/sheeteng/group" mrp="app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
-     </component>
-     <component name="wordeng" long-name="Word Engine" introduced="5.0" deprecated="9.3">
-      <unit bldFile="app/organizer/officeappeng/wordeng/group" mrp="app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
-     </component>
-    </collection>
-    <collection name="pimappservices" long-name="PIM App Services" level="services">
-     <component name="agnmodel" long-name="Agenda Model" introduced="5.0" deprecated="9.1">
-      <unit bldFile="app/organizer/pimappservices/agnmodel/group" mrp="app/organizer/pimappservices/agnmodel/group/app-engines_agnmodel.mrp"/>
-     </component>
-     <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" class="test">
-      <unit bldFile="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
-     </component>
-     <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" plugin="Y" introduced="8.1">
-      <unit version="1" bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit.mrp"/>
-      <unit version="2" bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
-     </component>
-     <component name="appenginesdocs" long-name="Application Engines Documentation" class="doc">
-      <unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-     </component>
-     <component name="calendar" long-name="Calendar" introduced="9.2">
-      <unit version="1" bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calinterimapi.mrp"/>
-      <unit version="2" bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp"/>
-     </component>
-    </collection>
-    <collection name="pimappsupport" long-name="PIM Application Support" level="support">
-     <component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91">
-      <unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-     </component>
-     <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1">
-      <unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-     </component>
-     <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5">
-      <unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-     </component>
-    </collection>
-    <collection name="alarmengines" long-name="Alarm Engines" level="engine">
-     <component name="missedalarmstore" long-name="Missed Alarm Store">
-      <!-- <unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/> -->
-     </component>
-    </collection>
-    <collection name="alarmui" long-name="Alarm UI" level="ui">
-     <component name="AknAlarmService.dll=binary">
-      <!-- <unit bldFile="app/organizer/alarmui/AknAlarmService.dll=binary/group"/> -->
-     </component>
-     <component name="AlmAlert.dll=binary" long-name="Alm Alert">
-      <!-- <unit bldFile="app/organizer/alarmui/AlmAlert.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="calendarengines" long-name="Calendar Engines" level="engine">
-     <component name="agnversit2" long-name="Agenda Versit2">
-      <!-- <unit bldFile="app/organizer/calendarengines/agnversit2/group"/> -->
-     </component>
-     <component name="calenimp" long-name="Calen Imp">
-      <!-- <unit bldFile="app/organizer/calendarengines/calenimp/group"/> -->
-     </component>
-     <component name="caleninterimutils" long-name="Calen Interim Utils">
-      <!-- <unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/> -->
-     </component>
-     <component name="calenlauncher" long-name="Calen Launcher">
-      <!-- <unit bldFile="app/organizer/calendarengines/calenlauncher/group"/> -->
-     </component>
-     <component name="versit2" long-name="Versit 2">
-      <!-- <unit bldFile="app/organizer/calendarengines/versit2/group"/> -->
-     </component>
-    </collection>
-    <collection name="calendarui" long-name="Calendar UI" level="ui">
-     <component name="aiplugins">
-      <!-- <unit bldFile="app/organizer/calendarui/aiplugins/group"/> -->
-     </component>
-     <component name="application" long-name="Application">
-      <!-- <unit bldFile="app/organizer/calendarui/application/group"/> -->
-     </component>
-     <component name="commonutils" long-name="Common Utils">
-      <!-- <unit bldFile="app/organizer/calendarui/commonutils/group"/> -->
-     </component>
-     <component name="controller">
-      <!-- <unit bldFile="app/organizer/calendarui/controller/group"/> -->
-     </component>
-     <component name="customisation" long-name="Customisation">
-      <!-- <unit bldFile="app/organizer/calendarui/customisation/group"/> -->
-     </component>
-     <component name="customisationmanager" long-name="Customisation Manager">
-      <!-- <unit bldFile="app/organizer/calendarui/customisationmanager/group"/> -->
-     </component>
-     <component name="editors" long-name=" Editors">
-      <!-- <unit bldFile="app/organizer/calendarui/editors/group"/> -->
-     </component>
-     <component name="globaldata" long-name="Global Data">
-      <!-- <unit bldFile="app/organizer/calendarui/globaldata/group"/> -->
-     </component>
-     <component name="inc">
-      <!-- <unit bldFile="app/organizer/calendarui/inc/group"/> -->
-     </component>
-     <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin">
-      <!-- <unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/> -->
-     </component>
-     <component name="notifier" long-name="Notifier">
-      <!-- <unit bldFile="app/organizer/calendarui/notifier/group"/> -->
-     </component>
-     <component name="regionalplugins" long-name="Regional Plugins">
-      <!-- <unit bldFile="app/organizer/calendarui/regionalplugins/group"/> -->
-     </component>
-     <component name="server">
-      <!-- <unit bldFile="app/organizer/calendarui/server/group"/> -->
-     </component>
-     <component name="settings" long-name="Settings">
-      <!-- <unit bldFile="app/organizer/calendarui/settings/group"/> -->
-     </component>
-     <component name="views" long-name="Views">
-      <!-- <unit bldFile="app/organizer/calendarui/views/group"/> -->
-     </component>
-    </collection>
-    <collection name="clock2" long-name="Clock2" level="ui">
-     <component name="clockengines" long-name="Clock Engines">
-      <!-- <unit bldFile="app/organizer/clock2/clockengines/group"/> -->
-     </component>
-     <component name="clockui" long-name="Clock UI">
-      <!-- <unit bldFile="app/organizer/clock2/clockui/group"/> -->
-     </component>
-    </collection>
-    <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-     <component name="mrmailboxutils" long-name="MR Mailbox Utils">
-      <!-- <unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="meetingui" long-name="Meeting UI" level="ui">
-     <component name="agnentryui" long-name="Agn Entry UI">
-      <!-- <unit bldFile="app/organizer/meetingui/agnentryui/group"/> -->
-     </component>
-     <component name="attendeeview" long-name="Attendee View">
-      <!-- <unit bldFile="app/organizer/meetingui/attendeeview/group"/> -->
-     </component>
-     <component name="meetingrequestutils" long-name="Meeting Request Utils">
-      <!-- <unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/> -->
-     </component>
-     <component name="meetingrequestviewers" long-name="Meeting Request Viewers">
-      <!-- <unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/> -->
-     </component>
-    </collection>
-    <collection name="notepad" long-name="Notepad" level="ui">
-     <component name="notepad1" long-name="Notepad1">
-      <!-- <unit bldFile="app/organizer/notepad/notepad1/group"/> -->
-     </component>
-     <component name="txtrecog" long-name="Txt Recog">
-      <!-- <unit bldFile="app/organizer/notepad/txtrecog/group"/> -->
-     </component>
-    </collection>
-    <collection name="searchfw" long-name="Search Framework" level="services">
-     <component name="coresearchfw" long-name="Core Search Framework">
-      <!-- <unit bldFile="app/organizer/searchfw/coresearchfw/group"/> -->
-     </component>
-     <component name="plugins">
-      <!-- <unit bldFile="app/organizer/searchfw/plugins/group"/> -->
-     </component>
-    </collection>
-    <collection name="searchui" long-name="Search UI" level="ui">
-     <component name="searchapp" long-name="Search App">
-      <!-- <unit bldFile="app/organizer/searchui/searchapp/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Messaging Apps" level="apps" name="messaging" levels="1 2">
-    <collection name="email" long-name="Email" level="1">
-     <component name="imap4mtm" long-name="IMAP4 MTM" plugin="Y" introduced="9.2">
-      <unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-     </component>
-     <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" plugin="Y">
-      <unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-     </component>
-     <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin">
-      <!-- <unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/> -->
-     </component>
-     <component name="emailnotificationhandler" long-name="Email Notification Handler">
-      <!-- <unit bldFile="app/messaging/email/emailnotificationhandler/group"/> -->
-     </component>
-     <component name="imum" long-name="IMUM">
-      <!-- <unit bldFile="app/messaging/email/imum/group"/> -->
-     </component>
-     <component name="mail" long-name="Mail">
-      <!-- <unit bldFile="app/messaging/email/mail/group"/> -->
-     </component>
-     <component name="syncuimtms" long-name="Sync UI MTMS">
-      <!-- <unit bldFile="app/messaging/email/syncuimtms/group"/> -->
-     </component>
-    </collection>
-    <collection name="messagingappbase" long-name="Messaging App Base" level="2">
-     <component name="obexmtms" long-name="OBEX MTMs" plugin="Y" introduced="7.0s">
-      <unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-     </component>
-     <component name="smilparser" long-name="SMIL Parser" introduced="7.0s">
-      <unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-     </component>
-     <component name="bium" long-name="Bium">
-      <!-- <unit bldFile="app/messaging/messagingappbase/bium/group"/> -->
-     </component>
-     <component name="mce" long-name="MCE">
-      <!-- <unit bldFile="app/messaging/messagingappbase/mce/group"/> -->
-     </component>
-     <component name="mceextraitems" long-name="Mce Extra Items">
-      <!-- <unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/> -->
-     </component>
-     <component name="mcesettings" long-name="MCE Settings">
-      <!-- <unit bldFile="app/messaging/messagingappbase/mcesettings/group"/> -->
-     </component>
-     <component name="msgavkon" long-name="Messaging Avkon">
-      <!-- <unit bldFile="app/messaging/messagingappbase/msgavkon/group"/> -->
-     </component>
-     <component name="msgeditor" long-name="Messaging Editor">
-      <!-- <unit bldFile="app/messaging/messagingappbase/msgeditor/group"/> -->
-     </component>
-     <component name="msgerrorwatcher" long-name="Msg Error Watcher">
-      <!-- <unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/> -->
-     </component>
-     <component name="ncnlist" long-name="NCN List">
-      <!-- <unit bldFile="app/messaging/messagingappbase/ncnlist/group"/> -->
-     </component>
-     <component name="schemeplugin" long-name="Scheme Plugin">
-      <!-- <unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/> -->
-     </component>
-     <component name="sendui" long-name="Send UI">
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/group"/> -->
-     </component>
-     <component name="smartmessaging" long-name="Smart Messaging">
-      <!-- <unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/> -->
-     </component>
-     <component name="smilengine" long-name="SMIL Engine">
-      <!-- <unit bldFile="app/messaging/messagingappbase/smilengine/group"/> -->
-     </component>
-    </collection>
-    <collection name="mmsengine" long-name="MMS Engine" level="1">
-     <component name="mmsconf" long-name="MMS Configuration">
-      <unit mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings-config.mrp"/>
-     </component>
-     <component name="mmssettings" long-name="MMS Settings" introduced="9.2">
-      <unit bldFile="app/messaging/mmsengine/mmssettings/group/" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-     </component>
-     <component name="applicationadapter" long-name="Application Adapter">
-      <!-- <unit bldFile="app/messaging/mmsengine/applicationadapter/group"/> -->
-     </component>
-     <component name="clientmtm" long-name="Client MTM">
-      <!-- <unit bldFile="app/messaging/mmsengine/clientmtm/group"/> -->
-     </component>
-     <component name="genutils" long-name="General Utils">
-      <!-- <unit bldFile="app/messaging/mmsengine/genutils/group"/> -->
-     </component>
-     <component name="mmscodec" long-name="MMS Codec">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmscodec/group"/> -->
-     </component>
-     <component name="mmscodecclient" long-name="MMS Codec Client">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmscodecclient/group"/> -->
-     </component>
-     <component name="mmsconninit" long-name="MMS Connection Init">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsconninit/group"/> -->
-     </component>
-     <component name="mmshttptransport" long-name="MMS HTTP Transport">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmshttptransport/group"/> -->
-     </component>
-     <component name="mmsmessage" long-name="MMS Message">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsmessage/group"/> -->
-     </component>
-     <component name="mmspushhandler" long-name="MMS Push Handler">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmspushhandler/group"/> -->
-     </component>
-     <component name="mmsserver" long-name="MMS Server">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsserver/group"/> -->
-     </component>
-     <component name="mmsserversettings" long-name="MMS Server Aettings">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsserversettings/group"/> -->
-     </component>
-     <component name="mmswatcher" long-name="MMS Watcher">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmswatcher/group"/> -->
-     </component>
-    </collection>
-    <collection name="mobilemessaging" long-name="Mobile Messaging" level="2">
-     <component name="smsmtm" long-name="SMS MTM" plugin="Y">
-      <unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
-     </component>
-     <component name="audiomsg" long-name="Audio Message">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/> -->
-     </component>
-     <component name="mmsui" long-name="MMS UI">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/mmsui/group"/> -->
-     </component>
-     <component name="msgmedia" long-name="Message Media">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/> -->
-     </component>
-     <component name="postcard" long-name="Postcard">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/postcard/group"/> -->
-     </component>
-     <component name="smilui" long-name="SMIL UI">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/smilui/group"/> -->
-     </component>
-     <component name="smsui" long-name="SMS UI">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/smsui/group"/> -->
-     </component>
-     <component name="smum" long-name="Smum">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/smum/group"/> -->
-     </component>
-     <component name="unieditor" long-name="Uni Editor">
-      <!-- <unit bldFile="app/messaging/mobilemessaging/unieditor/group"/> -->
+      <unit bldFile="app\contacts\pimprotocols\phonebooksync\group" mrp="app\contacts\pimprotocols\phonebooksync\group\telephony_phbksync.mrp"/>
+     </component>
+     <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2">
+      <unit bldFile="app\contacts\pimprotocols\pbap\group" mrp="app\contacts\pimprotocols\pbap\group\bluetooth_accesshost.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Conversation Apps" level="apps" name="conversations" introduced="9.1" levels="utils settings ui">
-    <collection name="imstutils" long-name="IM Service Tab Utils" introduced="9.1" level="utils">
-     <component name="imconnectionprovider" introduced="9.1" long-name="IM Connection Provider">
-      <!-- <unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/> -->
-     </component>
-     <component name="imconversationview" introduced="9.1" long-name="IM Conversation View">
-      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/group"/> -->
-     </component>
-     <component name="xmppadapter" introduced="9.1" long-name="XMPP Adapter">
-      <!-- <unit bldFile="app/conversations/imstutils/xmppadapter/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiservicetab" long-name="UI Service Tab" introduced="9.1" level="ui">
-     <component name="vimpstcmdprocess" introduced="9.1" long-name="VIMP ST Command Process">
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/> -->
-     </component>
-     <component name="vimpstdetailsviewplugin" introduced="9.1" long-name="VIMP ST Details View Plugin">
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/> -->
-     </component>
-     <component name="vimpstengine" introduced="9.1" long-name="VIMP ST Engine">
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/> -->
-     </component>
-     <component name="vimpststorage" introduced="9.1" long-name="VIMP ST Storage">
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/> -->
-     </component>
-     <component name="vimpstui" introduced="9.1" long-name="VIMP ST UI">
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstui/group"/> -->
-     </component>
-     <component name="vimpstutils" introduced="9.1" long-name="VIMP ST Utilities">
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" introduced="9.1" level="settings">
-     <component name="vimpstsettings.dll=binary" introduced="9.1">
-      <!-- <unit bldFile="app/conversations/uiservicetabsettings/vimpstsettings.dll=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Instant Messaging Apps" level="apps" name="im" levels="support engine apps">
-    <collection name="impsengine" long-name="IMPS Engine" level="engine">
-     <component name="ImpsDataChannel" long-name="Imps Data Channel">
-      <!-- <unit bldFile="app/im/impsengine/ImpsDataChannel/group"/> -->
-     </component>
-     <component name="ImpsIpCirWatcher" long-name="Imps Ip Cir Watcher">
-      <!-- <unit bldFile="app/im/impsengine/ImpsIpCirWatcher/group"/> -->
-     </component>
-     <component name="client">
-      <!-- <unit bldFile="app/im/impsengine/client/group"/> -->
-     </component>
-     <component name="datautils" long-name="Data Utils">
-      <!-- <unit bldFile="app/im/impsengine/datautils/group"/> -->
-     </component>
-     <component name="engsrv" long-name="Eng Srv">
-      <!-- <unit bldFile="app/im/impsengine/engsrv/group"/> -->
-     </component>
-     <component name="imapi" long-name="IM API">
-      <!-- <unit bldFile="app/im/impsengine/imapi/group"/> -->
-     </component>
-     <component name="imlauncher" long-name="IM Launcher">
-      <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
-     </component>
-     <component name="impswatcher" long-name="Imps Watcher">
-      <!-- <unit bldFile="app/im/impsengine/impswatcher/group"/> -->
-     </component>
-     <component name="messageencoder" long-name="Message Encoder">
-      <!-- <unit bldFile="app/im/impsengine/messageencoder/group"/> -->
-     </component>
-     <component name="utils" long-name="Utilities">
-      <!-- <unit bldFile="app/im/impsengine/utils/group"/> -->
-     </component>
-     <component name="wvotaparser" long-name="WV OTA Parser">
-      <!-- <unit bldFile="app/im/impsengine/wvotaparser/group"/> -->
-     </component>
-    </collection>
-    <collection name="pecengine" long-name="Presence Engine" level="engine">
-     <component name="AttributeLibrary2" long-name="Attribute Library 2">
-      <!-- <unit bldFile="app/im/pecengine/AttributeLibrary2/group"/> -->
-     </component>
-     <component name="CoreUtilsLib2" long-name="Core Utils Lib 2">
-      <!-- <unit bldFile="app/im/pecengine/CoreUtilsLib2/group"/> -->
-     </component>
-     <component name="JanitorPlugin2" long-name="Janitor Plugin 2">
-      <!-- <unit bldFile="app/im/pecengine/JanitorPlugin2/group"/> -->
-     </component>
-     <component name="ListLibrary2" long-name="List Library 2">
-      <!-- <unit bldFile="app/im/pecengine/ListLibrary2/group"/> -->
-     </component>
-     <component name="Parser2">
-      <!-- <unit bldFile="app/im/pecengine/Parser2/group"/> -->
-     </component>
-     <component name="PluginServer2" long-name="Plugin Server 2">
-      <!-- <unit bldFile="app/im/pecengine/PluginServer2/group"/> -->
-     </component>
-     <component name="PresenceManager2" long-name="Presence Manager 2">
-      <!-- <unit bldFile="app/im/pecengine/PresenceManager2/group"/> -->
-     </component>
-     <component name="PresenceServer2" long-name="Presence Server 2">
-      <!-- <unit bldFile="app/im/pecengine/PresenceServer2/group"/> -->
-     </component>
-     <component name="StorageManager2" long-name="Storage Manager 2">
-      <!-- <unit bldFile="app/im/pecengine/StorageManager2/group"/> -->
-     </component>
-     <component name="TransferAdapter2" long-name="Transfer Adapter 2">
-      <!-- <unit bldFile="app/im/pecengine/TransferAdapter2/group"/> -->
-     </component>
-    </collection>
-    <collection name="presadap12" long-name="Presence Adap 12" level="support">
-     <component name="Parser2">
-      <!-- <unit bldFile="app/im/presadap12/Parser2/group"/> -->
-     </component>
-     <component name="impsplugin" long-name="IMPS Plugin">
-      <!-- <unit bldFile="app/im/presadap12/impsplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="wvsettings20" long-name="WV Settings 20" level="support">
-     <component name="WVSAPSettingsStore.dll=binary">
-      <!-- <unit bldFile="app/im/wvsettings20/WVSAPSettingsStore.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="wvuing" long-name="WV UI NG" level="apps">
-     <component name="IMPSAlwaysOnlinePlugin" long-name="IMPS Always Online Plugin">
-      <!-- <unit bldFile="app/im/wvuing/IMPSAlwaysOnlinePlugin/group"/> -->
-     </component>
-     <component name="IMPSConnectionUI" long-name="IMPS Connection UI">
-      <!-- <unit bldFile="app/im/wvuing/IMPSConnectionUI/group"/> -->
-     </component>
-     <component name="IMPSServiceSettingsUI" long-name="IMPS Service Settings UI">
-      <!-- <unit bldFile="app/im/wvuing/IMPSServiceSettingsUI/group"/> -->
-     </component>
-     <component name="ImLauncher" long-name="IM Launcher">
-      <!-- <unit bldFile="app/im/wvuing/ImLauncher/group"/> -->
-     </component>
-     <component name="ImUtils" long-name="Im Utils">
-      <!-- <unit bldFile="app/im/wvuing/ImUtils/group"/> -->
-     </component>
-     <component name="imindicatorplugin" long-name="IM Indicator Plugin">
-      <!-- <unit bldFile="app/im/wvuing/imindicatorplugin/group"/> -->
-     </component>
-     <component name="wvaudiomanager" long-name="Wv Audio Manager">
-      <!-- <unit bldFile="app/im/wvuing/wvaudiomanager/group"/> -->
-     </component>
-     <component name="wvcommandutils" long-name="Wv Command Utils">
-      <!-- <unit bldFile="app/im/wvuing/wvcommandutils/group"/> -->
-     </component>
-     <component name="wvlogger" long-name="Wvlogger">
-      <!-- <unit bldFile="app/im/wvuing/wvlogger/group"/> -->
-     </component>
-     <component name="wvuiada" long-name="Wvuiada">
-      <!-- <unit bldFile="app/im/wvuing/wvuiada/group"/> -->
-     </component>
-     <component name="wvuiave" long-name="Wvuiave">
-      <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
-     </component>
-     <component name="wvuieng" long-name="Wvuieng">
-      <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
-     </component>
-     <component name="wvuipresence" long-name="WV UI Presence">
-      <!-- <unit bldFile="app/im/wvuing/wvuipresence/group"/> -->
-     </component>
-     <component name="wvuiprocess" long-name="WV UI Process">
-      <!-- <unit bldFile="app/im/wvuing/wvuiprocess/group"/> -->
-     </component>
-     <component name="wvuistorage" long-name="WV UI Storage">
-      <!-- <unit bldFile="app/im/wvuing/wvuistorage/group"/> -->
-     </component>
-     <component name="wvvariant" long-name="Wvvariant">
-      <!-- <unit bldFile="app/im/wvuing/wvvariant/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Utility Apps" level="apps" name="utils" levels="app">
-    <collection name="extras" long-name="Extras" level="app">
-     <component name="about" long-name="About">
-      <!-- <unit bldFile="app/utils/extras/about/group"/> -->
-     </component>
-     <component name="calcsoft" long-name="Calcsoft">
-      <!-- <unit bldFile="app/utils/extras/calcsoft/group"/> -->
-     </component>
-     <component name="converter" long-name="Converter">
-      <!-- <unit bldFile="app/utils/extras/converter/group"/> -->
-     </component>
-     <component name="chinesedictionary" long-name="Chinese Dictionary">
-      <!-- <unit bldFile="app/utils/extras/chinesedictionary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Dictionary" level="services" name="dictionary" levels="appl">
-    <collection name="userdict" long-name="User Dictionary" level="appl">
-     <component name="UserDict.exe=binary" long-name="UserDict Server">
-      <!-- <unit bldFile="app/dictionary/userdict/UserDict.exe=binary/group"/> -->
-     </component>
-     <component name="UserDict.dll=binary" long-name="UserDict Client">
-      <!-- <unit bldFile="app/dictionary/userdict/UserDict.dll=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Camera Apps" level="apps" name="camera" levels="empty 1">
-    <collection name="camerauis" long-name="Camera UIs" level="1">
-     <component name="activepalette" long-name="Active Palette">
-      <!-- <unit bldFile="app/camera/camerauis/activepalette/group"/> -->
-     </component>
-     <component name="cameraapp" long-name="Camera Application">
-      <!-- <unit bldFile="app/camera/camerauis/cameraapp/group"/> -->
+   <block name="organizer" long-name="Organizer Application Suite" level="apps" span="2" levels="support services engine ui">
+    <collection name="pimappservices" long-name="PIM App Services" level="services">
+     <component name="calendar" long-name="Calendar" introduced="9.2">
+      <unit version="2" bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp"/>
+     </component>
+     <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" plugin="Y" introduced="8.1">
+      <unit version="2" bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit2.mrp"/>
+     </component>
+     <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" class="test">
+      <unit bldFile="app\organizer\pimappservices\agendamodeltest\TestAgendaSrv" mrp="app\organizer\pimappservices\agendamodeltest\TestAgendaSrv\app-engines_testagendasrv.mrp"/>
+     </component>
+     <component name="appenginesdocs" long-name="Application Engines Documentation" class="doc">
+      <unit mrp="app\organizer\pimappservices\appenginesdocs\app-engines_documentation.mrp"/>
      </component>
     </collection>
-   </block>
-   <block long-name="Image Editor Apps" level="apps" name="imgeditor" levels="engine ui">
-    <collection name="imageeditor" long-name="Image Editor" level="ui">
-     <component name="EditorProvider" long-name="Editor Provider">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/EditorProvider/group"/> -->
-     </component>
-     <component name="IEPB">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/IEPB/group"/> -->
-     </component>
-     <component name="ImageEditorManager" long-name="Image Editor Manager">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/ImageEditorManager/group"/> -->
-     </component>
-     <component name="ImageEditorUI" long-name="Image Editor UI">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/ImageEditorUI/group"/> -->
-     </component>
-     <component name="PB">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/PB/group"/> -->
-     </component>
-     <component name="imageeditorApp" long-name="Image Editor App">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/imageeditorApp/group"/> -->
-     </component>
-     <component name="plugins">
-      <!-- <unit bldFile="app/imgeditor/imageeditor/plugins/group"/> -->
-     </component>
-    </collection>
-    <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-     <component name="EngineWrapper" long-name="Engine Wrapper">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/EngineWrapper/group"/> -->
-     </component>
-     <component name="ImageEditorUtils" long-name="Image Editor Utils">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/ImageEditorUtils/group"/> -->
-     </component>
-     <component name="JpegRotator" long-name="Jpeg Rotator">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/JpegRotator/group"/> -->
-     </component>
-     <component name="JpegScaler" long-name="Jpeg Scaler">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/JpegScaler/group"/> -->
-     </component>
-     <component name="SystemParameters" long-name="System Parameters">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/SystemParameters/group"/> -->
-     </component>
-     <component name="filters" long-name="Filters">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/filters/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Video Editor Apps" level="apps" name="videoeditor" levels="engine ui">
-    <collection name="videditor" long-name="Video Editor" level="ui">
-     <component name="ManualVideoEditor" long-name="Manual Video Editor">
-      <!-- <unit bldFile="app/videoeditor/videditor/ManualVideoEditor/group"/> -->
-     </component>
-     <component name="SimpleCutVideo" long-name="Simple Cut Video">
-      <!-- <unit bldFile="app/videoeditor/videditor/SimpleCutVideo/group"/> -->
-     </component>
-     <component name="SimpleVideoEditor" long-name="Simple Video Editor">
-      <!-- <unit bldFile="app/videoeditor/videditor/SimpleVideoEditor/group"/> -->
-     </component>
-     <component name="TrimForMms" long-name="Trim For MMS">
-      <!-- <unit bldFile="app/videoeditor/videditor/TrimForMms/group"/> -->
-     </component>
-     <component name="VideoEditorCommon" long-name="Video Editor Common">
-      <!-- <unit bldFile="app/videoeditor/videditor/VideoEditorCommon/group"/> -->
-     </component>
-     <component name="VideoEditorUiComponents" long-name="Video Editor UI Components">
-      <!-- <unit bldFile="app/videoeditor/videditor/VideoEditorUiComponents/group"/> -->
-     </component>
-     <component name="VideoProvider" long-name="Video Provider">
-      <!-- <unit bldFile="app/videoeditor/videditor/VideoProvider/group"/> -->
-     </component>
-    </collection>
-    <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-     <component name="audioeditorengine" long-name="Audio Editor Engine">
-      <!-- <unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/> -->
-     </component>
-     <component name="avcedit" long-name="Avcedit">
-      <!-- <unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/> -->
-     </component>
-     <component name="h263decoder" long-name="H263 Decoder">
-      <!-- <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/> -->
-     </component>
-     <component name="mp3aacManipLib" long-name="Mp3aac Manip Lib">
-      <!-- <unit bldFile="app/videoeditor/videoeditorengine/mp3aacManipLib/group"/> -->
-     </component>
-     <component name="vedengine" long-name="Ved Engine">
-      <!-- <unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/> -->
-     </component>
-     <component name="vedtranscoder" long-name="Ved Transcoder">
-      <!-- <unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Gallery Apps" level="apps" name="gallery" levels="app">
-    <collection name="mediagallery" long-name="Media Gallery" level="app">
-     <component name="MediaGallery2" long-name="Media Gallery 2">
-      <!-- <unit bldFile="app/gallery/mediagallery/MediaGallery2/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Video Player Apps" level="apps" name="videoplayer" levels="support apps">
-    <collection name="lwplayer" long-name="LW Player" level="apps">
-     <component name="LWPlayer.exe=binary" long-name="LW Player">
-      <!-- <unit bldFile="app/videoplayer/lwplayer/LWPlayer.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="mediaplayer" long-name="Media Player" level="apps">
-     <component name="MPEngine.dll=binary" long-name="MP Engine">
-      <!-- <unit bldFile="app/videoplayer/mediaplayer/MPEngine.dll=binary/group"/> -->
-     </component>
-     <component name="MPFileDetailsDialog.dll=binary">
-      <!-- <unit bldFile="app/videoplayer/mediaplayer/MPFileDetailsDialog.dll=binary/group"/> -->
-     </component>
-     <component name="MPRecognizer.dll=binary">
-      <!-- <unit bldFile="app/videoplayer/mediaplayer/MPRecognizer.dll=binary/group"/> -->
-     </component>
-     <component name="MediaPlayer.exe=binary">
-      <!-- <unit bldFile="app/videoplayer/mediaplayer/MediaPlayer.exe=binary/group"/> -->
+    <collection name="officeappeng" long-name="Office App Engines" level="engine">
+     <component name="datamodel" long-name="Data Engine" introduced="5.0" deprecated="9.3">
+      <unit bldFile="app\organizer\officeappeng\datamodel\group" mrp="app\organizer\officeappeng\datamodel\group\app-engines_damodel.mrp"/>
+     </component>
+     <component name="sheeteng" long-name="Sheet Engine" introduced="5.0" deprecated="9.3">
+      <unit bldFile="app\organizer\officeappeng\sheeteng\group" mrp="app\organizer\officeappeng\sheeteng\group\app-engines_sheng.mrp"/>
+     </component>
+     <component name="charteng" long-name="Chart" introduced="5.0" deprecated="9.3" class="test">
+      <unit mrp="app\organizer\officeappeng\charteng\group\app-engines_chart.mrp"/>
+     </component>
+     <component name="wordeng" long-name="Word Engine" introduced="5.0" deprecated="9.3">
+      <unit bldFile="app\organizer\officeappeng\wordeng\group" mrp="app\organizer\officeappeng\wordeng\group\app-engines_wpeng.mrp"/>
      </component>
     </collection>
-    <collection name="mediasettings" long-name="Media Settings" level="support">
-     <component name="GSVideoPlugin.dll=binary">
-      <!-- <unit bldFile="app/videoplayer/mediasettings/GSVideoPlugin.dll=binary/group"/> -->
-     </component>
-     <component name="MPSettBase.dll=binary">
-      <!-- <unit bldFile="app/videoplayer/mediasettings/MPSettBase.dll=binary/group"/> -->
-     </component>
-     <component name="MPSettROPModel.dll=binary">
-      <!-- <unit bldFile="app/videoplayer/mediasettings/MPSettROPModel.dll=binary/group"/> -->
-     </component>
-     <component name="MediaSettings.exe=binary">
-      <!-- <unit bldFile="app/videoplayer/mediasettings/MediaSettings.exe=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Photos" level="apps" name="photos" levels="support fw ui app">
-    <collection name="activedataplugin" long-name="Active Data Plugin" level="fw">
-     <component name="glxactivedataplugin.dll=binary">
-      <!-- <unit bldFile="app/photos/activedataplugin/glxactivedataplugin.dll=binary/group"/> -->
-     </component>
-     <component name="test" long-name="Test">
-      <!-- <unit bldFile="app/photos/activedataplugin/test/group"/> -->
-     </component>
-    </collection>
-    <collection name="collectionframework" long-name="Collection Framework" level="fw">
-     <component name="datasource" long-name="Data Source">
-      <!-- <unit bldFile="app/photos/collectionframework/datasource/group"/> -->
-     </component>
-     <component name="plugins">
-      <!-- <unit bldFile="app/photos/collectionframework/plugins/group"/> -->
-     </component>
-     <component name="test">
-      <!-- <unit bldFile="app/photos/collectionframework/test/group"/> -->
-     </component>
-     <component name="thumbnailcreator" long-name="Thumbnail Creator">
-      <!-- <unit bldFile="app/photos/collectionframework/thumbnailcreator/group"/> -->
-     </component>
-    </collection>
-    <collection name="common" long-name="Common" level="support">
-     <component name="glxcommon.dll=binary">
-      <!-- <unit bldFile="app/photos/common/glxcommon.dll=binary/group"/> -->
-     </component>
-     <component name="test">
-      <!-- <unit bldFile="app/photos/common/test/group"/> -->
-     </component>
-    </collection>
-    <collection name="commonui" long-name="Common UI" level="ui">
-     <component name="glxcommonui.dll=binary">
-      <!-- <unit bldFile="app/photos/commonui/glxcommonui.dll=binary/group"/> -->
-     </component>
-     <component name="test">
-      <!-- <unit bldFile="app/photos/commonui/test/group"/> -->
-     </component>
-    </collection>
-    <collection name="contentharvesterplugin" long-name="Content Harvester Plugin" level="ui">
-     <component name="glxcontentharvesterplugin.dll=binary">
-      <!-- <unit bldFile="app/photos/contentharvesterplugin/glxcontentharvesterplugin.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="controllers" long-name="Controllers" level="ui">
-     <component name="collectionmanager" long-name="Collection Manager">
-      <!-- <unit bldFile="app/photos/controllers/collectionmanager/group"/> -->
-     </component>
-     <component name="fetcher" long-name="Fetcher">
-      <!-- <unit bldFile="app/photos/controllers/fetcher/group"/> -->
-     </component>
-    </collection>
-    <collection name="gallery" long-name="Gallery" level="app">
-     <component name="glx.exe=binary">
-      <!-- <unit bldFile="app/photos/gallery/glx.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="logging" long-name="Logging" level="support">
-     <component name="app">
-      <!-- <unit bldFile="app/photos/logging/app/group"/> -->
-     </component>
-     <component name="client">
-      <!-- <unit bldFile="app/photos/logging/client/group"/> -->
-     </component>
-    </collection>
-    <collection name="photossuite" long-name="Photos Suite" level="ui">
-     <component name="dummyC.dll=binary">
-      <!-- <unit bldFile="app/photos/photossuite/dummyC.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="slideshow" long-name="Slideshow" level="app">
-     <component name="engine">
-      <!-- <unit bldFile="app/photos/slideshow/engine/group"/> -->
-     </component>
-     <component name="settingsdialog" long-name="Settings Dialog">
-      <!-- <unit bldFile="app/photos/slideshow/settingsdialog/group"/> -->
-     </component>
-     <component name="view" long-name="View">
-      <!-- <unit bldFile="app/photos/slideshow/view/group"/> -->
-     </component>
-    </collection>
-    <collection name="test" long-name="Test" level="app">
-     <component name="viewframework">
-      <!-- <unit bldFile="app/photos/test/viewframework/group"/> -->
-     </component>
-    </collection>
-    <collection name="viewframework" long-name="View Framework" level="fw">
-     <component name="commandhandlers" long-name="Command Handlers">
-      <!-- <unit bldFile="app/photos/viewframework/commandhandlers/group"/> -->
-     </component>
-     <component name="dataprovider" long-name="Data Provider">
-      <!-- <unit bldFile="app/photos/viewframework/dataprovider/group"/> -->
-     </component>
-     <component name="drmutility">
-      <!-- <unit bldFile="app/photos/viewframework/drmutility/group"/> -->
-     </component>
-     <component name="layouts" long-name="Layouts">
-      <!-- <unit bldFile="app/photos/viewframework/layouts/group"/> -->
-     </component>
-     <component name="medialists" long-name="Media Lists">
-      <!-- <unit bldFile="app/photos/viewframework/medialists/group"/> -->
-     </component>
-     <component name="plugins">
-      <!-- <unit bldFile="app/photos/viewframework/plugins/group"/> -->
-     </component>
-     <component name="texturemanager" long-name="Texture Manager">
-      <!-- <unit bldFile="app/photos/viewframework/texturemanager/group"/> -->
-     </component>
-     <component name="tvout" long-name="TV Out">
-      <!-- <unit bldFile="app/photos/viewframework/tvout/group"/> -->
-     </component>
-     <component name="uiutilities" long-name="UI Utilities">
-      <!-- <unit bldFile="app/photos/viewframework/uiutilities/group"/> -->
-     </component>
-     <component name="views">
-      <!-- <unit bldFile="app/photos/viewframework/views/group"/> -->
-     </component>
-     <component name="visuallistmanager" long-name="Visuallist Manager">
-      <!-- <unit bldFile="app/photos/viewframework/visuallistmanager/group"/> -->
+    <collection name="pimappsupport" long-name="PIM Application Support" level="support">
+     <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5">
+      <unit bldFile="app\organizer\pimappsupport\vcardandvcal\group" mrp="app\organizer\pimappsupport\vcardandvcal\group\app-services_versit.mrp"/>
+     </component>
+     <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1">
+      <unit bldFile="app\organizer\pimappsupport\chinesecalendarconverter\group" mrp="app\organizer\pimappsupport\chinesecalendarconverter\group\app-services_calcon.mrp"/>
+     </component>
+     <component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91">
+      <unit bldFile="app\organizer\pimappsupport\chinesecalendaralg\group" mrp="app\organizer\pimappsupport\chinesecalendaralg\group\app-services_chinesecalendaralgorithm.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Video Center" level="apps" name="videocenter" levels="eng ui app">
-    <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
-     <component name="mpx_common_api" long-name="MPX Common_Api">
-      <!-- <unit bldFile="app/videocenter/mpxmyvideoscollection/mpx_common_api/group"/> -->
-     </component>
-     <component name="vcxmyvideoscollectionplugin.dll=binary">
-      <!-- <unit bldFile="app/videocenter/mpxmyvideoscollection/vcxmyvideoscollectionplugin.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="nsmyvideosview" long-name="NS My Videos View" level="app">
-     <component name="nsmyvideos" long-name="NS Myvideos">
-      <!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideos/group"/> -->
-     </component>
-     <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin">
-      <!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="vccommon" long-name="Video Center Common" level="eng">
-     <component name="help_rel6" long-name="Help REl6">
-      <!-- <unit bldFile="app/videocenter/vccommon/help_rel6/group"/> -->
-     </component>
-     <component name="notifierplugins" long-name="Notifier Plugins">
-      <!-- <unit bldFile="app/videocenter/vccommon/notifierplugins/group"/> -->
-     </component>
-     <component name="utils">
-      <!-- <unit bldFile="app/videocenter/vccommon/utils/group"/> -->
-     </component>
-     <component name="viewmessageutility" long-name="View Message Utility">
-      <!-- <unit bldFile="app/videocenter/vccommon/viewmessageutility/group"/> -->
-     </component>
-    </collection>
-    <collection name="vcengines" long-name="Video Center Engines" level="eng">
-     <component name="livetvepgengine" long-name="Live TV EPG Engine">
-      <!-- <unit bldFile="app/videocenter/vcengines/livetvepgengine/group"/> -->
-     </component>
-     <component name="livetvschedulerplugin" long-name="Live TV Scheduler Plugin">
-      <!-- <unit bldFile="app/videocenter/vcengines/livetvschedulerplugin/group"/> -->
-     </component>
-     <component name="livetvutils" long-name="Live TV Utils">
-      <!-- <unit bldFile="app/videocenter/vcengines/livetvutils/group"/> -->
-     </component>
-     <component name="mrssplugin" long-name="Mrss Plugin">
-      <!-- <unit bldFile="app/videocenter/vcengines/mrssplugin/group"/> -->
-     </component>
-     <component name="networkengine" long-name="Network Engine">
-      <!-- <unit bldFile="app/videocenter/vcengines/networkengine/group"/> -->
-     </component>
-     <component name="scheduleddlplugin" long-name="Scheduled Download Plugin">
-      <!-- <unit bldFile="app/videocenter/vcengines/scheduleddlplugin/group"/> -->
-     </component>
-     <component name="server">
-      <!-- <unit bldFile="app/videocenter/vcengines/server/group"/> -->
-     </component>
-     <component name="serviceprovisioning" long-name="Service Provisioning">
-      <!-- <unit bldFile="app/videocenter/vcengines/serviceprovisioning/group"/> -->
-     </component>
-     <component name="tunerengine" long-name="Tuner Engine">
-      <!-- <unit bldFile="app/videocenter/vcengines/tunerengine/group"/> -->
-     </component>
-     <component name="voddownloadplugin" long-name="VOD Download Plugin">
-      <!-- <unit bldFile="app/videocenter/vcengines/voddownloadplugin/group"/> -->
-     </component>
-     <component name="xmltvplugin" long-name="XML TV Plugin">
-      <!-- <unit bldFile="app/videocenter/vcengines/xmltvplugin/group"/> -->
+   <block name="messaging" long-name="Messaging Apps" level="apps" levels="1 2">
+    <collection name="mobilemessaging" long-name="Mobile Messaging" level="2">
+     <component name="smsmtm" long-name="SMS MTM" plugin="Y">
+      <unit bldFile="app\messaging\mobilemessaging\smsmtm\multimode\Group" mrp="app\messaging\mobilemessaging\smsmtm\multimode\Group\messaging_sms_multimode.mrp"/>
      </component>
     </collection>
-    <collection name="vcnsuis" long-name="Video Center NS UIs" level="ui">
-     <component name="vcnsahplugin" long-name="VCNS Action Handler Plugin">
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsahplugin/group"/> -->
-     </component>
-     <component name="vcnsapp" long-name="VCNS App">
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsapp/group"/> -->
-     </component>
-     <component name="vcnschplugin" long-name="VCNS Content Harvester Plugin">
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnschplugin/group"/> -->
-     </component>
-     <component name="vcnslivetv" long-name="VCNS Live TV">
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnslivetv/group"/> -->
-     </component>
-     <component name="vcnssettings" long-name="VCNS Settings">
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnssettings/group"/> -->
-     </component>
-     <component name="vcnsvodui" long-name="VCNS VOD UI">
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/group"/> -->
-     </component>
-    </collection>
-    <collection name="vcplayer" long-name="Video Center Player" level="app">
-     <component name="core">
-      <!-- <unit bldFile="app/videocenter/vcplayer/core/group"/> -->
-     </component>
-     <component name="defaultview" long-name="Default View">
-      <!-- <unit bldFile="app/videocenter/vcplayer/defaultview/group"/> -->
-     </component>
-     <component name="plugins">
-      <!-- <unit bldFile="app/videocenter/vcplayer/plugins/group"/> -->
-     </component>
-     <component name="utils">
-      <!-- <unit bldFile="app/videocenter/vcplayer/utils/group"/> -->
-     </component>
-     <component name="vcnsplayerview" long-name="VCNS Player View">
-      <!-- <unit bldFile="app/videocenter/vcplayer/vcnsplayerview/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Music Player Apps" level="apps" name="musicplayer" levels="plugins support apps">
-    <collection name="cameseui" long-name="Camese UI" level="support">
-     <component name="browserview" long-name="Browser View">
-      <!-- <unit bldFile="app/musicplayer/cameseui/browserview/group"/> -->
-     </component>
-     <component name="browserviewplugin" long-name="Browser View Plugin">
-      <!-- <unit bldFile="app/musicplayer/cameseui/browserviewplugin/group"/> -->
-     </component>
-     <component name="common">
-      <!-- <unit bldFile="app/musicplayer/cameseui/common/group"/> -->
-     </component>
-     <component name="drmhandler" long-name="DRM Handler">
-      <!-- <unit bldFile="app/musicplayer/cameseui/drmhandler/group"/> -->
-     </component>
-    </collection>
-    <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
-     <component name="activeidle" long-name="Active Idle">
-      <!-- <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/group"/> -->
-     </component>
-     <component name="app">
-      <!-- <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/> -->
-     </component>
-     <component name="commonui">
-      <!-- <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/> -->
-     </component>
-     <component name="mediakeyhandler" long-name="Mediakey Handler">
-      <!-- <unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/> -->
-     </component>
-     <component name="metadatahandler" long-name="Metadata Handler">
-      <!-- <unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/> -->
-     </component>
-     <component name="mpvolumepopup" long-name="MP Volume PopUp">
-      <!-- <unit bldFile="app/musicplayer/mpxmusicplayer/mpvolumepopup/group"/> -->
+    <collection name="mmsengine" long-name="MMS Engine" level="1">
+     <component name="mmssettings" long-name="MMS Settings" introduced="9.2">
+      <unit bldFile="app\messaging\mmsengine\mmssettings\group\" mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings.mrp"/>
+     </component>
+     <component name="mmsconf" long-name="MMS Configuration">
+      <unit mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings-config.mrp"/>
      </component>
     </collection>
-    <collection name="musichomescreen" long-name="Music Homescreen" level="apps">
-     <component name="data">
-      <!-- <unit bldFile="app/musicplayer/musichomescreen/data/group"/> -->
-     </component>
-     <component name="dummyMusic.dll=binary">
-      <!-- <unit bldFile="app/musicplayer/musichomescreen/dummyMusic.dll=binary/group"/> -->
-     </component>
-     <component name="mcpmusicplayer" long-name="MCP Music Player">
-      <!-- <unit bldFile="app/musicplayer/musichomescreen/mcpmusicplayer/group"/> -->
-     </component>
-     <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher">
-      <!-- <unit bldFile="app/musicplayer/musichomescreen/mpxcollectionpublisher/group"/> -->
-     </component>
-     <component name="musiccontentpublisher" long-name="Music Content Publisher">
-      <!-- <unit bldFile="app/musicplayer/musichomescreen/musiccontentpublisher/group"/> -->
-     </component>
-     <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin">
-      <!-- <unit bldFile="app/musicplayer/musichomescreen/musicplayeractionhandlerplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="musicvisualization" long-name="Music Visualization" level="plugins">
-     <component name="MusicVisualizationPlugin.dll=binary">
-      <!-- <unit bldFile="app/musicplayer/musicvisualization/MusicVisualizationPlugin.dll=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="serviceplugins" long-name="Service Plugins" level="plugins">
-     <component name="collectionplugins" long-name="Collection Plugins">
-      <!-- <unit bldFile="app/musicplayer/serviceplugins/collectionplugins/group"/> -->
-     </component>
-     <component name="playbackplugins" long-name="Playback Plugins">
-      <!-- <unit bldFile="app/musicplayer/serviceplugins/playbackplugins/group"/> -->
-     </component>
-     <component name="playlistplugins" long-name="Playlist Plugins">
-      <!-- <unit bldFile="app/musicplayer/serviceplugins/playlistplugins/group"/> -->
-     </component>
-     <component name="screensaverplugins" long-name="Screensaver Plugins">
-      <!-- <unit bldFile="app/musicplayer/serviceplugins/screensaverplugins/group"/> -->
-     </component>
-     <component name="visualizationplugins" long-name="Visualization Plugins">
-      <!-- <unit bldFile="app/musicplayer/serviceplugins/visualizationplugins/group"/> -->
-     </component>
-    </collection>
-    <collection name="viewplugins" long-name="View Plugins" level="plugins">
-     <component name="plugins">
-      <!-- <unit bldFile="app/musicplayer/viewplugins/plugins/group"/> -->
-     </component>
-     <component name="views">
-      <!-- <unit bldFile="app/musicplayer/viewplugins/views/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Radio Apps" level="apps" name="radio" levels="engine ui">
-    <collection name="fmradio" long-name="FM Radio" level="ui">
-     <component name="FMRadio.exe=binary" long-name="FMRadio">
-      <!-- <unit bldFile="app/radio/fmradio/FMRadio.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="fmradioengine" long-name="FM Radio Engine" level="engine">
-     <component name="FMRadioEngine.dll=binary">
-      <!-- <unit bldFile="app/radio/fmradioengine/FMRadioEngine.dll=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Voice Recorder Apps" level="apps" name="voicerec" levels="empty 1">
-    <collection name="voicerecorder" long-name="Voice Recorder" level="1">
-     <component name="gsplugin">
-      <!-- <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/> -->
-     </component>
-     <component name="VoiceRecorderUtils.dll=binary">
-      <!-- <unit bldFile="app/voicerec/voicerecorder/VoiceRecorderUtils.dll=binary/group"/> -->
-     </component>
-     <component name="VoiceRecorderRecView.dll=binary">
-      <!-- <unit bldFile="app/voicerec/voicerecorder/VoiceRecorderRecView.dll=binary/group"/> -->
-     </component>
-     <component name="NewService.dll=binary">
-      <!-- <unit bldFile="app/voicerec/voicerecorder/NewService.dll=binary/group"/> -->
-     </component>
-     <component name="VoiceRecorder.exe=binary">
-      <!-- <unit bldFile="app/voicerec/voicerecorder/VoiceRecorder.exe=binary/group"/> -->
+    <collection name="messagingappbase" long-name="Messaging App Base" level="2">
+     <component name="smilparser" long-name="SMIL Parser" introduced="7.0s">
+      <unit bldFile="app\messaging\messagingappbase\smilparser\GROUP" mrp="app\messaging\messagingappbase\smilparser\GROUP\messaging_gmxml.mrp"/>
+     </component>
+     <component name="obexmtms" long-name="OBEX MTMs" plugin="Y" introduced="7.0s">
+      <unit bldFile="app\messaging\messagingappbase\obexmtms\Group" mrp="app\messaging\messagingappbase\obexmtms\Group\messaging_obex.mrp"/>
      </component>
     </collection>
-   </block>
-   <block long-name="Screen Saver Apps" level="apps" name="screensaver" levels="eng plugin">
-    <collection name="screensaver.exe=binary" long-name="Screen Saver" level="plugin">
-     <component name="screensaver.exe=binary compo">
-      <!-- <unit bldFile="app/screensaver/screensaver.exe=binary/screensaver.exe=binary compo/group"/> -->
-     </component>
-    </collection>
-    <collection name="scrsaver" long-name="Screen Saver Plugins" level="eng">
-     <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin">
-      <!-- <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/> -->
-     </component>
-     <component name="scrsaverplugins" long-name="Screen Saver Plugins">
-      <!-- <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Homescreen Apps" level="apps" name="homescreen" levels="fw apps">
-    <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
-     <component name="activeidle3" long-name="Active Idle 3">
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/group"/> -->
-     </component>
-     <component name="exths" long-name="ExtHS">
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/exths/group"/> -->
-     </component>
-     <component name="hsplugins" long-name="HS Plugins">
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/group"/> -->
-     </component>
-     <component name="nativeuicontroller" long-name="Native UI Controller">
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/> -->
-     </component>
-    </collection>
-    <collection name="menufw" long-name="Menu Framework">
-     <component name="hierarchynavigator" long-name="Hierarchy Navigator">
-      <!-- <unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/> -->
-     </component>
-     <component name="menufwui" long-name="Menu Framework UI">
-      <!-- <unit bldFile="app/homescreen/menufw/menufwui/group"/> -->
-     </component>
-     <component name="menusuites" long-name="Menu Suites">
-      <!-- <unit bldFile="app/homescreen/menufw/menusuites/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Image Viewer UIs" level="services" name="imgvieweruis" levels="app">
-    <collection name="imageviewer" long-name="Image Viewer" level="app">
-     <component name="ImageViewer.exe=binary">
-      <!-- <unit bldFile="app/imgvieweruis/imageviewer/ImageViewer.exe=binary/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Graphics UIs" level="services" name="graphicsuis" levels="util ui">
-    <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
-     <component name="SvgtViewerPlugin" long-name="SVGT Viewer Plugin">
-      <!-- <unit bldFile="app/graphicsuis/svgtviewer/SvgtViewerPlugin/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Help Apps" level="apps" name="helps" levels="eng ui">
-    <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
-     <component name="AiwHelpProvider" long-name="Aiw Help Provider">
-      <!-- <unit bldFile="app/helps/csxhelp/AiwHelpProvider/group"/> -->
-     </component>
-     <component name="HelpEngine.dll=binary">
-      <!-- <unit bldFile="app/helps/csxhelp/HelpEngine.dll=binary/group"/> -->
-     </component>
-     <component name="cshelp.exe=binary" long-name="Cs Help">
-      <!-- <unit bldFile="app/helps/csxhelp/cshelp.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="symhelp" long-name="Symbian Help" level="eng">
-     <component name="cshlpcmpbackend" long-name="CSHelp Compiler Backend">
-      <unit mrp="app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
-     </component>
-     <component name="cshlpcmpfrontend" long-name="CSHelp Compiler Frontend">
-      <unit bldFile="app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/>
-     </component>
-     <component name="cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt">
-      <unit bldFile="app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
-     </component>
-     <component name="helpmodel" long-name="Help" introduced="6.0">
-      <unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-     </component>
-     <component name="mbmcodec" long-name="MBM Codec" filter="gt">
-      <unit bldFile="app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block long-name="Profile" level="apps" name="profile" levels="app">
-    <collection name="profilesapplication" long-name="Profiles Application" level="app">
-     <component name="Profiles" long-name="Profiles">
-      <!-- <unit bldFile="app/profile/profilesapplication/Profiles/group"/> -->
+    <collection name="email" long-name="Email" level="1">
+     <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" plugin="Y">
+      <unit bldFile="app\messaging\email\pop3andsmtpmtm\group" mrp="app\messaging\email\pop3andsmtpmtm\group\messaging_email.mrp"/>
+     </component>
+     <component name="imap4mtm" long-name="IMAP4 MTM" plugin="Y" introduced="9.2">
+      <unit bldFile="app\messaging\email\imap4mtm\group" mrp="app\messaging\email\imap4mtm\group\messaging_email_imap.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Speech Recognition UIs" level="services" name="speechsrv" levels="engine framework ui">
-    <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-     <component name="devasr" long-name="Audio Recording and Speech Recognition">
-      <!-- <unit bldFile="app/speechsrv/srsf/devasr/group"/> -->
-     </component>
-     <component name="devtts" long-name="Text to Speech">
-      <!-- <unit bldFile="app/speechsrv/srsf/devtts/group"/> -->
-     </component>
-     <component name="nssvasapi" long-name="NSS VAS API">
-      <!-- <unit bldFile="app/speechsrv/srsf/nssvasapi/group"/> -->
-     </component>
-     <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler">
-      <!-- <unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/> -->
-     </component>
-     <component name="profileobserverplugin" long-name="Profile Observer Plugin">
-      <!-- <unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/> -->
-     </component>
-     <component name="sicc" long-name="Speaker Independent Custom Commands">
-      <!-- <unit bldFile="app/speechsrv/srsf/sicc/group"/> -->
-     </component>
-     <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data">
-      <!-- <unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/> -->
-     </component>
-     <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin">
-      <!-- <unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/> -->
-     </component>
-     <component name="siutility" long-name="Speaker Independent Utility">
-      <!-- <unit bldFile="app/speechsrv/srsf/siutility/group"/> -->
-     </component>
-     <component name="speechsynthesis" long-name="Speech Synthesis">
-      <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/group"/> -->
-     </component>
-     <component name="ttscommon" long-name="TTS Common">
-      <!-- <unit bldFile="app/speechsrv/srsf/ttscommon/group"/> -->
-     </component>
-     <component name="ttscontrollerplugin" long-name="TTS Controller Plugin">
-      <!-- <unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/> -->
-     </component>
-     <component name="ttscustomcommands" long-name="TTS Custom Commands">
-      <!-- <unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/> -->
-     </component>
-     <component name="ttsutility" long-name="TTS Utility">
-      <!-- <unit bldFile="app/speechsrv/srsf/ttsutility/group"/> -->
-     </component>
-     <component name="vcexecutorapp" long-name="Voice Command Executor Application">
-      <!-- <unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/> -->
-     </component>
-     <component name="vcommandexecutor" long-name="Voice Command Executor">
-      <!-- <unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/> -->
-     </component>
-     <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer">
-      <!-- <unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/> -->
-     </component>
-     <component name="vcommandhandler" long-name="Voice Command Handler">
-      <!-- <unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/> -->
-     </component>
-     <component name="vcommandmanager" long-name="Voice Command Manager">
-      <!-- <unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/> -->
-     </component>
-     <component name="vuiphandler" long-name="Voice UI Plugin Handler">
-      <!-- <unit bldFile="app/speechsrv/srsf/vuiphandler/group"/> -->
-     </component>
-    </collection>
-    <collection name="voiceui" long-name="Voice UI" level="ui">
-     <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider">
-      <!-- <unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/> -->
-     </component>
-     <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation">
-      <!-- <unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/> -->
-     </component>
-     <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin">
-      <!-- <unit bldFile="app/speechsrv/voiceui/vccontrolpanelplugin/group"/> -->
-     </component>
-     <component name="vcommand" long-name="VCommand">
-      <!-- <unit bldFile="app/speechsrv/voiceui/vcommand/group"/> -->
-     </component>
-     <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition">
-      <!-- <unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Web UIs" level="services" name="webuis" levels="ui app">
-    <collection name="browserplugins" long-name="Browser Plugins" level="app">
-     <component name="browseraudiovideoplugin" long-name="Browser Audio Video Plugin">
-      <!-- <unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/> -->
-     </component>
-     <component name="browsergpsplugin" long-name="Browser GPS Plugin">
-      <!-- <unit bldFile="app/webuis/browserplugins/browsergpsplugin/group"/> -->
-     </component>
-     <component name="browsersysteminfoplugin" long-name="Browser System Info Plugin">
-      <!-- <unit bldFile="app/webuis/browserplugins/browsersysteminfoplugin/group"/> -->
-     </component>
-     <component name="browserwidgetutilsplugin" long-name="Browser Widget Utils Plugin">
-      <!-- <unit bldFile="app/webuis/browserplugins/browserwidgetutilsplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="browserui" long-name="Browser UI" level="app">
-     <component name="BROWSER" long-name="Browser">
-      <!-- <unit bldFile="app/webuis/browserui/BROWSER/group"/> -->
-     </component>
-     <component name="OperatorMenu" long-name="Operator Menu">
-      <!-- <unit bldFile="app/webuis/browserui/OperatorMenu/group"/> -->
-     </component>
-     <component name="VideoServices" long-name="Video Services">
-      <!-- <unit bldFile="app/webuis/browserui/VideoServices/group"/> -->
-     </component>
-     <component name="webuis_plat" long-name="Web UIs Platform">
-      <!-- <unit bldFile="app/webuis/browserui/webuis_plat/group"/> -->
-     </component>
-     <component name="webuis_pub" long-name="Web UIs Public">
-      <!-- <unit bldFile="app/webuis/browserui/webuis_pub/group"/> -->
-     </component>
-    </collection>
-    <collection name="pushmtm" long-name="Push MTM">
-     <component name="Plugins">
-      <!-- <unit bldFile="app/webuis/pushmtm/Plugins/group"/> -->
-     </component>
-     <component name="PushMtmCliSrv.dll=binary">
-      <!-- <unit bldFile="app/webuis/pushmtm/PushMtmCliSrv.dll=binary/group"/> -->
-     </component>
-     <component name="PushMtmUi.dll=binary">
-      <!-- <unit bldFile="app/webuis/pushmtm/PushMtmUi.dll=binary/group"/> -->
-     </component>
-     <component name="PushMtmUtil.dll=binary">
-      <!-- <unit bldFile="app/webuis/pushmtm/PushMtmUtil.dll=binary/group"/> -->
-     </component>
-     <component name="PushViewer.exe=binary">
-      <!-- <unit bldFile="app/webuis/pushmtm/PushViewer.exe=binary/group"/> -->
+   <block name="helps" long-name="Help Apps" level="apps" levels="eng ui">
+    <collection name="symhelp" long-name="Symbian Help" level="eng">
+     <component name="cshlpcmpbackend" long-name="CSHelp Compiler Backend">
+      <unit mrp="app\helps\symhelp\cshlpcmpbackend\group\tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
+     </component>
+     <component name="cshlpcmpfrontend" long-name="CSHelp Compiler Frontend">
+      <unit bldFile="app\helps\symhelp\cshlpcmpfrontend\group" mrp="app\helps\symhelp\cshlpcmpfrontend\group\tools_sdk_eng_cshlpcmp_frontend.mrp"/>
+     </component>
+     <component name="cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt">
+      <unit bldFile="app\helps\symhelp\cshlpcmpgui\group" mrp="app\helps\symhelp\cshlpcmpgui\group\tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
+     </component>
+     <component name="mbmcodec" long-name="MBM Codec" filter="gt">
+      <unit bldFile="app\helps\symhelp\mbmcodec\group" mrp="app\helps\symhelp\mbmcodec\group\tools_sdk_eng_mbmcodec.mrp"/>
+     </component>
+     <component name="helpmodel" long-name="Help" introduced="6.0">
+      <unit bldFile="app\helps\symhelp\helpmodel\group" mrp="app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
      </component>
     </collection>
    </block>
-   <block long-name="Java" level="services" name="java" levels="framework util generic rt">
-    <collection name="javaextensions" long-name="Java Extensions" level="generic">
-     <component name="eswt" long-name="Eswt">
-      <!-- <unit bldFile="app/java/javaextensions/eswt/group"/> -->
-     </component>
-     <component name="jsr" long-name="JSR">
-      <!-- <unit bldFile="app/java/javaextensions/jsr/group"/> -->
-     </component>
-     <component name="supplements" long-name="Supplements">
-      <!-- <unit bldFile="app/java/javaextensions/supplements/group"/> -->
-     </component>
-    </collection>
-    <collection name="javainstaller" long-name="Java Installer" level="generic">
-     <component name="iferecognizers" long-name="Ife Recognizers">
-      <!-- <unit bldFile="app/java/javainstaller/iferecognizers/group"/> -->
-     </component>
-     <component name="installationfrontend" long-name="Installation Frontend">
-      <!-- <unit bldFile="app/java/javainstaller/installationfrontend/group"/> -->
-     </component>
-     <component name="installplugins" long-name="Install Plugins">
-      <!-- <unit bldFile="app/java/javainstaller/installplugins/group"/> -->
-     </component>
-     <component name="javarightslistener" long-name="Java Rights Listener">
-      <!-- <unit bldFile="app/java/javainstaller/javarightslistener/group"/> -->
-     </component>
-     <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer">
-      <!-- <unit bldFile="app/java/javainstaller/midp2iferecognizer/group"/> -->
-     </component>
-     <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin">
-      <!-- <unit bldFile="app/java/javainstaller/midp2otadownloadplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="javalegacy" long-name="Java Legacy" level="util">
-     <component name="JcfCommon" long-name="Jcf Common">
-      <!-- <unit bldFile="app/java/javalegacy/JcfCommon/group"/> -->
-     </component>
-     <component name="j2me" long-name="J2ME">
-      <!-- <unit bldFile="app/java/javalegacy/j2me/group"/> -->
-     </component>
-    </collection>
-    <collection name="javamanager" long-name="Java Manager" level="framework">
-     <component name="javabackup" long-name="Java Backup">
-      <!-- <unit bldFile="app/java/javamanager/javabackup/group"/> -->
-     </component>
-     <component name="javadrmmanager" long-name="Java DRM Manager">
-      <!-- <unit bldFile="app/java/javamanager/javadrmmanager/group"/> -->
-     </component>
-     <component name="javaregistry" long-name="Java Registry">
-      <!-- <unit bldFile="app/java/javamanager/javaregistry/group"/> -->
-     </component>
-     <component name="javasettings" long-name="Java Settings">
-      <!-- <unit bldFile="app/java/javamanager/javasettings/group"/> -->
-     </component>
-    </collection>
-    <collection name="javaruntime" long-name="Java Runtime" level="rt">
-     <component name="common">
-      <!-- <unit bldFile="app/java/javaruntime/common/group"/> -->
-     </component>
-     <component name="eventserver" long-name="Event Server">
-      <!-- <unit bldFile="app/java/javaruntime/eventserver/group"/> -->
-     </component>
-     <component name="jvm" long-name="JVM">
-      <!-- <unit bldFile="app/java/javaruntime/jvm/group"/> -->
-     </component>
-     <component name="midp2ams" long-name="Midp2ams">
-      <!-- <unit bldFile="app/java/javaruntime/midp2ams/group"/> -->
-     </component>
-     <component name="redirserver" long-name="Redirect Server">
-      <!-- <unit bldFile="app/java/javaruntime/redirserver/group"/> -->
-     </component>
-     <component name="temp_j2me_root" long-name="Temp J2me Root">
-      <!-- <unit bldFile="app/java/javaruntime/temp_j2me_root/group"/> -->
-     </component>
-     <component name="utils">
-      <!-- <unit bldFile="app/java/javaruntime/utils/group"/> -->
-     </component>
-    </collection>
-    <collection name="javautils" long-name="Java Utils" level="util">
-     <component name="adt" long-name="ADT">
-      <!-- <unit bldFile="app/java/javautils/adt/group"/> -->
-     </component>
-     <component name="common">
-      <!-- <unit bldFile="app/java/javautils/common/group"/> -->
-     </component>
-     <component name="iconconverter" long-name="Icon Converter">
-      <!-- <unit bldFile="app/java/javautils/iconconverter/group"/> -->
-     </component>
-     <component name="integrityserver" long-name="Integrity Server">
-      <!-- <unit bldFile="app/java/javautils/integrityserver/group"/> -->
-     </component>
-     <component name="jarfiledecoder" long-name="JAR File Decoder">
-      <!-- <unit bldFile="app/java/javautils/jarfiledecoder/group"/> -->
-     </component>
-     <component name="javadrmutils" long-name="Java DRM Utils">
-      <!-- <unit bldFile="app/java/javautils/javadrmutils/group"/> -->
-     </component>
-     <component name="javapackagelookup" long-name="Java Package Lookup">
-      <!-- <unit bldFile="app/java/javautils/javapackagelookup/group"/> -->
-     </component>
-     <component name="javareader" long-name="Java Reader">
-      <!-- <unit bldFile="app/java/javautils/javareader/group"/> -->
-     </component>
-     <component name="javarecognizer" long-name="Java Recognizer">
-      <!-- <unit bldFile="app/java/javautils/javarecognizer/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="RD tools" level="services" name="rndtools" levels="app ui">
-    <collection name="creator" long-name="Creator" level="app">
-     <component name="creator.exe=binary">
-      <!-- <unit bldFile="app/rndtools/creator/creator.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="filebrowser" long-name="File Browser" level="ui">
-     <component name="FileBrowser.exe=binary">
-      <!-- <unit bldFile="app/rndtools/filebrowser/FileBrowser.exe=binary/group"/> -->
-     </component>
-     <component name="fileopclient" long-name="File Op Client">
-      <!-- <unit bldFile="app/rndtools/filebrowser/fileopclient/group"/> -->
-     </component>
-     <component name="fileopserver" long-name="File Op Server">
-      <!-- <unit bldFile="app/rndtools/filebrowser/fileopserver/group"/> -->
-     </component>
-    </collection>
-    <collection name="launcher" long-name="Launcher" level="ui">
-     <component name="Launcher.exe=binary">
-      <!-- <unit bldFile="app/rndtools/launcher/Launcher.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="loadgen" long-name="Load Generator" level="app">
-     <component name="LoadGen.exe=binary">
-      <!-- <unit bldFile="app/rndtools/loadgen/LoadGen.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="perfhooks" long-name="Performance Hooks" level="app">
-     <component name="perfhooks.exe=binary">
-      <!-- <unit bldFile="app/rndtools/perfhooks/perfhooks.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="perfmon" long-name="Performance Monitor" level="app">
-     <component name="PerfMon.exe=binary">
-      <!-- <unit bldFile="app/rndtools/perfmon/PerfMon.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="screengrabber" long-name="Screen Grabber" level="ui">
-     <component name="ScreenGrabber.exe=binary">
-      <!-- <unit bldFile="app/rndtools/screengrabber/ScreenGrabber.exe=binary/group"/> -->
-     </component>
-    </collection>
-    <collection name="stifui" long-name="STIF UI" level="ui">
-     <component name="stifui" long-name="STIF UI">
-      <!-- <unit bldFile="app/rndtools/stifui/stifui/group"/> -->
-     </component>
-     <component name="uitestserverstarter" long-name="UI Test Server Starter">
-      <!-- <unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block long-name="Techview" level="apps" span="2" name="techview" levels="services ui utils apps1 apps2 apps3">
-    <collection name="connectivityapps" long-name="Connectivity Apps" level="utils">
-     <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91">
-      <unit bldFile="app/techview/connectivityapps/connectivityfw/group" mrp="app/techview/connectivityapps/connectivityfw/group/connectivity_framework.mrp"/>
-     </component>
-     <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91">
-      <unit bldFile="app/techview/connectivityapps/connectivityservices/group" mrp="app/techview/connectivityapps/connectivityservices/group/connectivity_services.mrp"/>
-     </component>
-    </collection>
-    <collection name="controlpanel" long-name="Control Panel" level="ui">
-     <component name="cctlcolscheme" long-name="Colour Scheme Control" filter="techview">
-      <unit bldFile="app/techview/controlpanel/cctlcolscheme/group" mrp="app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
-     </component>
-     <component name="fepsetup" long-name="FEP Setup" filter="techview">
-      <unit bldFile="app/techview/controlpanel/fepsetup/group" mrp="app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
-     </component>
-     <component name="keyclickref" long-name="Key Click Ref" filter="techview">
-      <unit bldFile="app/techview/controlpanel/keyclickref/Group" mrp="app/techview/controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
-     </component>
-     <component name="soundsetup" long-name="Sound Setup" filter="techview">
-      <unit bldFile="app/techview/controlpanel/soundsetup/group" mrp="app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
-     </component>
-    </collection>
-    <collection name="datasyncapps" long-name="Data Sync Applications" level="apps2">
-     <component name="syncmlapp" long-name="SyncML App" filter="techview">
-      <unit bldFile="app/techview/datasyncapps/syncmlapp/group" mrp="app/techview/datasyncapps/syncmlapp/group/techview_syncmlapp.mrp"/>
-     </component>
-    </collection>
-    <collection name="installationapps" long-name="Installation Apps" level="apps2">
-     <component name="installapp" long-name="Install App" filter="techview">
-      <unit bldFile="app/techview/installationapps/installapp/group" mrp="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">
-      <unit bldFile="app/techview/messagingapps/messagingui/Group" mrp="app/techview/messagingapps/messagingui/Group/techview_messagingui.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkingapps" long-name="Networking Apps" level="apps1">
-     <component name="iapstatusapp" long-name="IAP Status App" filter="techview">
-      <unit bldFile="app/techview/networkingapps/iapstatusapp/group" mrp="app/techview/networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
-     </component>
-     <component name="networkingagentnotifier" long-name="Networking Agent Notifier" filter="techview" plugin="Y" introduced="7.0s">
-      <unit bldFile="app/techview/networkingapps/networkingagentnotifier/group" mrp="app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
-     </component>
-     <component name="techviewvpnui" long-name="VPN UI" filter="techview" introduced="7.0">
-      <unit bldFile="app/techview/networkingapps/techviewvpnui/group" mrp="app/techview/networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
+   <block name="techview" long-name="Techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3">
+    <collection name="buildverification" long-name="Build Verification" level="services">
+     <component name="smoketest" long-name="Smoke Test" filter="gt">
+      <unit bldFile="app\techview\buildverification\smoketest\Group" mrp="app\techview\buildverification\smoketest\Group\testtools_smoketest.mrp"/>
      </component>
     </collection>
     <collection name="networkingutils" long-name="Networking Utils" level="utils">
      <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0">
-      <unit mrp="app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp"/>
+      <unit mrp="app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>
      </component>
      <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s">
-      <unit mrp="app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp"/>
-     </component>
-    </collection>
-    <collection name="pimapps" long-name="PIM Apps" level="apps3">
-     <component name="agenda" long-name="Agenda UI" filter="techview">
-      <unit bldFile="app/techview/pimapps/agenda/group" mrp="app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
-     </component>
-     <component name="contactstechview" long-name="Contacts" filter="techview">
-      <unit bldFile="app/techview/pimapps/contactstechview/group" mrp="app/techview/pimapps/contactstechview/group/techview_contacts.mrp"/>
-     </component>
-     <component name="contacui" long-name="Contacts UI" filter="techview">
-      <unit bldFile="app/techview/pimapps/contacui/group" mrp="app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
-     </component>
-    </collection>
-    <collection name="securityapps" long-name="Security Apps" level="apps3">
-     <component name="secui" long-name="Security UI" filter="techview">
-      <unit bldFile="app/techview/securityapps/secui/group" mrp="app/techview/securityapps/secui/group/techview_secui.mrp"/>
-     </component>
-     <component name="securityupstechview" long-name="Security UPS Techview" filter="techview">
-      <unit bldFile="app/techview/securityapps/securityupstechview/group" mrp="app/techview/securityapps/securityupstechview/group/security_ups_techview.mrp"/>
-     </component>
-    </collection>
-    <collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1">
-     <component name="bluetoothui" long-name="Bluetooth UI" filter="techview">
-      <unit bldFile="app/techview/shortlinkapps/bluetoothui/group" mrp="app/techview/shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
-     </component>
-     <component name="connectui" long-name="Connect UI" filter="techview">
-      <unit bldFile="app/techview/shortlinkapps/connectui/group" mrp="app/techview/shortlinkapps/connectui/group/techview_connectui.mrp"/>
-     </component>
-     <component name="techviewusbui" long-name="USB UI" filter="techview">
-      <unit bldFile="app/techview/shortlinkapps/techviewusbui/group" mrp="app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
-     </component>
-    </collection>
-    <collection name="techviewplat" long-name="Techview Platform" level="services">
-     <component name="eikstd" long-name="EIKSTD" filter="techview">
-      <unit bldFile="app/techview/techviewplat/eikstd/group" mrp="app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
-     </component>
-     <component name="feps" long-name="FEPS" filter="techview">
-      <unit bldFile="app/techview/techviewplat/feps/group" mrp="app/techview/techviewplat/feps/group/techview_feps.mrp"/>
-     </component>
-     <component name="techviewuiklaf" long-name="UIKLAF" filter="techview">
-      <unit bldFile="app/techview/techviewplat/techviewuiklaf/GROUP" mrp="app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
-     </component>
-    </collection>
-    <collection name="techviewui" long-name="Techview UI" level="ui">
-     <component name="techviewextras" long-name="Extras" filter="techview">
-      <unit bldFile="app/techview/techviewui/techviewextras/group" mrp="app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
-     </component>
-     <component name="shell" long-name="Shell" filter="techview">
-      <unit bldFile="app/techview/techviewui/shell/group" mrp="app/techview/techviewui/shell/group/techview_shell.mrp"/>
-     </component>
-     <component name="startup" long-name="Startup" filter="techview">
-      <unit bldFile="app/techview/techviewui/startup/group" mrp="app/techview/techviewui/startup/group/techview_startup.mrp"/>
-     </component>
-     <component name="statuspane" long-name="Status Pane" filter="techview">
-      <unit bldFile="app/techview/techviewui/statuspane/group" mrp="app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
-     </component>
-    </collection>
-    <collection name="telephonyapps" long-name="Telephony Apps" level="apps1">
-     <component name="techviewphoneui" long-name="Phone UI" filter="techview">
-      <unit bldFile="app/techview/telephonyapps/techviewphoneui/group" mrp="app/techview/telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
+      <unit mrp="app\techview\networkingutils\nameresolverutility\group\networking_nslookup.mrp"/>
      </component>
     </collection>
     <collection name="testapps" long-name="Test Apps" level="utils">
      <component name="rschandler" long-name="Resource Handler" deprecated="tb92">
-      <unit mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
-     </component>
-     <component name="rschandlerui" long-name="Resource Handler UI" filter="techview">
-      <unit bldFile="app/techview/testapps/rschandler/TVResourceHandler/group" mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
-     </component>
-     <component name="statdevice" long-name="STAT Device" filter="techview">
-      <unit bldFile="os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
-     </component>
-     <component name="simpleapp" long-name="Simple App" filter="techview">
-      <unit bldFile="app/techview/testapps/simpleapp/group" mrp="app/techview/testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
-     </component>
-    </collection>
-    <collection name="toolkit" long-name="Toolkit" level="utils">
-     <component name="additionalconfigfiles" long-name="Additional Configuration Files" filter="techview">
-      <unit mrp="app/techview/toolkit/configfiles/techview_additional_cedar.mrp"/>
-     </component>
-     <component name="configfiles" long-name="Configuration Files" filter="techview">
-      <unit mrp="app/techview/toolkit/configfiles/techview_epoc_ini.mrp"/>
-     </component>
-     <component name="romimages" long-name="ROM Images" filter="techview">
-      <unit version="Future" mrp="os/deviceplatformrelease/symbianosbld/cedarutils/techview_roms_Future.mrp"/>
-      <unit version="9.4" mrp="os/deviceplatformrelease/symbianosbld/cedarutils/techview_roms_9.4.mrp"/>
-     </component>
-     <component name="romkit" long-name="ROM Kit" filter="techview">
-      <unit bldFile="app/techview/toolkit/romkit/group" mrp="app/techview/toolkit/romkit/group/techview_romkit.mrp"/>
-     </component>
-    </collection>
-    <collection name="utilityapps" long-name="Utility Apps" level="apps2">
-     <component name="helptechview" long-name="Help" filter="techview">
-      <unit bldFile="app/techview/utilityapps/helptechview/group" mrp="app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
-     </component>
-     <component name="timew" long-name="World Time" filter="techview">
-      <unit bldFile="app/techview/utilityapps/timew/group" mrp="app/techview/utilityapps/timew/group/techview_timew.mrp"/>
-     </component>
-    </collection>
-    <collection name="avapps" long-name="A/V Apps" level="apps3">
-     <component name="techviewaudio" long-name="Audio" filter="techview">
-      <unit bldFile="app/techview/avapps/techviewaudio/Group" mrp="app/techview/avapps/techviewaudio/Group/techview_audio.mrp"/>
-     </component>
-    </collection>
-    <collection name="buildverification" long-name="Build Verification" level="services">
-     <component name="smoketest" long-name="Smoke Test" filter="gt">
-      <unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-     </component>
-    </collection>
-    <collection name="sysvalidation" long-name="System Validation" level="services">
-     <component name="systemtestos" long-name="System Test OS" filter="systemtest">
-      <unit bldFile="app/techview/sysvalidation/systemtestos/Group" mrp="app/techview/sysvalidation/systemtestos/Group/systemtest_os.mrp"/>
-     </component>
-     <component name="systemtesttools" long-name="System Test Tools" filter="systemtest">
-      <unit bldFile="app/techview/sysvalidation/systemtesttools/Group" mrp="app/techview/sysvalidation/systemtesttools/Group/systemtest_tools.mrp"/>
+      <unit mrp="app\techview\testapps\rschandler\TVResourceHandler\group\Testtools_ResourceHandler_gt.mrp"/>
      </component>
     </collection>
    </block>
   </layer>
  </systemModel>
-
-
-
-
-
-
-
-
-
-</SystemDefinition>
+<SystemBuild schema="1.0.0">
+  <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>
+  <option name="SAVESPACE" abldOption="-savespace" description="Causes the removal of intermediate files" enable="Y"/>
+  <option name="NO_DEBUG" abldOption="-no_debug" description="Causes the toolchain not to generate debug tables" enable="N"/>
+  <target name="WINS" abldTarget="wins" description="MSVC Compiler"/>
+  <target name="WINS_REL" abldTarget="wins urel" description="MSVC Compiler"/>
+  <target name="WINS_DEB" abldTarget="wins udeb" description="MSVC Compiler"/>
+  <target name="WINSCW" abldTarget="winscw" description="CodeWarrior Compiler"/>
+  <target name="WINSCW_REL" abldTarget="winscw urel" description="CodeWarrior Compiler"/>
+  <target name="WINSCW_DEB" abldTarget="winscw udeb" description="CodeWarrior Compiler"/>
+  <target name="TOOLS" abldTarget="tools" description="MSVC Compiler for Tools"/>
+  <target name="TOOLS_REL" abldTarget="tools rel" description="MSVC Compiler for Tools Release mode only"/>
+  <target name="TOOLS2" abldTarget="tools2" description="MinGW GCC Compiler for Tools"/>
+  <target name="TOOLS2_REL" abldTarget="tools2 rel" description="MinGW GCC Compiler for Tools Release mode only"/>
+  <target name="ARMV5" abldTarget="armv5" description="RVCT Compiler"/>
+  <target name="ARMV5_REL" abldTarget="armv5 urel" description="RVCT Compiler"/>
+  <target name="ARMV5_DEB" abldTarget="armv5 udeb" description="RVCT Compiler"/>
+  <!-- Aditional Targets -->
+  <target name="CWTOOLS" abldTarget="cwtools" description="CodeWarrior Compiler for Tools"/> <!-- Not supported -->
+  <target name="CWTOOLS_REL" abldTarget="cwtools rel" description="CodeWarrior Compiler for Tools Release mode only"/> <!-- Not supported -->
+  <target name="GCCXML" abldTarget="gccxml" description="GCCXML for Code comparision tools"/>
+  <target name="GCCXML_REL" abldTarget="gccxml urel" description="GCCXML for Code comparision tools release mode only"/>
+  <targetList name="default_9.0" description="Main Targets for 9.0" target="WINSCW ARMV5"/>
+  <targetList name="default_9.0_rel" description="Main Targets for 9.0_rel" target="WINSCW_REL ARMV5_REL"/>
+  <targetList name="default_9.0_deb" description="Main Targets for 9.0_deb" target="WINSCW_DEB ARMV5_DEB"/>
+  <targetList name="tools" description="tools Targets" target="TOOLS"/>
+  <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
+  <targetList name="tools2" description="tools Targets" target="TOOLS2"/>
+  <targetList name="tools2_rel" description="tools Release Targets" target="TOOLS2_REL"/>
+  <targetList name="gccxml" description="tools Targets" target="GCCXML"/>
+  <targetList name="gccxml_rel" description="tools Release Targets" target="GCCXML_REL"/>
+  <!-- 9.4 configuration -->
+    <!-- tb91 configuration -->
+    <!-- tb91sf configuration -->
+  <configuration name="GT_tb91sf" description="tb91sf GT build" filter="tb91sf,gt">
+    <ref item="os"/>
+    <ref item="mw"/>
+    <ref item="app"/>
+    <task><specialInstructions name="BootStrap1" cwd="os\buildtools\sbsv1_os\e32toolp\group" command="setupprj.bat secure"/></task>
+    <task><specialInstructions name="BootStrap2" cwd="os\buildtools\sbsv1_os\e32toolp\group" command="bld.bat rel"/></task>
+    <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
+    <task><buildLayer command="abld export" unitParallel="Y"/></task>
+    <task><buildLayer command="abld makefile" targetList="tools" unitParallel="Y" targetParallel="N"/></task>
+    <task><buildLayer command="abld library" targetList="tools" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld target" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld final" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld -what build" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld -check build" targetList="tools_rel" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld makefile" targetList="tools2" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld library" targetList="tools2" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld target" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task> 
+    <task><buildLayer command="abld final" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld -what build" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld -check build" targetList="tools2_rel" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld makefile" targetList="default_9.0" unitParallel="Y" targetParallel="N"/></task>
+    <task><buildLayer command="abld resource" targetList="default_9.0" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld library" targetList="default_9.0" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld target" targetList="default_9.0" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld final" targetList="default_9.0" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld -what export" unitParallel="Y"/></task>
+    <task><buildLayer command="abld -what target" targetList="default_9.0_rel" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld -what target" targetList="default_9.0_deb" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld help" unitParallel="Y"/></task>
+    <task><buildLayer command="abld -check build" targetList="default_9.0" unitParallel="Y" targetParallel="Y"/></task>
+  </configuration>
+    <!-- 9.5 configuration -->
+    <!-- 9.6 configuration -->
+ <!-- Future configuration -->
+</SystemBuild></SystemDefinition>
\ No newline at end of file