--- a/symbian3/split/sysdefs/system_model_os.xml	Thu Sep 03 14:51:02 2009 +0100
+++ b/symbian3/split/sysdefs/system_model_os.xml	Fri Sep 04 16:15:21 2009 +0100
@@ -1,505 +1,1227 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!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
+  purpose ( optional | mandatory | development ) "optional">
+ <!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 schema="2.0.1" name="Symbian">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw"/>
-<block name="boardsupport" level="hw"/>
-<block name="buildtools" level="hw"/>
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" 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" purpose="development">
+<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" purpose="optional">
+<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="uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional">
+<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" purpose="optional">
+<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" purpose="optional">
+<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" purpose="optional">
+<unit bldFile="os\kernelhwsrv\unistore2\uiibootsupport" 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" purpose="development">
+<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" purpose="mandatory">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\kernelhwsrv\kerneltest\sdiotest" mrp="os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp"/>
+</component>
+<component name="e32utils" long-name="E32 Utilities" purpose="development">
+<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" purpose="development">
+<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" purpose="optional">
+<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" purpose="optional">
+<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" purpose="optional">
+<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" purpose="optional">
+<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" purpose="mandatory">
+<!-- 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"/>
+</component>
+<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
+<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" purpose="mandatory">
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\trace" mrp="os\kernelhwsrv\kernel\eka\drivers\trace\base_e32_drivers_trace.mrp"/>
+</component>
+<component name="cameraldd" long-name="Camera Drivers" introduced="Future" purpose="optional">
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\camerasc" mrp="os\kernelhwsrv\kernel\eka\drivers\camerasc\base_drivers_camerasc.mrp"/>
+</component>
+</collection>
+<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" purpose="optional">
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\medsd3c" mrp="os\kernelhwsrv\kernel\eka\drivers\medsd3c\base_e32_sd3c.mrp"/>
+</component>
+<component name="sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional">
+<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" purpose="optional">
+<!-- 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" purpose="optional">
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\bsp" mrp="os\kernelhwsrv\kernel\eka\drivers\bsp\base_e32_drivers_bsp.mrp"/>
+</component>
+</collection>
+<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+<component name="euser" long-name="User Library" purpose="mandatory">
+<unit bldFile="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" purpose="mandatory">
+<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" purpose="mandatory">
+<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\group" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\group\base_f32.mrp"/>
+</component>
+<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
+<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" purpose="mandatory">
+<unit bldFile="os\kernelhwsrv\userlibandfileserver\domainmgr\group" mrp="os\kernelhwsrv\userlibandfileserver\domainmgr\group\base_domain.mrp"/>
+</component>
+<component name="basedocs" long-name="Base Documentation" purpose="development" class="doc">
+<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" purpose="optional" plugin="Y">
+<unit mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srom\base_f32_srom.mrp"/>
+</component>
+<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" 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" purpose="optional" plugin="Y">
+<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage\base_f32_smassstorage.mrp"/>
+</component>
+<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
+<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\shostmassstorage" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\shostmassstorage\base_f32_shostmassstorage.mrp"/>
+</component>
+<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
+<unit bldFile="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" purpose="optional" 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" purpose="optional" 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" purpose="optional" 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" introduced="8.1b" purpose="optional" plugin="Y">
+<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660\base_f32_siso9660.mrp"/>
+</component>
+<component name="exfatfs" long-name="exFAT File System" filter="gt" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
+<!-- PLACEHOLDER="DS.1749"
+        <unit bldFile="userlibandfileserver/fileserver/exfat" mrp="userlibandfileserver/fileserver/exfat/base_f32_exfat.mrp"/>
+		-->
+</component>
+</collection>
+<collection name="halservices" long-name="HAL Services" level="framework">
+<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+<unit bldFile="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" purpose="optional">
+<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" purpose="development">
+<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" introduced="tb91" purpose="development">
+<unit mrp="os\kernelhwsrv\baseapitest\basesvs\group\basesvs.mrp"/>
+</component>
+</collection>
+<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\kernelhwsrv\kernelhwsrv_info\kernelhwsrv_metadata\kernelhwsrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 4">
+<collection name="emulator" long-name="Emulator" level="bsp">
+<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
+<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" purpose="optional">
+<unit bldFile="os\boardsupport\emulator\unistore2emulatorsupport" mrp="os\boardsupport\emulator\unistore2emulatorsupport\base_wins_unistore2.mrp"/>
+</component>
+</collection>
+<collection name="omaph4" long-name="OMAP H4" level="bsp">
+<component name="omapusbhotgdrivers" long-name="OMAP USB Host and OTG Controller Drivers" introduced="tb92" filter="gt" purpose="optional">
+<unit bldFile="os\boardsupport\omaph4\omapusbhotgdrivers" mrp="os\boardsupport\omaph4\omapusbhotgdrivers\base_omaph4hrp_usbhostotg_usbware.mrp"/>
+</component>
+<component name="omaph4bsp" long-name="OMAP H4 BSP" purpose="optional">
+<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" purpose="optional">
+<unit mrp="os\boardsupport\omaph4\h4bootloader\base_omaph4hrp_bootldr.mrp" bldFile="os\boardsupport\omaph4\h4bootloader"/>
+</component>
+<component name="omaph4flexible" long-name="OMAP H4 Flexible" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\omaph4\omaph4bsp\h4\flexible" mrp="os\boardsupport\omaph4\omaph4bsp\h4\flexible\base_omaph4hrp_flexible.mrp"/>
+</component>
+<component name="omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2" purpose="optional">
+<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" purpose="optional">
+<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" purpose="optional">
+<unit bldFile="os\boardsupport\omaph4\omaph4sdio" mrp="os\boardsupport\omaph4\omaph4sdio\base_omaph4hrp_sdio.mrp"/>
+</component>
+</collection>
+<collection name="omap3variants" long-name="OMAP3 Variants" level="bsp">
+<component name="tiomap3bsp" long-name="TI OMAP3 BSP" introduced="Future" purpose="optional">
+<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp" mrp="os\boardsupport\omap3variants\tiomap3bsp\base_tiomap3.mrp"/>
+</component>
+<component name="tiomap3unistore2" long-name="TI OMAP3 UniStore2" filter="gt" introduced="Future" purpose="optional">
+<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\unistore2" mrp="os\boardsupport\omap3variants\tiomap3bsp\base_tiomap3_unistore2.mrp"/>
+</component>
+<component name="omap3h6flexible" long-name="OMAP3 H6 Flexible" introduced="tb92" purpose="optional" class="placeholder">
+<!-- PLACEHOLDER="DEF130160"
+		<unit bldFile="omap3variants/tiomap3bsp/variant/34xx_sdp/flexible" mrp="omap3variants/tiomap3bsp/variant/34xx_sdp/flexible/base_tiomap3_flexible.mrp"/>
+	     -->
+</component>
+<component name="omap3h6uiiflexible" long-name="OMAP3 H6 UniStore2 Flexible" filter="gt" introduced="tb92" purpose="optional" class="placeholder">
+<!-- PLACEHOLDER="DEF130160"
+		<unit bldFile="omap3variants/tiomap3bsp/variant/34xx_sdp_restricted/unistore2/flexible" mrp="omap3variants/tiomap3bsp/variant/34xx_sdp_restricted/unistore2/flexible/base_tiomap3_unistore2_flexible.mrp"/>
+	     -->
+</component>
+<component name="tiomap3h6sdio" long-name="TI OMAP3 H6 SDIO" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\sdio" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\sdio\base_tiomap3_sdio.mrp"/>
+</component>
+<component name="tiomap3labbsp" long-name="TI OMAP3 LAB Baseport" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\lab" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\lab\base_tiomap3_lab.mrp"/>
+</component>
+<component name="tiomap3labsdio" long-name="TI OMAP3 LAB SDIO" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\sdio" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\sdio\base_tiomap3_lab_sdio.mrp"/>
+</component>
+<component name="tiomap3labuii" long-name="TI OMAP3 LAB UniStore2" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\unistore2" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\unistore2\base_tiomap3_lab_unistore2.mrp"/>
+</component>
+</collection>
+<collection name="naviengine" long-name="NaviEngine Baseport" level="bsp">
+<component name="naviengineusbhcd" long-name="NaviEngine USB Host Controller Driver" introduced="tb92" filter="gt" purpose="optional">
+<unit bldFile="os\boardsupport\naviengine\naviengineusbhcd" mrp="os\boardsupport\naviengine\naviengineusbhcd\base_naviengine_usbhost.mrp"/>
+</component>
+<component name="navienginebsp" long-name="NaviEngine BSP" introduced="tb92" filter="gt" purpose="optional">
+<unit bldFile="os\boardsupport\naviengine\navienginebsp\ne1_tb" mrp="os\boardsupport\naviengine\navienginebsp\base_naviengine.mrp" version="Built"/>
+</component>
+<component name="navienginebspflexible" long-name="NaviEngine BSP flexible" introduced="tb92" filter="gt" purpose="optional">
+<unit bldFile="os\boardsupport\naviengine\navienginebspflexible" mrp="os\boardsupport\naviengine\navienginebspflexible\base_naviengine_flexible.mrp" version="Built"/>
+</component>
+<component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="tb92" filter="gt" purpose="optional">
+<unit bldFile="os\boardsupport\naviengine\navienginebootldr" mrp="os\boardsupport\naviengine\navienginebootldr\base_ne1_tb_bootldr.mrp" version="Built"/>
+</component>
+<component name="naviengineunistore2" long-name="NaviEngine UniStore2" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\naviengine\naviengineunistore2" mrp="os\boardsupport\naviengine\naviengineunistore2\base_nec_naviengine_unistore2.mrp" version="Built"/>
+</component>
+<component name="naviengineunistore2flex" long-name="NaviEngine UniStore2 Flexible" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\boardsupport\naviengine\naviengineunistore2flex" mrp="os\boardsupport\naviengine\naviengineunistore2flex\base_nec_naviengine_unistore2_flexible.mrp" version="Built"/>
+</component>
+</collection>
+<collection name="haitest" long-name="HAI Test Suites" level="test">
+<component name="bspsvs" long-name="BSP Verification Suite" introduced="tb91" purpose="development">
+<unit mrp="os\boardsupport\haitest\bspsvs\group\bspsvs.mrp"/>
+</component>
+</collection>
+<collection name="boardsupport_info" long-name="Board Support Info" level="4">
+<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\boardsupport\boardsupport_info\boardsupport_metadata\boardsupport_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+<component name="buildsystemtools" long-name="Build System Tools" purpose="development">
+<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" purpose="development">
+<unit mrp="os\buildtools\packaging\additionalutils\gt_techview_baseline.mrp"/>
+</component>
+<component name="commonbldutils" long-name="Common Utils" purpose="development">
+<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" purpose="development">
+<unit mrp="os\buildtools\packaging\additionalutils\additional_unknown_cedar.mrp"/>
+</component>
+<component name="dummy" long-name="Dummy" purpose="development">
+<unit bldFile="os\buildtools\packaging\dummy" mrp="os\buildtools\packaging\dummy\additional_dummy.mrp"/>
+</component>
+</collection>
+<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
+<unit mrp="os\buildtools\toolsandutils\productionbldtools\product_tools.mrp"/>
+</component>
+<component name="ctsfunctionalitycheckers" long-name="CTS Functionality Checkers" purpose="development">
+<unit mrp="os\buildtools\toolsandutils\ctsfunctionalitycheckers\Group\testtools_cts_functionalitycheckers.mrp"/>
+</component>
+<component name="burtestserver" long-name="BUR Test Server" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\buildtools\toolsandutils\cdb\group" mrp="os\buildtools\toolsandutils\cdb\group\testtools_cdb.mrp"/>
+</component>
+<component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC">
+<unit bldFile="os\buildtools\toolsandutils\e32tools\group" mrp="os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp"/>
+</component>
+<component name="kitcomparator" long-name="Kit Comparator" purpose="development">
+<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" purpose="development">
+<unit mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_winc.mrp"/>
+</component>
+<component name="additionalredistribution" long-name="Additional Redistribution" purpose="development">
+<unit mrp="os\buildtools\perltoolsplat_os\redistribution\additional_tools.mrp"/>
+</component>
+<component name="testdriver" long-name="Test Driver" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit mrp="os\buildtools\toolsandutils\statsource\group\testtools_stat_common_source.mrp"/>
+</component>
+<component name="statdesktop" long-name="STAT Desktop" filter="gt" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\buildtools\toolsandutils\testtoolsdesktop\group" mrp="os\buildtools\toolsandutils\testtoolsdesktop\group\testtools_desktop.mrp"/>
+</component>
+<component name="wintunnel" long-name="Wintunnel" purpose="development">
+<unit mrp="os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
+</component>
+<component name="usecasecontroller" long-name="Use Case Controller" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\buildtools\toolsandutils\kitsetupapp\group" mrp="os\buildtools\toolsandutils\kitsetupapp\group\tools_devkits_kitsetupapp.mrp" priority="1020"/>
+</component>
+<component name="navigationpages" long-name="Navigation Pages" purpose="development">
+<unit mrp="os\buildtools\toolsandutils\navigationpages\tools_sdk_eng_NavigationPages.mrp"/>
+</component>
+<component name="productinstaller" long-name="Product Installer" filter="gt" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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">
+<!-- PLACEHOLDER="DS.1735" ; START REMOVE -->
+<component name="rcomp" long-name="Resource Compiler" purpose="development">
+<unit bldFile="os\buildtools\bintools_os\rcomp\group" mrp="os\buildtools\bintools_os\rcomp\group\tools_rcomp.mrp"/>
+</component>
+<!-- PLACEHOLDER="DS.1735" ; END REMOVE -->
+<component name="evalid" long-name="Evalid" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development" class="PC">
+<unit mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
+</component>
+<component name="bldtools" long-name="Build Tools" filter="gt" purpose="development">
+<unit bldFile="os\buildtools\sbsv1_os\bldtools\group" mrp="os\buildtools\sbsv1_os\bldtools\group\tools_sdk_eng_build-tools.mrp"/>
+</component>
+<component name="romutils" long-name="ROM Utilities" filter="gt" purpose="development">
+<unit bldFile="os\buildtools\sbsv1_os\romutils\group" mrp="os\buildtools\sbsv1_os\romutils\group\tools_romutils.mrp"/>
+</component>
+</collection>
+<collection name="srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
+<component name="leavescan" long-name="Leavescan" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\buildtools\imgtools_os\romkiteka2\group" mrp="os\buildtools\imgtools_os\romkiteka2\group\tools_romkit.mrp"/>
+</component>
+</collection>
+<collection name="binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
+<component name="captools" long-name="Capability Tools" purpose="development">
+<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" purpose="development">
+<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" purpose="development" class="doc">
+<unit bldFile="os\buildtools\devlib\devlibhelp\group\devlib96" mrp="os\buildtools\devlib\devlibhelp\group\devlib96\developerlibrary_doc_html.mrp" version="9.6"/>
+</component>
+<component name="devlibsrc" long-name="Developer Library Source" filter="gt" purpose="development" class="doc">
+<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" purpose="development" class="doc">
+<unit mrp="os\buildtools\devlib\devlibhelp\group\shared\developerlibrary_doc_plain_html.mrp"/>
+</component>
+<component name="toolsdocs" long-name="Tools Documentation" purpose="development" class="doc">
+<unit mrp="os\buildtools\devlib\toolsdocs\tools_documentation.mrp"/>
+</component>
+</collection>
+<collection name="misccomponents" long-name="Misc Components" level="mw">
+<component name="runperl" long-name="Run PERL" filter="gt" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\buildtools\misccomponents\bspbuilder\group" mrp="os\buildtools\misccomponents\bspbuilder\group\tools_bspbuilder.mrp"/>
+</component>
+<component name="splash" long-name="Splash Screen" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<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" purpose="development">
+<unit bldFile="os\buildtools\fileconv\rtf2ptml\group" mrp="os\buildtools\fileconv\rtf2ptml\group\tools_sdk_eng_rtf2ptml.mrp"/>
+</component>
+</collection>
+<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
+<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\buildtools\buildtools_info\buildtools_metadata\buildtools_metadata.mrp"/>
+</component>
+</collection>
+</block>
 <block name="ossrv" level="services" long-name="Generic OS 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" purpose="development">
-<unit bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp" version="9.4"/>
+<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
+<unit bldFile="os\ossrv\genericservices\s60compatibilityheaders\groupsymtb101sf" mrp="os\ossrv\genericservices\s60compatibilityheaders\groupsymtb101sf\tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
 </component>
 <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/mimerecognitionfw/group" mrp="os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+<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" purpose="mandatory">
-<unit bldFile="os/ossrv/genericservices/systemagent/group" mrp="os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/taskscheduler/group" mrp="os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/activebackupclient/group" mrp="os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+<unit bldFile="os\ossrv\genericservices\activebackupclient\group" mrp="os\ossrv\genericservices\activebackupclient\group\connectivity_abclient.mrp"/>
 </component>
 <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+<unit mrp="os\ossrv\genericservices\syslibsdocs\syslibs_documentation.mrp"/>
 </component>
 <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="os/ossrv/genericservices/httputils/group" mrp="os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+<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" introduced="tb91" purpose="development">
-<unit mrp="os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp"/>
+<unit mrp="os\ossrv\syslibsapitest\syslibssvs\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" purpose="optional">
-<unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
+<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+<unit bldFile="os\ossrv\compressionlibs\ziplib\group" mrp="os\ossrv\compressionlibs\ziplib\group\syslibs_ezlib2.mrp"/>
 </component>
 </collection>
 <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
 <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="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="cppstdlib" long-name="C++ Standard Library" introduced="tb92" purpose="mandatory">
+<unit bldFile="os\ossrv\genericopenlibs\cppstdlib\group" mrp="os\ossrv\genericopenlibs\cppstdlib\group\openenv_libstdcpp.mrp"/>
 </component>
 <component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory">
-<unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+<unit bldFile="os\ossrv\genericopenlibs\openenvcore\group" mrp="os\ossrv\genericopenlibs\openenvcore\group\openenv.mrp"/>
+</component>
+<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="tb92" purpose="optional">
+<unit bldFile="os\ossrv\genericopenlibs\posixrealtimeextensions\group" mrp="os\ossrv\genericopenlibs\posixrealtimeextensions\group\oeaddons_librt.mrp"/>
 </component>
 </collection>
 <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
 <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp" version="2"/>
+<unit bldFile="os\ossrv\lowlevellibsandfws\pluginfw\Group" mrp="os\ossrv\lowlevellibsandfws\pluginfw\Group\syslibs_ecom3.mrp" version="3"/>
 </component>
 <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os/ossrv/lowlevellibsandfws/apputils/group" mrp="os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+<unit bldFile="os\ossrv\lowlevellibsandfws\apputils\group" mrp="os\ossrv\lowlevellibsandfws\apputils\group\syslibs_bafl.mrp"/>
+</component>
+<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="Future" purpose="mandatory">
+<unit bldFile="os\ossrv\lowlevellibsandfws\genericusabilitylib\group" mrp="os\ossrv\lowlevellibsandfws\genericusabilitylib\group\syslibs_euserhl.mrp"/>
 </component>
 </collection>
 <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
 <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+<unit mrp="os\ossrv\ossrv_info\ossrv_metadata\ossrv_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<collection name="authorisation" long-name="Authorisation" level="utilities">
+<component name="userpromptservice" long-name="User Prompt Service" introduced="tb92" purpose="mandatory">
+<unit bldFile="os\security\authorisation\userpromptservice\group" mrp="os\security\authorisation\userpromptservice\group\security_ups.mrp"/>
+</component>
+<component name="userpromptutils" long-name="User Prompt Utils" introduced="tb92" purpose="optional">
+<unit bldFile="os\security\authorisation\userpromptutils\group" mrp="os\security\authorisation\userpromptutils\group\security_ups_utils.mrp"/>
+</component>
+</collection>
 <collection name="contentmgmt" long-name="Content Management" level="utilities">
+<component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="tb92" purpose="optional">
+<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" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+<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" purpose="mandatory">
-<unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.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="weakcrypto" long-name="Weak Cryptography Library" filter="gt" purpose="optional">
-<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" purpose="optional">
-<unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
+<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\security\crypto\weakcryptospi\group" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_weak.mrp"/>
+</component>
+<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
+<unit bldFile="os\security\crypto\weakcryptospi\strong" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_strong.mrp"/>
+</component>
+<component name="opencryptolibs" long-name="Open Crypto Libraries" introduced="tb92" purpose="optional">
+<unit bldFile="os\security\crypto\opencryptolibs\group" mrp="os\security\crypto\opencryptolibs\group\oeaddons_crypto.mrp"/>
 </component>
 </collection>
 <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
 <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="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" deprecated="tb92" purpose="development">
-<unit mrp="os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
+<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" deprecated="tb92" introduced="7.0" purpose="development">
+<unit mrp="os\security\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
 </component>
 <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+<unit mrp="os\security\cryptomgmtlibs\securitydocs\security_documentation.mrp"/>
 </component>
 <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+<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" purpose="mandatory">
+<unit bldFile="os\security\cryptomgmtlibs\securitycommonutils\group" mrp="os\security\cryptomgmtlibs\securitycommonutils\group\security_commonutils.mrp"/>
 </component>
 </collection>
 <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
 <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="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" introduced="tb92" purpose="optional" class="PC">
-<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="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
+<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="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/certificateandkeymgmt/group" mrp="os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+<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" purpose="optional">
-<unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
+<unit mrp="os\security\cryptoservices\rootcertificates\rootcerts.mrp"/>
 </component>
 <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+<unit bldFile="os\security\cryptoservices\asnpkcs\group" mrp="os\security\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
+</component>
+<component name="openssl" long-name="OpenSSL" introduced="tb92" purpose="optional">
+<unit bldFile="os\security\cryptoservices\openssl\group" mrp="os\security\cryptoservices\openssl\group\oeaddons_ssl.mrp"/>
 </component>
 </collection>
 <collection name="security_info" long-name="OS Security Info" level="utilities">
 <component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
+<unit mrp="os\security\security_info\security_metadata\security_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services"/>
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="featuremgmt" long-name="Feature Management" level="framework">
+<component name="featuremgr" long-name="Feature Manager" introduced="tb92" purpose="mandatory">
+<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="tb92" purpose="mandatory">
+<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" purpose="optional">
+<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" purpose="optional">
+<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" purpose="development">
+<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" purpose="optional">
+<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" purpose="development">
+<unit bldFile="os\persistentdata\traceservices\tracefw\ulogger\group" mrp="os\persistentdata\traceservices\tracefw\ulogger\group\tools_debug_trace.mrp"/>
+</component>
+</collection>
+<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+<component name="store" long-name="Store" purpose="optional">
+<unit bldFile="os\persistentdata\persistentstorage\store\group" mrp="os\persistentdata\persistentstorage\store\group\syslibs_store.mrp"/>
+</component>
+<component name="dbms" long-name="DBMS" purpose="optional">
+<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" purpose="mandatory">
+<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" purpose="optional">
+<unit bldFile="os\persistentdata\persistentstorage\sql\GROUP" mrp="os\persistentdata\persistentstorage\sql\GROUP\syslibs_sql.mrp"/>
+</component>
+<component name="sqlite3api" long-name="SQLite 3 API" introduced="tb92" purpose="optional">
+<unit bldFile="os\persistentdata\persistentstorage\sqlite3api\GROUP" mrp="os\persistentdata\persistentstorage\sqlite3api\GROUP\syslibs_sqlite3.mrp"/>
+</component>
+</collection>
+<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\persistentdata\persistentdata_info\persistentdata_metadata\persistentdata_metadata.mrp"/>
+</component>
+</collection>
+</block>
 <block name="devicesrv" level="services" long-name="Device 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" purpose="optional">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+<unit bldFile="os\devicesrv\accessoryservices\remotecontrolfw\group" mrp="os\devicesrv\accessoryservices\remotecontrolfw\group\bluetooth_remotecontrol.mrp"/>
 </component>
 </collection>
 <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
 <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+<unit bldFile="os\devicesrv\resourcemgmt\hwresourcesmgr\group" mrp="os\devicesrv\resourcemgmt\hwresourcesmgr\group\telephony_hwrm.mrp"/>
 </component>
 <component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="tb92" purpose="optional" class="config">
-<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+<unit bldFile="os\devicesrv\resourcemgmt\hwresourcesmgrconfig" mrp="os\devicesrv\resourcemgmt\hwresourcesmgrconfig\telephony_hwrm-config.mrp"/>
 </component>
 <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+<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" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+<unit bldFile="os\devicesrv\sysstatemgmt\systemstarter\group" mrp="os\devicesrv\sysstatemgmt\systemstarter\group\app-framework_sysstart.mrp"/>
 </component>
 <component name="systemstatemgr" long-name="System State Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+<unit bldFile="os\devicesrv\sysstatemgmt\systemstatemgr\group" mrp="os\devicesrv\sysstatemgmt\systemstatemgr\group\app-framework_ssma.mrp"/>
 </component>
 <component name="systemstateplugins" long-name="System State Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+<unit bldFile="os\devicesrv\sysstatemgmt\systemstateplugins\group" mrp="os\devicesrv\sysstatemgmt\systemstateplugins\group\app-framework_ssplugins.mrp"/>
 </component>
 <component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+<unit bldFile="os\devicesrv\sysstatemgmt\systemstatereferenceplugins\group" mrp="os\devicesrv\sysstatemgmt\systemstatereferenceplugins\group\app-framework_ssrefplugins.mrp"/>
 </component>
 </collection>
 <collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
 <component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="tb92" purpose="optional">
-<unit bldFile="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+<unit bldFile="os\devicesrv\resourceinterfaces\fmtransmittercontrol\group" mrp="os\devicesrv\resourceinterfaces\fmtransmittercontrol\group\telephony_hwrmfmtx.mrp"/>
 </component>
 </collection>
 <collection name="systemhealthmanagement" long-name="System Health Management" level="server">
 <component name="systemhealthmgr" long-name="System Health Manager" introduced="tb92" purpose="optional">
-<unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="sensordrivers" long-name="Sensor Drivers" level="adaptation">
-<component name="proximitysensorldd" long-name="Proximity Sensor LDD" introduced="Future" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/sensors" mrp="os/kernelhwsrv/kernel/eka/drivers/sensors/base_drivers_sensors.mrp"/>
+<unit bldFile="os\devicesrv\systemhealthmanagement\systemhealthmgr\group" mrp="os\devicesrv\systemhealthmanagement\systemhealthmgr\group\app-framework_shma.mrp"/>
 </component>
 </collection>
 <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
 <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
 	-->
 </component>
 <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
 	-->
 </component>
 </collection>
 <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
 <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+<unit mrp="os\devicesrv\devicesrv_info\devicesrv_metadata\devicesrv_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+<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" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_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" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+<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" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/>
+<unit bldFile="os\lbs\datasourcemodules\agpsintegrationmodule\group" mrp="os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp"/>
 </component>
 <component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+<unit bldFile="os\lbs\datasourcemodules\gpspositioningmodule\group" mrp="os\lbs\datasourcemodules\gpspositioningmodule\group\lbs_agps_positioning_module.mrp"/>
 </component>
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+<unit bldFile="os\lbs\datasourcemodules\networkpositioningmodule\group" mrp="os\lbs\datasourcemodules\networkpositioningmodule\group\lbs_network_positioning_module.mrp"/>
 </component>
 </collection>
 <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+<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" purpose="development">
-<unit mrp="os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
+<unit mrp="os\lbs\lbstest\lbstestproduct\group\lbs_testproduct.mrp"/>
 </component>
 <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="os/lbs/lbstest/locationprotocoltest/group" mrp="os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+<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="locmonitor" long-name="Location Monitor" introduced="tb92" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+<unit bldFile="os\lbs\locationmgmt\locmonitor\lbslocmonitorserver\group" mrp="os\lbs\locationmgmt\locmonitor\lbslocmonitorserver\group\lbs_locationmonitor.mrp"/>
 </component>
 <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/agpslocationmgr/group" mrp="os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.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" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networklocationmgr/group" mrp="os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.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" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/locationcore/group" mrp="os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+<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" introduced="tb91" purpose="optional" plugin="Y">
-<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" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+<unit bldFile="os\lbs\networkprotocolmodules\suplprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp"/>
 </component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
 <component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-	<unit mrp="lbsapitest/lbshaitest/group/lbshai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="lbsapitest/lbshaitest/group/lbshai.mrp"/>
 	-->
 </component>
 </collection>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
 <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+<unit mrp="os\lbs\lbs_info\lbs_metadata\lbs_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="commsfw" level="services"/>
+<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+<collection name="commsprocess" long-name="Comms Process" level="process">
+<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+<unit bldFile="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" purpose="mandatory" 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" purpose="mandatory">
+<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" purpose="mandatory">
+<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" purpose="mandatory">
+<unit bldFile="os\commsfw\datacommsserver\esockserver\group" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock.mrp" version="3"/>
+</component>
+<component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config">
+<unit mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock-config.mrp" version="3"/>
+</component>
+<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+<unit bldFile="os\commsfw\datacommsserver\networkinterfacemgr\group" mrp="os\commsfw\datacommsserver\networkinterfacemgr\group\comms-infras_nifman.mrp" version="2"/>
+</component>
+<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
+<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" purpose="optional">
+<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" introduced="7.0s" purpose="optional" plugin="Y">
+<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" introduced="ER5" purpose="optional" plugin="Y">
+<unit bldFile="os\commsfw\serialserver\serialportcsy" mrp="os\commsfw\serialserver\serialportcsy\ser-comms_serialportcsy.mrp"/>
+</component>
+<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
+<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" purpose="mandatory">
+<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" purpose="mandatory" 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" purpose="development" class="doc">
+<unit mrp="os\commsfw\serialserver\c32serialserverdocs\ser-comms_documentation.mrp"/>
+</component>
+</collection>
+<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+<component name="commsbufs" long-name="Comms Buffers" introduced="tb92" purpose="mandatory">
+<unit bldFile="os\unref\orphan\comgen\comms-infras\commsbufs\group" mrp="os\unref\orphan\comgen\comms-infras\commsbufs\group\comms-infras_commsbufs.mrp"/>
+<!-- PLACEHOLDER DS.1656 REMOVE -->
+<!-- PLACEHOLDER="DS.1656"
+	 <unit bldFile="commsfwutils/commsbufs/group" mrp="commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+	 -->
+</component>
+</collection>
+<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+<unit mrp="os\commsfw\commsfw_info\commsinfrastructuredocs\comms-infras_documentation.mrp"/>
+</component>
+<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\commsfw\commsfw_info\commsfw_metadata\commsfw_metadata.mrp"/>
+</component>
+</collection>
+<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
+<unit bldFile="os\commsfw\commsfwsupport\commselements\group" mrp="os\commsfw\commsfwsupport\commselements\group\comms-infras_elements.mrp"/>
+</component>
+</collection>
+<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb91" purpose="development">
+<unit mrp="os\commsfw\commsinfrastructureapitest\commsinfrastructuresvs\group\commsinfrastructuresvs.mrp"/>
+</component>
+</collection>
+<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+<unit bldFile="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" purpose="mandatory" 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" purpose="development" class="PC">
+<unit mrp="os\commsfw\commsfwtools\commstools\group\comms-infras_tools.mrp"/>
+</component>
+</collection>
+</block>
 <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
-<unit bldFile="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" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/dnd/group" mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+<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" purpose="mandatory" class="config">
-<unit mrp="os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
+<unit mrp="os\networkingsrv\tcpiputils\dnd\group\networking_dnd-config.mrp"/>
 </component>
 <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="os/networkingsrv/tcpiputils/dhcp/group" mrp="os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+<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" introduced="tb91" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+<unit bldFile="os\networkingsrv\tcpiputils\networkaddressandporttranslation\group" mrp="os\networkingsrv\tcpiputils\networkaddressandporttranslation\group\networking_napt.mrp"/>
 </component>
 <component name="punycodeconv" long-name="Punycode Converter" introduced="tb92" purpose="mandatory">
-<unit bldFile="os/networkingsrv/tcpiputils/punycodeconv/group" mrp="os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+<unit bldFile="os\networkingsrv\tcpiputils\punycodeconv\group" mrp="os\networkingsrv\tcpiputils\punycodeconv\group\networking_punycodeconverter.mrp"/>
 </component>
 </collection>
 <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
 <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="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>
 <component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="tb92" purpose="optional">
-<unit bldFile="os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+<unit bldFile="os\networkingsrv\linklayercontrol\genericscprparameters\group" mrp="os\networkingsrv\linklayercontrol\genericscprparameters\group\networking_genericscprparams.mrp"/>
 </component>
 <component name="mbmsparameters" long-name="MBMS Parameters" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+<unit bldFile="os\networkingsrv\linklayercontrol\mbmsparameters\group" mrp="os\networkingsrv\linklayercontrol\mbmsparameters\group\networking_mbmsparams.mrp"/>
 </component>
 </collection>
 <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
 <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="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" introduced="7.0" purpose="optional" plugin="Y">
-<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" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+<unit bldFile="os\networkingsrv\linklayerprotocols\pppnif\group" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp.mrp" version="2"/>
 </component>
 <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" class="config">
-<unit mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="2"/>
+<unit mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp-config.mrp" version="2"/>
 </component>
 <component name="slipnif" long-name="SLIP NIF" purpose="development" 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" introduced="7.0s" purpose="optional" plugin="Y">
-<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" purpose="development">
-<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" purpose="optional" class="config">
-<unit mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
+<unit mrp="os\networkingsrv\networkcontrol\qosfwconfig\qos\group\networking_qos-config.mrp"/>
 </component>
 <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/qoslib/group" mrp="os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/networkingsrv/networkcontrol/pfqoslib/group" mrp="os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+<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" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+<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" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/qosipscpr/group" mrp="os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+<unit bldFile="os\networkingsrv\networkcontrol\qosipscpr\group" mrp="os\networkingsrv\networkcontrol\qosipscpr\group\networking_qosipscpr.mrp"/>
 </component>
 <component name="ipnetworklayer" long-name="IP Network Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+<unit bldFile="os\networkingsrv\networkcontrol\ipnetworklayer\group" mrp="os\networkingsrv\networkcontrol\ipnetworklayer\group\networking_ipproto.mrp"/>
 </component>
 <component name="iptransportlayer" long-name="IP Transport Layer" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+<unit bldFile="os\networkingsrv\networkcontrol\iptransportlayer\group" mrp="os\networkingsrv\networkcontrol\iptransportlayer\group\networking_iptransport.mrp"/>
 </component>
 <component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+<unit bldFile="os\networkingsrv\networkcontrol\commsuserpromptmgr\group" mrp="os\networkingsrv\networkcontrol\commsuserpromptmgr\group\networking_netups.mrp"/>
 </component>
 <component name="ipupsplugins" long-name="IP UPS Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkcontrol/ipupsplugins/group" mrp="os/networkingsrv/networkcontrol/ipupsplugins/group/networking_ipups.mrp"/>
+<unit bldFile="os\networkingsrv\networkcontrol\ipupsplugins\group" mrp="os\networkingsrv\networkcontrol\ipupsplugins\group\networking_ipups.mrp"/>
 </component>
 </collection>
 <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
 <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
+<unit mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6-config.mrp"/>
 </component>
 <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<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" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+<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" purpose="mandatory">
-<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" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+<unit bldFile="os\networkingsrv\networkprotocols\mobileip\group" mrp="os\networkingsrv\networkprotocols\mobileip\group\networking_mobileip.mrp"/>
 </component>
 <component name="dnsproxy" long-name="DNS Proxy" introduced="Future" purpose="optional">
-<unit bldFile="os/networkingsrv/networkprotocols/dnsproxy/group" mrp="os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+<unit bldFile="os\networkingsrv\networkprotocols\dnsproxy\group" mrp="os\networkingsrv\networkprotocols\dnsproxy\group\networking_dnsproxy.mrp"/>
 </component>
 </collection>
 <collection name="networksecurity" long-name="Network Security" level="framework">
 <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="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" purpose="mandatory">
-<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" purpose="optional">
-<unit bldFile="os/networkingsrv/networksecurity/ipsec/group" mrp="os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+<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" purpose="development">
-<unit mrp="os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
+<unit mrp="os\networkingsrv\networkingtestandutils\networkingunittest\group\networking_unittest.mrp"/>
 </component>
 <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
-<unit bldFile="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+<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" purpose="development">
-<unit mrp="os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
+<unit mrp="os\networkingsrv\networkingtestandutils\exampleinternetutilities\group\networking_inetutil.mrp"/>
 </component>
 <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y">
-<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" purpose="development" plugin="Y">
-<unit mrp="os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
+<unit mrp="os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group\networking_6to4.mrp"/>
 </component>
 <component name="ipanalyzer" long-name="IP Analyzer" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
+<unit mrp="os\networkingsrv\networkingtestandutils\ipanalyzer\group\networking_iprotor.mrp"/>
 </component>
 <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+<unit bldFile="os\networkingsrv\networkingtestandutils\networkingintegrationtest\Group" mrp="os\networkingsrv\networkingtestandutils\networkingintegrationtest\Group\networking_integrationtest.mrp"/>
 </component>
 <component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="tb92" purpose="development">
-<unit bldFile="os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+<unit bldFile="os\networkingsrv\networkingtestandutils\networkingperformancemeasurementtools\group" mrp="os\networkingsrv\networkingtestandutils\networkingperformancemeasurementtools\group\networking_netperf.mrp"/>
 </component>
 </collection>
 <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
 <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
 <!--  production component: contains the IBY files -->
-<unit bldFile="os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+<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" purpose="development" class="doc">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+<unit mrp="os\networkingsrv\networkingsrv_info\networkingdocs\networking_documentation.mrp"/>
 </component>
 <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+<unit mrp="os\networkingsrv\networkingsrv_info\networkingsrv_metadata\networkingsrv_metadata.mrp"/>
 </component>
 </collection>
 <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
 <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+<unit bldFile="os\networkingsrv\pppcompressionplugins\predictorcompression\group" mrp="os\networkingsrv\pppcompressionplugins\predictorcompression\group\networking_predcomp.mrp"/>
 </component>
 </collection>
 </block>
@@ -507,145 +1229,145 @@
 <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw"/>
 <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
 <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-			  <unit mrp="wlanapitest/wlanhaitest/group/wlanhai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+			  <unit mrp="wlanapitest/wlanhaitest/group/wlanhai.mrp"/>
 			-->
 </component>
 </collection>
 <collection name="wlan_info" long-name="WLAN Info" level="test">
 <component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+<unit mrp="os\wlan\wlan_info\wlan_metadata\wlan_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
-<unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+<unit bldFile="os\cellularsrv\basebandabstraction\basebandchanneladaptor\group" mrp="os\cellularsrv\basebandabstraction\basebandchanneladaptor\group\networking_bca.mrp"/>
 </component>
 </collection>
 <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.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" purpose="optional">
-<unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.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" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+<unit bldFile="os\cellularsrv\smsprotocols\smsstack\group" mrp="os\cellularsrv\smsprotocols\smsstack\group\nbprotocols_smsstackv2.mrp"/>
 </component>
 </collection>
 <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
 <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.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" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/psdagt/group" mrp="os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+<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" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.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" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.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" purpose="optional">
-<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="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyprotocols\qos3gppcpr\group" mrp="os\cellularsrv\telephonyprotocols\qos3gppcpr\group\networking_Qos3GPP.mrp"/>
 </component>
 <component name="pdplayer" long-name="PDP Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyprotocols\pdplayer\group" mrp="os\cellularsrv\telephonyprotocols\pdplayer\group\networking_pdp.mrp"/>
 </component>
 <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyprotocols\rawipnif\group" mrp="os\cellularsrv\telephonyprotocols\rawipnif\group\networking_rawipnif.mrp"/>
 </component>
 </collection>
 <collection name="telephonyserver" long-name="Telephony Server" level="server">
 <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyserver\etelserverandcore\group" mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel.mrp"/>
 </component>
 <component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="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" purpose="mandatory">
-<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" purpose="mandatory">
-<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" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyserver\etelsimtoolkit\group" mrp="os\cellularsrv\telephonyserver\etelsimtoolkit\group\telephony_etelsat.mrp"/>
 </component>
 </collection>
 <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
 <component name="common_tsy" long-name="Common TSY" introduced="tb92" purpose="optional" plugin="Y">
-<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="licenseetsystub" long-name="LicenseeTSY Stub" introduced="tb91" purpose="development" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
+<unit mrp="os\cellularsrv\telephonyserverplugins\licenseetsystub\group\licenseetsystub.mrp"/>
 </component>
 <component name="multimodetsy" long-name="Multimode TSY" purpose="development" 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="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<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>
 <component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\group" mrp="os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\group\telephony_dispatcher.mrp"/>
 </component>
 <component name="simatktsy" long-name="SIMATK TSY" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+<unit bldFile="os\cellularsrv\telephonyserverplugins\simatktsy\group" mrp="os\cellularsrv\telephonyserverplugins\simatktsy\group\commonsimatktsy.mrp"/>
 </component>
 </collection>
 <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
 <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="os/cellularsrv/telephonyutils/dial/group" mrp="os/cellularsrv/telephonyutils/dial/group/telephony_dial.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" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+<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" purpose="mandatory">
-<unit bldFile="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+<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" purpose="development" 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" purpose="development" class="doc">
-<unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+<unit mrp="os\cellularsrv\cellularsrv_info\telephonydocs\telephony_documentation.mrp"/>
 </component>
 <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+<unit mrp="os\cellularsrv\cellularsrv_info\cellularsrv_metadata\cellularsrv_metadata.mrp"/>
 </component>
 </collection>
 <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
 <component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+<unit bldFile="os\cellularsrv\hwpluginsimulation\mocksy\group" mrp="os\cellularsrv\hwpluginsimulation\mocksy\group\telephony_tools_mocksy.mrp"/>
 </component>
 </collection>
 <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
 <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-			  <unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+			  <unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhai.mrp"/>
 			-->
 </component>
 <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-			  <unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+			  <unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhai.mrp"/>
 			-->
 </component>
 <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhai.mrp"/>
 			-->
 </component>
 </collection>
@@ -653,389 +1375,500 @@
 <block name="shortlinksrv" level="services" long-name="Short Link Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="usbbsptemplate" long-name="USB BSP Template" level="adaptation">
 <component name="usbhostcntrldrivertemplate" long-name="OMAP USB Host Controller Driver Template" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os/shortlinksrv/usbbsptemplate/usbhostcntrldrivertemplate" mrp="os/shortlinksrv/usbbsptemplate/usbhostcntrldrivertemplate/base_template_usbhostotg.mrp"/>
+<unit bldFile="os\shortlinksrv\usbbsptemplate\usbhostcntrldrivertemplate" mrp="os\shortlinksrv\usbbsptemplate\usbhostcntrldrivertemplate\base_template_usbhostotg.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" purpose="optional">
-<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>
 <component name="usbhotgdrivers" long-name="USB Host and OTG Drivers" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/base_drivers_usbhostotg.mrp"/>
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbho" mrp="os\kernelhwsrv\kernel\eka\drivers\usbho\base_drivers_usbhostotg.mrp"/>
 </component>
 <component name="usbhostandotgstack" long-name="USB Host and OTG Stack" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbd" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbd/base_drivers_usbhostotg_usbware.mrp"/>
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbho\usbd" mrp="os\kernelhwsrv\kernel\eka\drivers\usbho\usbd\base_drivers_usbhostotg_usbware.mrp"/>
 </component>
 </collection>
 <collection name="bluetooth" long-name="Bluetooth" level="framework">
 <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetooth/btstack" mrp="os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
+<unit bldFile="os\shortlinksrv\bluetooth\btstack" mrp="os\shortlinksrv\bluetooth\btstack\bluetooth_stack.mrp"/>
 </component>
 <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="os/shortlinksrv/bluetooth/btcomm" mrp="os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetooth/btsdp" mrp="os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetooth/btextnotifiers" mrp="os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetooth/gavdp/group" mrp="os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+<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" purpose="development">
-<unit mrp="os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
+<unit mrp="os\shortlinksrv\bluetooth\btexample\test\bluetooth_tests_examples.mrp"/>
 </component>
 <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetooth/btlogger/group" mrp="os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+<unit bldFile="os\shortlinksrv\bluetooth\btlogger\group" mrp="os\shortlinksrv\bluetooth\btlogger\group\bluetooth_logger.mrp"/>
 </component>
 <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetoothmgmt/btmgr" mrp="os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+<unit bldFile="os\shortlinksrv\bluetoothmgmt\btmgr" mrp="os\shortlinksrv\bluetoothmgmt\btmgr\bluetooth_manager.mrp"/>
 </component>
 <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="os/shortlinksrv/bluetoothmgmt/btconfig" mrp="os/shortlinksrv/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetoothmgmt/btrom" mrp="os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+<unit bldFile="os\shortlinksrv\bluetoothmgmt\bluetoothclientlib" mrp="os\shortlinksrv\bluetoothmgmt\bluetoothclientlib\bluetooth_user.mrp"/>
 </component>
 <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional">
-<unit mrp="os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
+<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" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+<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="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="os/shortlinksrv/bthci/bthci2/group" mrp="os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/shortlinksrv/bthci/hciextensioninterface" mrp="os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+<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" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/shortlinksrv/bthci/hci2implementations/group" mrp="os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+<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="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+<unit bldFile="os\shortlinksrv\usbmgmt\usbmgr\group" mrp="os\shortlinksrv\usbmgmt\usbmgr\group\usb_manager.mrp" version="2"/>
 </component>
 <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development">
-<unit mrp="os/shortlinksrv/usbmgmt/usbmgrtest/group/usb_test.mrp" version="2"/>
+<unit mrp="os\shortlinksrv\usbmgmt\usbmgrtest\group\usb_test.mrp" version="2"/>
 </component>
 <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+<unit mrp="os\shortlinksrv\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
 </component>
 <component name="usbrndis" long-name="USB RNDIS" introduced="tb92" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os/shortlinksrv/usbmgmt/usbrndis/group" mrp="os/shortlinksrv/usbmgmt/usbrndis/group/usb_rndis.mrp"/>
+<unit bldFile="os\shortlinksrv\usbmgmt\usbrndis\group" mrp="os\shortlinksrv\usbmgmt\usbrndis\group\usb_rndis.mrp"/>
 </component>
 </collection>
 <collection name="irda" long-name="IrDA" level="plugin">
 <component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="os/shortlinksrv/irda/irdastack/group" mrp="os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
+<unit bldFile="os\shortlinksrv\irda\irdastack\group" mrp="os\shortlinksrv\irda\irdastack\group\infra-red_irda.mrp"/>
 </component>
 </collection>
 <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
 <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
+<unit mrp="os\shortlinksrv\bluetoothapitest\bluetoothsvs\group\bluetoothsvs.mrp"/>
 </component>
 </collection>
 <collection name="shortlinksrv_info" long-name="Short Link Services Info" level="app-if">
 <component name="shortlinksrv_metadata" long-name="Short Link Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/shortlinksrv/shortlinksrv_info/shortlinksrv_metadata/shortlinksrv_metadata.mrp"/>
+<unit mrp="os\shortlinksrv\shortlinksrv_info\shortlinksrv_metadata\shortlinksrv_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
 <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
 <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/group" mrp="os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+<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" purpose="development">
-<unit mrp="os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
+<unit mrp="os\mm\imagingandcamerafws\imagingunittest\group\multimedia_unittest_icl_source.mrp"/>
 </component>
 <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
+<unit mrp="os\mm\imagingandcamerafws\imaginginttest\group\multimedia_inttest_icl_source.mrp"/>
 </component>
 <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/camerafw/group" mrp="os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+<unit bldFile="os\mm\imagingandcamerafws\camerafw\group" mrp="os\mm\imagingandcamerafws\camerafw\group\multimedia_ecam_framework.mrp"/>
 </component>
 <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
+<unit mrp="os\mm\imagingandcamerafws\cameraunittest\group\multimedia_unittest_ecam_source.mrp"/>
 </component>
 </collection>
 <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
 <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
 <!-- PLACEHOLDER="DEF137894" START REMOVE -->
-<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"/>
 <!-- PLACEHOLDER="DEF137894" END REMOVE -->
-<!-- PLACEHOLDER="DEF137894"
-		<unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+<!-- PLACEHOLDER="DEF137894"
+		<unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
 		-->
 </component>
 </collection>
 <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
 <component name="capsadaptation" long-name="CAPS Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/CAPSAdaptation/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/CAPSAdaptation/group/multimedia_icl_capsadaptation.mrp"/>
+<unit bldFile="os\mm\imagingandcamerafws\imagingfws\plugins\CAPSAdaptation\group" mrp="os\mm\imagingandcamerafws\imagingfws\plugins\CAPSAdaptation\group\multimedia_icl_capsadaptation.mrp"/>
 </component>
 <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
+<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" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmplugins/cameraplugins/group" mrp="os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+<unit bldFile="os\mm\mmplugins\cameraplugins\group" mrp="os\mm\mmplugins\cameraplugins\group\multimedia_ecam_plugins.mrp"/>
 </component>
 <component name="3gplib" long-name="3GP Library" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmplugins/3gplib/group" mrp="os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
+<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" purpose="development">
-<unit mrp="os/mm/mmplugins/3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
+<unit mrp="os\mm\mmplugins\3gpunittest\group\multimedia_unittest_3gplibrary_source.mrp"/>
 </component>
 </collection>
 <collection name="mm_info" long-name="Multimedia Info" level="app-if">
 <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+<unit mrp="os\mm\mm_info\mmdocs\multimedia_documentation.mrp"/>
 </component>
 <component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+<unit mrp="os\mm\mm_info\mm_metadata\mm_metadata.mrp"/>
 </component>
 </collection>
 <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
 <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92" purpose="development">
-<unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-<component name="decisionfw" long-name="Decision Framework" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmresourcemgmt/decisionfw/group" mrp="os/mm/mmresourcemgmt/decisionfw/group/multimedia_mmrcfw.mrp"/>
-</component>
-<component name="mmmgmtengine" long-name="Multimedia Management Engine" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmresourcemgmt/mmmgmtengine/group" mrp="os/mm/mmresourcemgmt/mmmgmtengine/group/multimedia_mgtengine.mrp"/>
+<unit bldFile="os\mm\mmresourcemgmt\mmresctrl\group" mrp="os\mm\mmresourcemgmt\mmresctrl\group\multimedia_a3f_refmmrc.mrp"/>
 </component>
 </collection>
 <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
 <component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="os/mm/mmdevicefw/mdf/group" mrp="os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<component name="mdf2" long-name="Media Device Framework 2" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmdevicefw/mdf2/group" mrp="os/mm/mmdevicefw/mdf2/group/multimedia_mm-infras.mrp"/>
+<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" purpose="development">
-<unit mrp="os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
+<unit mrp="os\mm\mmdevicefw\mdfunittest\group\multimedia_unittest_mdf_source.mrp"/>
 </component>
 <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
+<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\ASR\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\ASR\group\multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
 <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
 <component name="videorenderer" long-name="Video Renderer" introduced="tb92" purpose="optional">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/videorenderer/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/videorenderer/group/multimedia_videorenderer.mrp"/>
+<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\videorenderer\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\videorenderer\group\multimedia_videorenderer.mrp"/>
 </component>
 </collection>
 <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
 <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development">
-<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" purpose="development">
-<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" purpose="development">
-<unit mrp="os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
+<unit mrp="os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp"/>
 </component>
 <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development">
-<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="omxilapi" long-name="OpenMAX IL API" introduced="tb92" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilapi/group" mrp="os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-<unit bldFile="os/mm/omxil/omxilapi2/group" mrp="os/mm/omxil/omxilapi2/group/multimedia_omx_il_api.mrp" version="2"/>
+<unit bldFile="os\mm\omxil\omxilapi\group" mrp="os\mm\omxil\omxilapi\group\multimedia_omx_il_api.mrp" version="1"/>
 </component>
 <component name="omxilcore" long-name="OpenMAX IL Core" introduced="tb92" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcore/group" mrp="os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-<unit bldFile="os/mm/omxil/omxilcore2/group" mrp="os/mm/omxil/omxilcore2/group/multimedia_omx_il_core.mrp" version="2"/>
-</component>
-<component name="omxilcompfw" long-name="OpenMAX IL Component Framework" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilcompfw/components/group" mrp="os/mm/omxil/omxilcompfw/components/group/multimedia_omx_il_comp.mrp"/>
+<unit bldFile="os\mm\omxil\omxilcore\group" mrp="os\mm\omxil\omxilcore\group\multimedia_omx_il_core.mrp" version="1"/>
 </component>
 <component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="tb92" purpose="optional">
-<unit bldFile="os/mm/omxil/omxilrefcomps/ref_components/group" mrp="os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-<unit bldFile="os/mm/mmdataplane/omxiltranslators/group_omx_ref_components" mrp="os/mm/mmdataplane/omxiltranslators/group_omx_ref_components/multimedia_omx_il_comp_ref.mrp" version="2"/>
+<unit bldFile="os\mm\omxil\omxilrefcomps\ref_components\group" mrp="os\mm\omxil\omxilrefcomps\ref_components\group\multimedia_omx_il_comp_ref.mrp" version="1"/>
 </component>
 <component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development">
-<unit mrp="os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp"/>
+<unit mrp="os\mm\omxil\omxilunittest\group\multimedia_unittest_omx_il.mrp"/>
 </component>
 <component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="tb92" purpose="development">
-<unit mrp="os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp"/>
+<unit mrp="os\mm\omxil\omxilcoreconftest\group\multimedia_omx_il_core_loader_conf_suite.mrp"/>
 </component>
 <component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="tb92" purpose="development">
-<unit bldFile="os/mm/omxil/mmilapi/group" mrp="os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+<unit bldFile="os\mm\omxil\mmilapi\group" mrp="os\mm\omxil\mmilapi\group\multimedia_il_api.mrp"/>
 </component>
 </collection>
 <collection name="devsound" long-name="Sound Device" level="devices">
 <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/mm/devsound/a3fdevsound/group" mrp="os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.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" purpose="optional">
-<unit bldFile="os/mm/devsound/a3facf/group" mrp="os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
+<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" introduced="7.0s" purpose="development" plugin="Y">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+<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" purpose="development">
-<unit bldFile="os/mm/devsound/a3ftrace/group" mrp="os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+<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" purpose="development">
-<unit mrp="os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
+<unit mrp="os\mm\devsound\a3fintegrationtest\group\multimedia_inttest_a3f_devsound_source.mrp"/>
 </component>
 <component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+<unit bldFile="os\mm\devsound\a3fsrvstart\group" mrp="os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
 <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
+<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" purpose="development">
-<unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+<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" purpose="mandatory">
-<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/DevVideo/group/multimedia_mdf_devvideo.mrp"/>
+<unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\DevVideo\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\DevVideo\group\multimedia_mdf_devvideo.mrp"/>
 <!-- PLACEHOLDER="DEF138192" REMOVE -->
-<!-- PLACEHOLDER="DEF138192"
-		<unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_mdf_devvideo.mrp"/>
+<!-- PLACEHOLDER="DEF138192"
+		<unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_mdf_devvideo.mrp"/>
 		-->
 </component>
 <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92" purpose="optional">
-<unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+<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" purpose="development">
-<unit mrp="os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
-</component>
-</collection>
-<collection name="mmhostprocess" long-name="Multimedia Host Process" level="devices">
-<component name="mmhpvideoclient" long-name="MMHP Video Client" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmhostprocess/mmhpvideoclient/mmvideocomponents/group" mrp="os/mm/mmhostprocess/mmhpvideoclient/mmvideocomponents/group/multimedia_mmhp_video_client.mrp"/>
-</component>
-<component name="mmhpaudioclient" long-name="MMHP Audio Client" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmhostprocess/mmhpaudioclient/mmaudiocomponents/group" mrp="os/mm/mmhostprocess/mmhpaudioclient/mmaudiocomponents/group/multimedia_mmhp_audio_client.mrp"/>
-</component>
-<component name="mmhpcameraclient" long-name="MMHP Camera Client" introduced="Future" purpose="optional">
-<unit bldFile="os/mm/mmhostprocess/mmhpcameraclient/mmcameracomponents/group" mrp="os/mm/mmhostprocess/mmhpcameraclient/mmcameracomponents/group/multimedia_mmhp_camera_client.mrp"/>
-</component>
-</collection>
-<collection name="mmdataplane" long-name="Multimedia Data Plane Adaptation" level="hw-if">
-<component name="omxilnodes" long-name="OpenMAX IL Data Plane Nodes" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmdataplane/omxilnodes/group" mrp="os/mm/mmdataplane/omxilnodes/group/multimedia_data_plane_nodes.mrp"/>
-</component>
-<component name="omxiltranslators" long-name="OpenMAX IL Translators" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="os/mm/mmdataplane/omxiltranslators/group_translators" mrp="os/mm/mmdataplane/omxiltranslators/group_translators/multimedia_openmax_il_translators.mrp"/>
+<unit mrp="os\mm\mmhais\dvbhunittest\hai\dvbh\group\multimedia_unittest_dvbhhai.mrp"/>
 </component>
 </collection>
 <collection name="mmpacketvideo" long-name="Multimedia PacketVideo" level="middleware">
 <component name="mmpvcodecs" long-name="PacketVideo Codecs" introduced="tb92" purpose="development" plugin="Y">
-<unit bldFile="os/mm/mmpacketvideo/mmpvcodecs/group" mrp="os/mm/mmpacketvideo/mmpvcodecs/group/multimedia_pv_aac.mrp"/>
+<unit bldFile="os\mm\mmpacketvideo\mmpvcodecs\group" mrp="os\mm\mmpacketvideo\mmpvcodecs\group\multimedia_pv_aac.mrp"/>
 </component>
 <component name="omxilpvcomps" long-name="OpenMAX IL PacketVideo Components" introduced="tb92" purpose="development">
-<unit bldFile="os/mm/mmpacketvideo/omxilpvcomps/group" mrp="os/mm/mmpacketvideo/omxilpvcomps/group/multimedia_omx_il_pv_comps.mrp"/>
+<unit bldFile="os\mm\mmpacketvideo\omxilpvcomps\group" mrp="os\mm\mmpacketvideo\omxilpvcomps\group\multimedia_omx_il_pv_comps.mrp"/>
 </component>
 <component name="mmilapipv" long-name="Multimedia Integration Layer API PacketVideo" introduced="tb92" purpose="development">
-<unit bldFile="os/mm/mmpacketvideo/mmilapipv/group" mrp="os/mm/mmpacketvideo/mmilapipv/group/multimedia_il_api_pv.mrp"/>
+<unit bldFile="os\mm\mmpacketvideo\mmilapipv\group" mrp="os\mm\mmpacketvideo\mmilapipv\group\multimedia_il_api_pv.mrp"/>
 </component>
 <component name="a3fpvintegrationtest" long-name="A3F PacketVideo Integration Tests" introduced="tb92" purpose="development">
-<unit mrp="os/mm/mmpacketvideo/a3fpvintegrationtest/group/multimedia_inttest_pv_a3f_devsound_source.mrp"/>
+<unit mrp="os\mm\mmpacketvideo\a3fpvintegrationtest\group\multimedia_inttest_pv_a3f_devsound_source.mrp"/>
 </component>
 </collection>
 <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
 <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
+<unit mrp="os\mm\mmapitest\mmsvs\group\mmsvs.mrp"/>
 </component>
 <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-	<unit mrp="mmapitest/devvideohaitest/group/devvideohai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="mmapitest/devvideohaitest/group/devvideohai.mrp"/>
 	-->
 </component>
 <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-	<unit mrp="mmapitest/devsoundhaitest/group/devsoundhai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="mmapitest/devsoundhaitest/group/devsoundhai.mrp"/>
 	-->
 </component>
 <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1675"
-	<unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthai.mrp"/>
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthai.mrp"/>
 	-->
 </component>
 </collection>
 </block>
-<block name="graphics" level="services"/>
+<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
+<component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicsresourceservices\graphicsresource\group" mrp="os\graphics\graphicsresourceservices\graphicsresource\group\graphics_graphicsresource.mrp"/>
+</component>
+<component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicsresourceservices\graphicsresourceadaptation\group" mrp="os\graphics\graphicsresourceservices\graphicsresourceadaptation\group\graphics_graphicsresourceadapter.mrp"/>
+</component>
+</collection>
+<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
+<component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92" purpose="mandatory">
+<unit bldFile="os\graphics\graphicsutils\commongraphicsheaders\group" mrp="os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp"/>
+</component>
+</collection>
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<component name="displayldd" long-name="Display Drivers" introduced="tb92" purpose="optional">
+<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\display" mrp="os\kernelhwsrv\kernel\eka\drivers\display\base_e32_drivers_display.mrp"/>
+</component>
+<component name="surfacemgr" long-name="Surface Manager" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicshwdrivers\surfacemgr\group" mrp="os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
+</component>
+</collection>
+<collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
+<component name="graphicscompositionengine" long-name="Graphics Composition Engine" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicscomposition\graphicscompositionengine\group" mrp="os\graphics\graphicscomposition\graphicscompositionengine\group\graphics_gce.mrp"/>
+</component>
+<component name="compositionengineadaptation" long-name="Composition Engine Adaptation" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicscomposition\compositionengineadaptation\group" mrp="os\graphics\graphicscomposition\compositionengineadaptation\group\graphics_compositionbackend.mrp"/>
+</component>
+<component name="compositionengineadaptationsgx" long-name="SGX Composition Engine Adaptation" introduced="tb92" purpose="optional" class="placeholder">
+<!-- PLACEHOLDER="DS.1539"
+         <unit mrp="graphicscomposition/compositionengineadaptationsgx/group/compositionengineadaptationsgx.mrp"/>
+     -->
+</component>
+<component name="compositionengineadaptationmbx" long-name="MBX Backend" introduced="tb92" purpose="optional" class="placeholder">
+<!-- PLACEHOLDER="DS.1724"
+         <unit mrp="graphicscomposition/compositionengineadaptationmbx/group/compositionengineadaptationmbx.mrp"/>
+     -->
+</component>
+<component name="surfaceupdate" long-name="Surface Update" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicscomposition\surfaceupdate\group" mrp="os\graphics\graphicscomposition\surfaceupdate\group\graphics_surfaceupdate.mrp"/>
+</component>
+</collection>
+<collection name="graphicstest" long-name="Graphics Test" level="app-if">
+<component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development">
+<unit mrp="os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
+</component>
+<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
+<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" purpose="development" class="doc">
+<unit mrp="os\graphics\graphics_info\graphicsdocs\graphics_documentation.mrp"/>
+</component>
+<component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\graphics\graphics_info\graphics_metadata\graphics_metadata.mrp"/>
+</component>
+</collection>
+<collection name="windowing" long-name="Windowing" level="app-if">
+<component name="windowserver" long-name="Window Server" purpose="mandatory">
+<unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
+</component>
+<component name="windowserverplugins" long-name="Window Server Plugins" introduced="tb92" purpose="optional" plugin="Y">
+<unit bldFile="os\graphics\windowing\windowserverplugins\group" mrp="os\graphics\windowing\windowserverplugins\group\graphics_wserv_std_plugins.mrp"/>
+</component>
+</collection>
+<collection name="printingservices" long-name="Printing Services" level="app-if">
+<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
+<unit bldFile="os\graphics\printingservices\printerdriversupport\group" mrp="os\graphics\printingservices\printerdriversupport\group\graphics_pdrstore.mrp"/>
+</component>
+<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" 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" purpose="mandatory">
+<unit bldFile="os\graphics\fbs\fontandbitmapserver\group" mrp="os\graphics\fbs\fontandbitmapserver\group\graphics_fbserv.mrp"/>
+</component>
+</collection>
+<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+<unit bldFile="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" purpose="development">
+<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" purpose="optional">
+<unit bldFile="os\graphics\opengles\openglesdisplayproperties\group" mrp="os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp"/>
+</component>
+</collection>
+<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
+<unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
+</component>
+<component name="openvgimplementation" long-name="OpenVG Implementation" introduced="tb91" purpose="optional">
+<unit bldFile="os\graphics\openvg\openvgimplementation\group\" mrp="os\graphics\openvg\openvgimplementation\group\graphics_openvg.mrp"/>
+</component>
+</collection>
+<collection name="egl" long-name="EGL" level="internal-adaptations">
+<component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
+<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" purpose="optional">
+<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="gdi" long-name="GDI" purpose="mandatory">
+<unit bldFile="os\graphics\graphicsdeviceinterface\gdi\group" mrp="os\graphics\graphicsdeviceinterface\gdi\group\graphics_gdi.mrp"/>
+</component>
+<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+<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" purpose="optional">
+<unit bldFile="os\graphics\graphicsdeviceinterface\colourpalette\group" mrp="os\graphics\graphicsdeviceinterface\colourpalette\group\graphics_palette.mrp"/>
+</component>
+<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
+<unit bldFile="os\graphics\graphicsdeviceinterface\screendriver\group" mrp="os\graphics\graphicsdeviceinterface\screendriver\group\graphics_screendriver.mrp"/>
+</component>
+<component name="directgdi" long-name="DirectGDI" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicsdeviceinterface\directgdi\group" mrp="os\graphics\graphicsdeviceinterface\directgdi\group\graphics_directgdi.mrp"/>
+</component>
+<component name="directgdiinterface" long-name="DirectGDI Interface" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicsdeviceinterface\directgdiinterface\group" mrp="os\graphics\graphicsdeviceinterface\directgdiinterface\group\graphics_directgdiheaders.mrp"/>
+</component>
+<component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="tb92" purpose="optional">
+<unit bldFile="os\graphics\graphicsdeviceinterface\directgdiadaptation\group" mrp="os\graphics\graphicsdeviceinterface\directgdiadaptation\group\graphics_directgdiadapter.mrp"/>
+</component>
+</collection>
+<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
+<unit bldFile="os\graphics\graphicstools\gdi_tools\group" mrp="os\graphics\graphicstools\gdi_tools\group\graphics_gditools.mrp"/>
+</component>
+</collection>
+<collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
+<component name="graphicssvs" long-name="Graphics Verification Suite" introduced="tb91" purpose="development">
+<unit mrp="os\graphics\graphicsapitest\graphicssvs\group\graphicssvs.mrp"/>
+</component>
+<component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder">
+<!-- PLACEHOLDER="DS.1675"
+	<unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>
+	-->
+</component>
+</collection>
+</block>
 <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
 <collection name="charconvfw" long-name="Character Conversion" level="encoding">
 <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<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" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+<unit bldFile="os\textandloc\charconvfw\charconvplugins\group" mrp="os\textandloc\charconvfw\charconvplugins\group\syslibs_charconv_plugins.mrp"/>
 </component>
 <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+<unit bldFile="os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group" mrp="os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group\syslibs_FATCharsetConv.mrp"/>
 </component>
 </collection>
 <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
 <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+<unit bldFile="os\textandloc\fontservices\textshaperplugin\group" mrp="os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
 </component>
 <component name="fontstore" long-name="Font Store" purpose="mandatory">
-<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="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
 <!-- placeholder for text code from GDI -->
 </component>
 <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="os/textandloc/fontservices/freetypefontrasteriser/group" mrp="os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+<unit bldFile="os\textandloc\fontservices\freetypefontrasteriser\group" mrp="os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
 </component>
 <component name="itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y">
-<unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/>
+<unit bldFile="os\graphics\fbs\itypefontrasteriser\group" mrp="os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp"/>
 </component>
 <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="os/textandloc/fontservices/referencefonts/group" mrp="os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+<unit bldFile="os\textandloc\fontservices\referencefonts\group" mrp="os\textandloc\fontservices\referencefonts\group\graphics_fonts.mrp"/>
 </component>
 <component name="testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" class="placeholder">
-<!-- placeholder 
-        <unit bldFile="fontservices/graphicstestfonts/group" mrp="fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/>
+<!-- placeholder 
+        <unit bldFile="fontservices/graphicstestfonts/group" mrp="fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/>
         -->
 </component>
 </collection>
 <collection name="textlayout" long-name="Text Layout" level="text">
 <component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/texthandling/group" mrp="os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+<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" purpose="optional">
-<unit bldFile="os/textandloc/textrendering/textformatting/group" mrp="os/textandloc/textrendering/textformatting/group/app-framework_form.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" purpose="development">
-<unit mrp="os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
+<unit mrp="os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
 </component>
 </collection>
 <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
@@ -1043,12 +1876,12 @@
 <!-- placeholder for split from bafl -->
 </component>
 <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<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>
 </collection>
 <collection name="localesupport" long-name="Locale Support" level="util">
 <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+<unit bldFile="os\kernelhwsrv\localisation\localesupport" mrp="os\kernelhwsrv\localisation\localesupport\mmpfiles\base_loce32.mrp"/>
 </component>
 <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
 <!-- placeholder for split from bafl -->
@@ -1059,222 +1892,236 @@
 <!-- placeholder for split from GDI Tools -->
 </component>
 <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+<unit bldFile="os\graphics\graphicstools\bitmapfonttools\group" mrp="os\graphics\graphicstools\bitmapfonttools\group\graphics_gdtran.mrp"/>
 </component>
 </collection>
 <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
 <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+<unit mrp="os\textandloc\textandloc_info\textandloc_metadata\textandloc_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="xmlsrv" level="services" long-name="XML 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" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmlfw/group" mrp="os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+<unit bldFile="os\xmlsrv\xml\xmlfw\group" mrp="os\xmlsrv\xml\xmlfw\group\syslibs_xml.mrp"/>
 </component>
 <component name="libxml2libs" long-name="Libxml2 Libraries" introduced="tb92" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/libxml2libs/group" mrp="os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+<unit bldFile="os\xmlsrv\xml\libxml2libs\group" mrp="os\xmlsrv\xml\libxml2libs\group\syslibs_libxml2.mrp"/>
 </component>
 <component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="tb92" purpose="optional">
-<unit bldFile="os/xmlsrv/xml/xmldomandxpath/group" mrp="os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+<unit bldFile="os\xmlsrv\xml\xmldomandxpath\group" mrp="os\xmlsrv\xml\xmldomandxpath\group\syslibs_xmldom.mrp"/>
 </component>
 <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmlexpatparser/group" mrp="os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+<unit bldFile="os\xmlsrv\xml\xmlexpatparser\group" mrp="os\xmlsrv\xml\xmlexpatparser\group\syslibs_xmlparser.mrp"/>
 </component>
 <component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/xmllibxml2parser/group" mrp="os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+<unit bldFile="os\xmlsrv\xml\xmllibxml2parser\group" mrp="os\xmlsrv\xml\xmllibxml2parser\group\syslibs_xmlparser2.mrp"/>
 </component>
 <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="os/xmlsrv/xml/wbxmlparser/group" mrp="os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+<unit bldFile="os\xmlsrv\xml\wbxmlparser\group" mrp="os\xmlsrv\xml\wbxmlparser\group\syslibs_wbxmlparser.mrp"/>
 </component>
 </collection>
 <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
 <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+<unit mrp="os\xmlsrv\xmlsrv_info\xmlsrv_metadata\xmlsrv_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
 <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
 <component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+<unit mrp="os\deviceplatformrelease\symbianosbld\cedarutils\tools_utils_cedar.mrp"/>
 </component>
 <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+<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" purpose="development" class="doc">
-<unit mrp="os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
+<unit mrp="os\deviceplatformrelease\foundation_system\systemdocs\group\system.mrp"/>
 </component>
 <component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+<unit mrp="os\deviceplatformrelease\foundation_system\system_model\system_model.mrp"/>
 </component>
 </collection>
 <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
 <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+<unit mrp="os\deviceplatformrelease\deviceplatformrelease_info\deviceplatformrelease_metadata\deviceplatformrelease_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="osrndtools" level="services"/>
+<block name="osrndtools" level="services" long-name="OS RD tools" levels="fw trace">
+<collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
+<component name="cinidata" long-name="CINI Data" purpose="development">
+<unit bldFile="os\osrndtools\testexecfw1\cinidata" mrp="os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp"/>
+</component>
+<component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development">
+<unit bldFile="os\osrndtools\testexecfw1\testexecute\Group" mrp="os\osrndtools\testexecfw1\testexecute\Group\tools_testexecute.mrp"/>
+</component>
+</collection>
+<collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
+<component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="os\osrndtools\osrndtools_info\osrndtools_metadata\osrndtools_metadata.mrp"/>
+</component>
+</collection>
+</block>
 </layer>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
 <collection name="filehandling" long-name="File Handling" level="server">
 <component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+<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" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+<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" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+<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" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+<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" purpose="optional">
-<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" deprecated="tb92" introduced="8.1" purpose="development">
-<unit bldFile="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.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" purpose="development">
-<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" purpose="development" class="doc">
-<unit mrp="mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+<unit mrp="mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp"/>
 </component>
 <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="mw/appsupport/commonappservices/backuprestorenotification/group" mrp="mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzserver/group" mrp="mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/tzloc/group" mrp="mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+<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" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+<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" purpose="optional" class="config">
-<unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/appsupport/tzservices/worldserver/group" mrp="mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
+<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" purpose="development">
-<unit bldFile="mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
+<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="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/contenthandling/webrecognisers/group" mrp="mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.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" purpose="development">
-<unit bldFile="mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group" mrp="mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+<unit bldFile="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group" mrp="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
 </component>
 </collection>
 <collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
 <component name="commandshell" long-name="Command Shell" introduced="tb92" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/commandshell/group" mrp="mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+<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" purpose="development">
-<unit bldFile="mw/appsupport/openenvutils/telnetserver/group" mrp="mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+<unit bldFile="mw\appsupport\openenvutils\telnetserver\group" mrp="mw\appsupport\openenvutils\telnetserver\group\oetools_telnetd.mrp"/>
 </component>
 </collection>
 <collection name="printingsupport" long-name="Printing Support" level="generic">
 <component name="printinguisupport" long-name="Printing UI Support" purpose="optional">
-<unit bldFile="mw/appsupport/printingsupport/printinguisupport/group" mrp="mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+<unit bldFile="mw\appsupport\printingsupport\printinguisupport\group" mrp="mw\appsupport\printingsupport\printinguisupport\group\app-framework_print.mrp"/>
 </component>
 </collection>
 <collection name="appfw" long-name="Application Framework" level="framework">
 <component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/apparchitecture/group" mrp="mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+<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" purpose="mandatory">
-<unit bldFile="mw/appsupport/appfw/viewserver/group" mrp="mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+<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" introduced="9.2" purpose="development">
-<unit mrp="mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
+<unit mrp="mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
 </component>
 </collection>
 <collection name="applaunchservices" long-name="Application Launch Services" level="generic">
 <component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="tb92" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+<unit bldFile="mw\appsupport\applaunchservices\aftermarketappstarter\group" mrp="mw\appsupport\applaunchservices\aftermarketappstarter\group\app-framework_amastart.mrp"/>
 </component>
 <component name="applaunchplugins" long-name="Application Launch Plugins" introduced="tb92" purpose="optional">
-<unit bldFile="mw/appsupport/applaunchservices/applaunchplugins/group" mrp="mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+<unit bldFile="mw\appsupport\applaunchservices\applaunchplugins\group" mrp="mw\appsupport\applaunchservices\applaunchplugins\group\app-framework_aplp.mrp"/>
 </component>
 </collection>
 <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
 <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/tzcompiler/group" mrp="mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+<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" purpose="development" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/worlddatabasekit/group" mrp="mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/>
+<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" purpose="development" class="config PC">
-<unit bldFile="mw/appsupport/tzpcside/worldtools/group" mrp="mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
+<unit bldFile="mw\appsupport\tzpcside\worldtools\group" mrp="mw\appsupport\tzpcside\worldtools\group\app-services_wldtools.mrp"/>
 </component>
 </collection>
 <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
 <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+<unit mrp="mw\appsupport\appsupport_info\appsupport_metadata\appsupport_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" 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" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+<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" purpose="development">
-<unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+<unit bldFile="mw\netprotocols\applayerprotocols\telnetengine\group" mrp="mw\netprotocols\applayerprotocols\telnetengine\group\networking_telnet_e.mrp"/>
 </component>
 </collection>
 <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
 <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+<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" purpose="optional">
-<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" introduced="6.2" purpose="optional" plugin="Y">
-<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" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.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" purpose="optional">
-<unit bldFile="mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
+<unit bldFile="mw\netprotocols\wapstack\wapmessageapi\group" mrp="mw\netprotocols\wapstack\wapmessageapi\group\wap-stack_wapmessage.mrp"/>
 </component>
 </collection>
 <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
 <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+<unit mrp="mw\netprotocols\netprotocols_info\netprotocols_metadata\netprotocols_metadata.mrp"/>
 </component>
 </collection>
 </block>
@@ -1282,335 +2129,328 @@
 <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
 <component name="rtp" long-name="RTP" introduced="9.0" purpose="optional">
 <!-- Real Time Data Protocol -->
-<unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="srtp" long-name="Secure RTP" introduced="tb92" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/srtp/group" mrp="mw/ipappprotocols/realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
+<unit bldFile="mw\ipappprotocols\realtimenetprots\sipfw\Group" mrp="mw\ipappprotocols\realtimenetprots\sipfw\Group\mm-protocols_SIP2_Com.mrp" version="2"/>
 </component>
 </collection>
 <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
 <component name="sipprovider" long-name="SIP Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+<unit bldFile="mw\ipappprotocols\sipproviderplugins\sipprovider\group" mrp="mw\ipappprotocols\sipproviderplugins\sipprovider\group\mm-protocols_SipProvider.mrp"/>
 </component>
 </collection>
 <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
 <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+<unit mrp="mw\ipappprotocols\ipappprotocols_info\ipappprotocols_metadata\ipappprotocols_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
 <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
 <component name="amrpayloadformatter" long-name="AMR Payload Formatter" introduced="tb92" purpose="optional">
-<unit bldFile="mw/ipappsrv/multimediacommscontroller/amrpayloadformatter/group" mrp="mw/ipappsrv/multimediacommscontroller/amrpayloadformatter/group/mm-protocols_rtpamr.mrp"/>
+<unit bldFile="mw\ipappsrv\multimediacommscontroller\amrpayloadformatter\group" mrp="mw\ipappsrv\multimediacommscontroller\amrpayloadformatter\group\mm-protocols_rtpamr.mrp"/>
 </component>
 </collection>
 <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
 <component name="ipappsrv_metadata" long-name="IP App Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+<unit mrp="mw\ipappsrv\ipappsrv_info\ipappsrv_metadata\ipappsrv_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
 <collection name="messagingfw" long-name="Messaging FW" level="fw">
 <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.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" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+<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" purpose="optional" 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" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+<unit bldFile="mw\messagingmw\messagingfw\watcherfw\group" mrp="mw\messagingmw\messagingfw\watcherfw\group\messaging_watcher.mrp"/>
 </component>
 <component name="msgtest" long-name="Messaging Test" purpose="development">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.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" purpose="development">
-<unit mrp="mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
+<unit mrp="mw\messagingmw\messagingfw\msgtests\group\messaging.mrp"/>
 </component>
 <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92" purpose="development">
-<unit mrp="mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
+<unit mrp="mw\messagingmw\messagingfw\msgtestfw\group\messaging_testframework.mrp"/>
 </component>
 <component name="msgtestproduct" long-name="Messaging Test Product" purpose="development">
-<unit mrp="mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
+<unit mrp="mw\messagingmw\messagingfw\msgtestproduct\group\messaging_testproduct.mrp"/>
 </component>
 <component name="sendas" long-name="Send As" purpose="optional">
-<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" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+<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" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+<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" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+<unit bldFile="mw\messagingmw\messagingfw\suplwappushhandler\group" mrp="mw\messagingmw\messagingfw\suplwappushhandler\group\lbs_suplwappush.mrp"/>
 </component>
 </collection>
 <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
 <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+<unit mrp="mw\messagingmw\messagingmw_info\messagingmw_metadata\messagingmw_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
 <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
 <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+<unit mrp="mw\remoteconn\remoteconn_info\remoteconn_metadata\remoteconn_metadata.mrp"/>
 </component>
 <component name="connectivitydoc" long-name="Connectivity Documentation" introduced="tb91" purpose="optional" class="doc">
-<unit mrp="mw/remoteconn/remoteconn_info/connectivitydoc/group/connectivity_documentation.mrp"/>
+<unit mrp="mw\remoteconn\remoteconn_info\connectivitydoc\group\connectivity_documentation.mrp"/>
 </component>
 <component name="mtpdoc" long-name="MTP Documentation" introduced="tb91" purpose="optional" class="doc">
-<unit mrp="mw/remoteconn/remoteconn_info/mtpdoc/group/mtp_documentation.mrp"/>
+<unit mrp="mw\remoteconn\remoteconn_info\mtpdoc\group\mtp_documentation.mrp"/>
 </component>
 </collection>
 <collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
 <component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92" purpose="optional">
-<unit bldFile="mw/remoteconn/usbfunctiondrivers/massstoragemgr/group" mrp="mw/remoteconn/usbfunctiondrivers/massstoragemgr/group/connectivity_usbms.mrp"/>
+<unit bldFile="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group" mrp="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group\connectivity_usbms.mrp"/>
 </component>
 </collection>
 <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
 <component name="mrouter" long-name="m-Router" filter="gt" purpose="optional">
-<unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
+<unit bldFile="mw\remoteconn\connectivitytransports\plpremotelink\group" mrp="mw\remoteconn\connectivitytransports\plpremotelink\group\connectivity_legacy_plp_plpremotelink.mrp"/>
 </component>
 <component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/connectivitytransports/plpvariant/group" mrp="mw/remoteconn/connectivitytransports/plpvariant/group/connectivity_legacy_plp_plpvariant.mrp"/>
+<unit bldFile="mw\remoteconn\connectivitytransports\plpvariant\group" mrp="mw\remoteconn\connectivitytransports\plpvariant\group\connectivity_legacy_plp_plpvariant.mrp"/>
 </component>
 </collection>
 <collection name="mtptransports" long-name="MTP Transports" level="plugin">
 <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+<unit bldFile="mw\remoteconn\mtptransports\mtpusbtransport\group" mrp="mw\remoteconn\mtptransports\mtpusbtransport\group\mtp_usbsic.mrp"/>
 </component>
 <component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+<unit bldFile="mw\remoteconn\mtptransports\mtpptpiptransport\group" mrp="mw\remoteconn\mtptransports\mtpptpiptransport\group\mtp_ptpip.mrp"/>
 </component>
 <component name="mtbttransport" long-name="MTP Bluetooth Transport" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtptransports/mtpbttransport/group" mrp="mw/remoteconn/mtptransports/mtpbttransport/group/mtp_bt.mrp"/>
+<unit bldFile="mw\remoteconn\mtptransports\mtpbttransport\group" mrp="mw\remoteconn\mtptransports\mtpbttransport\group\mtp_bt.mrp"/>
 </component>
 </collection>
 <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
 <component name="mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional">
-<unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+<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" purpose="development">
-<unit bldFile="mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
+<unit bldFile="mw\remoteconn\mtpfws\mtpintegrationtest\group" mrp="mw\remoteconn\mtpfws\mtpintegrationtest\group\mtp_test.mrp"/>
 </component>
 </collection>
 <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
 <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+<unit bldFile="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group" mrp="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group\mtp_filedp.mrp"/>
 </component>
 <component name="mtpbackupandrestoredp" long-name="Backup and Restore Provider" introduced="Future" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpbackupandrestoredp/group" mrp="mw/remoteconn/mtpdataproviders/mtpbackupandrestoredp/group/mtp_backupnrestoredp.mrp"/>
+<unit bldFile="mw\remoteconn\mtpdataproviders\mtpbackupandrestoredp\group" mrp="mw\remoteconn\mtpdataproviders\mtpbackupandrestoredp\group\mtp_backupnrestoredp.mrp"/>
 </component>
 <component name="mtptaskdp" long-name="MTP Task Provider" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtptaskdp/group" mrp="mw/remoteconn/mtpdataproviders/mtptaskdp/group/mtp_taskdp.mrp"/>
+<unit bldFile="mw\remoteconn\mtpdataproviders\mtptaskdp\group" mrp="mw\remoteconn\mtpdataproviders\mtptaskdp\group\mtp_taskdp.mrp"/>
 </component>
 <component name="mtpcalendardp" long-name="MTP Calendar Provider" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw/remoteconn/mtpdataproviders/mtpcalendardp/group" mrp="mw/remoteconn/mtpdataproviders/mtpcalendardp/group/mtp_calendardp.mrp"/>
+<unit bldFile="mw\remoteconn\mtpdataproviders\mtpcalendardp\group" mrp="mw\remoteconn\mtpdataproviders\mtpcalendardp\group\mtp_calendardp.mrp"/>
 </component>
 </collection>
 <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
 <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
-<unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+<unit bldFile="mw\remoteconn\backupandrestore\backupengine\group" mrp="mw\remoteconn\backupandrestore\backupengine\group\connectivity_backupengine.mrp"/>
 </component>
 <component name="backuptest" long-name="Backup Test" introduced="tb92" purpose="development">
-<unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+<unit bldFile="mw\remoteconn\backupandrestore\backuptest\group" mrp="mw\remoteconn\backupandrestore\backuptest\group\connectivity_backuptest.mrp"/>
 </component>
 </collection>
 <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
 <component name="chatscripts" long-name="Chat Scripts" purpose="development">
-<unit bldFile="mw/remoteconn/connectivitypcside/chatscripts/group" mrp="mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
+<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" purpose="optional" class="PC">
-<unit mrp="mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
+<unit mrp="mw\remoteconn\connectivitypcside\connectqi\connectqisdk_mr3.mrp"/>
 </component>
 </collection>
 <collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
 <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional">
-<unit bldFile="mw/remoteconn/connectivitydevicefws/connectivityfw/group" mrp="mw/remoteconn/connectivitydevicefws/connectivityfw/group/connectivity_framework.mrp"/>
+<unit bldFile="mw\remoteconn\connectivitydevicefws\connectivityfw\group" mrp="mw\remoteconn\connectivitydevicefws\connectivityfw\group\connectivity_framework.mrp"/>
 </component>
 <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91" purpose="optional">
-<unit bldFile="mw/remoteconn/connectivitydevicefws/connectivityservices/group" mrp="mw/remoteconn/connectivitydevicefws/connectivityservices/group/connectivity_services.mrp"/>
+<unit bldFile="mw\remoteconn\connectivitydevicefws\connectivityservices\group" mrp="mw\remoteconn\connectivitydevicefws\connectivityservices\group\connectivity_services.mrp"/>
 </component>
 </collection>
 </block>
-<block name="srvdiscovery" level="generic"/>
+<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
+<collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
+<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="tb92" purpose="optional">
+<unit bldFile="mw\srvdiscovery\servicediscoveryandcontrol\pnp\group\" mrp="mw\srvdiscovery\servicediscoveryandcontrol\pnp\group\servicediscoveryframework.mrp"/>
+</component>
+</collection>
+<collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
+<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="mw\srvdiscovery\srvdiscovery_info\srvdiscovery_metadata\srvdiscovery_metadata.mrp"/>
+</component>
+</collection>
+</block>
 <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
 <collection name="obex" long-name="OBEX" level="generic">
 <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional">
-<unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/shortlinkconn/obex/obexextensionapi/group" mrp="mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+<unit bldFile="mw\shortlinkconn\obex\obexextensionapi\group" mrp="mw\shortlinkconn\obex\obexextensionapi\group\obex_extensionapis.mrp"/>
 </component>
 </collection>
 <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
 <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+<unit bldFile="mw\shortlinkconn\bluetoothappprofiles\avrcp" mrp="mw\shortlinkconn\bluetoothappprofiles\avrcp\bluetooth_avrcp.mrp"/>
 </component>
 </collection>
 <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
 <component name="shortlinkconn_metadata" long-name="Shortlink Connectivity Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/shortlinkconn/shortlinkconn_info/shortlinkconn_metadata/shortlinkconn_metadata.mrp"/>
+<unit mrp="mw\shortlinkconn\shortlinkconn_info\shortlinkconn_metadata\shortlinkconn_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="mmmw" level="generic" long-name="Multimedia Middleware" 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" purpose="mandatory">
-<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>
 </collection>
 <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
 <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<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" purpose="development">
-<unit mrp="mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
+<unit mrp="mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
 </component>
 <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
+<unit mrp="mw\mmmw\mmfwtest\mmfintegrationtest\group\multimedia_inttest_mmf_source.mrp"/>
 </component>
 <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development">
-<unit bldFile="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
+<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="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development">
-<unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
+<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" purpose="development">
-<unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
+<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" purpose="development">
-<unit mrp="mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
+<unit mrp="mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
 </component>
 </collection>
 <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
 <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+<unit mrp="mw\mmmw\mmmw_info\mmmw_metadata\mmmw_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
 <collection name="fep" long-name="FEP" level="engine">
 <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+<unit bldFile="mw\inputmethods\fep\frontendprocessor\group" mrp="mw\inputmethods\fep\frontendprocessor\group\app-framework_fepbase.mrp"/>
 </component>
 </collection>
 <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
 <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+<unit mrp="mw\inputmethods\inputmethods_info\inputmethods_metadata\inputmethods_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="classicui" level="generic" long-name="Classic UI" 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" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uikon/group" mrp="mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+<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" purpose="mandatory">
-<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" purpose="mandatory">
-<unit bldFile="mw/classicui/commonuisupport/uilaf/GROUP" mrp="mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+<unit bldFile="mw\classicui\commonuisupport\uilaf\GROUP" mrp="mw\classicui\commonuisupport\uilaf\GROUP\app-framework_uiklafgt.mrp"/>
 </component>
 <component name="grid" long-name="Grid" purpose="optional">
-<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" purpose="development" class="doc">
-<unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.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="cone" long-name="Control Environment" purpose="mandatory">
-<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" purpose="optional">
-<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" purpose="mandatory">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+<unit bldFile="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group" mrp="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group\app-framework_egul.mrp"/>
 </component>
 <component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+<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" purpose="optional">
-<unit bldFile="mw/classicui/lafagnosticuifoundation/animation/group" mrp="mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+<unit bldFile="mw\classicui\lafagnosticuifoundation\animation\group" mrp="mw\classicui\lafagnosticuifoundation\animation\group\app-framework_animation.mrp"/>
 </component>
 </collection>
 <collection name="classicui_info" long-name="Classic UI Info" level="specific">
 <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+<unit mrp="mw\classicui\classicui_info\classicui_metadata\classicui_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
 <collection name="installationservices" long-name="Installation Services" level="generic">
 <component name="swi" long-name="Secure Software Install" purpose="optional">
-<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" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="swcomponentregistry" long-name="Software Component Registry" introduced="Future" purpose="mandatory">
-<unit bldFile="mw/appinstall/installationservices/swcomponentregistry/group" mrp="mw/appinstall/installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-</component>
-<component name="swinstallationfw" long-name="Software Installation Framework" introduced="Future" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swinstallationfw/group" mrp="mw/appinstall/installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-</component>
-<component name="swtransactionservices" long-name="Software Transaction Services" introduced="Future" purpose="optional">
-<unit bldFile="mw/appinstall/installationservices/swtransactionservices/group" mrp="mw/appinstall/installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-</component>
-<component name="refswinstallationplugin" long-name="Reference Software Installation Plugin" introduced="Future" purpose="development" plugin="Y">
-<unit bldFile="mw/appinstall/installationservices/refswinstallationplugin/group" mrp="mw/appinstall/installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-</component>
-<component name="refsoftwareappmgr" long-name="Reference Software Application Manager" introduced="Future" purpose="development">
-<unit bldFile="mw/appinstall/installationservices/refsoftwareappmgr/group" mrp="mw/appinstall/installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.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" purpose="development">
-<unit mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
+<unit mrp="mw\appinstall\installationservices\switestfw\group\install_testframework.mrp"/>
 </component>
 <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+<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" level="tool">
 <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.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" purpose="development" 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="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+<unit mrp="mw\appinstall\secureswitools\openssllib\security_openssl.mrp"/>
 </component>
 </collection>
 <collection name="appinstall_info" long-name="Application Installation Info" level="api">
 <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+<unit mrp="mw\appinstall\appinstall_info\appinstall_metadata\appinstall_metadata.mrp"/>
 </component>
 </collection>
 </block>
@@ -1619,119 +2459,248 @@
 <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
 <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
 <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+<unit bldFile="app\contacts\phonebookengines\contactsmodel\groupsql" mrp="app\contacts\phonebookengines\contactsmodel\groupsql\app-engines_cntmodel.mrp" version="2"/>
 </component>
 </collection>
 <collection name="pimprotocols" long-name="PIM Protocols" level="services">
 <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+<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" purpose="optional">
-<unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+<unit bldFile="app\contacts\pimprotocols\pbap\group" mrp="app\contacts\pimprotocols\pbap\group\bluetooth_accesshost.mrp"/>
 </component>
 </collection>
 <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
 <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+<unit mrp="app\contacts\contacts_info\contacts_metadata\contacts_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui">
 <collection name="pimappservices" long-name="PIM App Services" level="services">
 <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
+<unit bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp" version="2"/>
 </component>
 <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
+<unit bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit2.mrp" version="2"/>
 </component>
 <component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+<unit mrp="app\organizer\pimappservices\appenginesdocs\app-engines_documentation.mrp"/>
 </component>
 </collection>
 <collection name="pimappsupport" long-name="PIM Application Support" level="support">
 <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+<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" purpose="optional">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+<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" purpose="optional" plugin="Y">
-<unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+<unit bldFile="app\organizer\pimappsupport\chinesecalendaralg\group" mrp="app\organizer\pimappsupport\chinesecalendaralg\group\app-services_chinesecalendaralgorithm.mrp"/>
 </component>
 </collection>
 <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
 <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+<unit mrp="app\organizer\organizer_info\organizer_metadata\organizer_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
 <collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
 <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/group" mrp="app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+<unit bldFile="app\messaging\mobilemessaging\smsmtm\group" mrp="app\messaging\mobilemessaging\smsmtm\group\messaging_sms.mrp"/>
 </component>
 </collection>
 <collection name="mmsengine" long-name="MMS Engine" level="eng">
 <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="app/messaging/mmsengine/mmssettings/group/" mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+<unit bldFile="app\messaging\mmsengine\mmssettings\group\" mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings.mrp"/>
 </component>
 <component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings-config.mrp"/>
+<unit mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings-config.mrp"/>
 <!--PLACEHOLDER="DEF139515" REMOVE-->
-<!-- PLACEHOLDER="DEF139515"
-		<unit bldFile="mmsengine/mmsconf/" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+<!-- PLACEHOLDER="DEF139515"
+		<unit bldFile="mmsengine/mmsconf/" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
 		-->
 </component>
 </collection>
 <collection name="messagingappbase" long-name="Messaging App Base" level="base">
 <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="app/messaging/messagingappbase/smilparser/GROUP" mrp="app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+<unit bldFile="app\messaging\messagingappbase\smilparser\GROUP" mrp="app\messaging\messagingappbase\smilparser\GROUP\messaging_gmxml.mrp"/>
 </component>
 <component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/Group" mrp="app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+<unit bldFile="app\messaging\messagingappbase\obexmtms\Group" mrp="app\messaging\messagingappbase\obexmtms\Group\messaging_obex.mrp"/>
 </component>
 </collection>
 <collection name="email" long-name="Email" level="mail">
 <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/group" mrp="app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+<unit bldFile="app\messaging\email\pop3andsmtpmtm\group" mrp="app\messaging\email\pop3andsmtpmtm\group\messaging_email.mrp"/>
 </component>
 <component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="app/messaging/email/imap4mtm/group" mrp="app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+<unit bldFile="app\messaging\email\imap4mtm\group" mrp="app\messaging\email\imap4mtm\group\messaging_email_imap.mrp"/>
 </component>
 </collection>
 <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
 <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+<unit mrp="app\messaging\messaging_info\messaging_metadata\messaging_metadata.mrp"/>
 </component>
 </collection>
 </block>
 <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools unused ui">
 <collection name="symhelptools" long-name="Symbian Help Tools" level="tools">
 <component name="mbmcodec" long-name="MBM Codec" filter="gt" purpose="development">
-<unit bldFile="app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/>
+<unit bldFile="app\helps\symhelp\mbmcodec\group" mrp="app\helps\symhelp\mbmcodec\group\tools_sdk_eng_mbmcodec.mrp"/>
 </component>
 <component name="cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt" purpose="development">
-<unit bldFile="app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
+<unit bldFile="app\helps\symhelp\cshlpcmpgui\group" mrp="app\helps\symhelp\cshlpcmpgui\group\tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
 </component>
 <component name="cshlpcmpfrontend" long-name="CSHelp Compiler Frontend" purpose="development">
-<unit bldFile="app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/>
+<unit bldFile="app\helps\symhelp\cshlpcmpfrontend\group" mrp="app\helps\symhelp\cshlpcmpfrontend\group\tools_sdk_eng_cshlpcmp_frontend.mrp"/>
 </component>
 <component name="cshlpcmpbackend" long-name="CSHelp Compiler Backend" purpose="development">
-<unit mrp="app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
+<unit mrp="app\helps\symhelp\cshlpcmpbackend\group\tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
 </component>
 </collection>
 <collection name="symhelp" long-name="Symbian Help" level="eng">
 <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+<unit bldFile="app\helps\symhelp\helpmodel\group" mrp="app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
 </component>
 </collection>
 <collection name="helps_info" long-name="Help Apps Info" level="ui">
 <component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+<unit mrp="app\helps\helps_info\helps_metadata\helps_metadata.mrp"/>
+</component>
+</collection>
+</block>
+<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+<collection name="buildverification" long-name="Build Verification" level="services">
+<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development">
+<unit bldFile="app\techview\buildverification\autosmoketest\Group" mrp="app\techview\buildverification\autosmoketest\Group\testtools_autosmoketest.mrp"/>
+</component>
+<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
+<unit bldFile="app\techview\buildverification\smoketest\Group" mrp="app\techview\buildverification\smoketest\Group\testtools_smoketest.mrp"/>
+</component>
+</collection>
+<collection name="installationapps" long-name="Installation Apps" level="apps2">
+<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+<unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
+</component>
+</collection>
+<collection name="networkingutils" long-name="Networking Utils" level="utils">
+<component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development">
+<unit mrp="app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>
+</component>
+<component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development">
+<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" purpose="development">
+<unit mrp="app\techview\testapps\rschandler\TVResourceHandler\group\Testtools_ResourceHandler_gt.mrp"/>
+</component>
+</collection>
+<collection name="techview_info" long-name="Techview Info" level="apps3">
+<component name="techview_metadata" long-name="Techview Metadata" introduced="tb91" purpose="development" class="config PC">
+<unit mrp="app\techview\techview_info\techview_metadata\techview_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="techview" level="apps" span="2"/>
 </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"/>
+  <target name="ARMV7" abldTarget="armv7" description="RVCT Compiler"/>
+  <target name="ARMV7_REL" abldTarget="armv7 urel" description="RVCT Compiler"/>
+  <target name="ARMV7_DEB" abldTarget="armv7 udeb" description="RVCT Compiler"/>
+  <target name="ARMV5SMP" abldTarget="armv5smp" description="RVCT Compiler for SMP"/>
+  <target name="ARMV5SMP_REL" abldTarget="armv5smp urel" description="RVCT Compiler for SMP"/>
+  <target name="ARMV5SMP_DEB" abldTarget="armv5smp udeb" description="RVCT Compiler for SMP"/>
+  <!-- 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"/>
+  <targetList name="armv5smp" description="Separate ARMV5 SMP target" target="ARMV5SMP"/>
+  <targetList name="armv5smp_rel" description="Separate ARMV5 SMP release target" target="ARMV5SMP_REL"/>
+  <targetList name="armv5smp_deb" description="Separate ARMV5 SMP debug target" target="ARMV5SMP_DEB"/>
+  <targetList name="default_9.0_armv7" description="Main targets and ARMV7 target" target="WINSCW ARMV5 ARMV7"/>
+  <targetList name="default_9.0_rel_armv7" description="Main targets and ARMV7 release target" target="WINSCW_REL ARMV5_REL ARMV7_REL"/>
+  <targetList name="default_9.0_deb_armv7" description="Main targets and ARMV7 debug target" target="WINSCW_DEB ARMV5_DEB ARMV7_DEB"/>
+    <!-- 9.5 configuration -->
+    <!-- 9.6 configuration -->
+ <!-- Future configuration -->
+  <!-- tb92 configuration -->
+  <!-- tb92sf configuration -->
+  <configuration name="GT_tb92sf" description="tb92sf GT build" filter="tb92sf,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>
+  <configuration name="GT_tb92sf_ARMV5SMP" description="tb92sf ARMV5SMP build" filter="tb92sf,gt">
+    <ref item="os"/>
+    <ref item="mw"/>
+    <ref item="app"/>
+    <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
+    <task><buildLayer command="abld export" unitParallel="Y"/></task>
+    <task><buildLayer command="abld makefile" targetList="armv5smp" unitParallel="Y" targetParallel="N"/></task>
+    <task><buildLayer command="abld resource" targetList="armv5smp" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld library" targetList="armv5smp" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld target" targetList="armv5smp" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld final" targetList="armv5smp" unitParallel="N" targetParallel="N"/></task>
+    <task><buildLayer command="abld -what export" unitParallel="Y"/></task>
+    <task><buildLayer command="abld -what target" targetList="armv5smp_rel" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld -what target" targetList="armv5smp_deb" unitParallel="Y" targetParallel="Y"/></task>
+    <task><buildLayer command="abld help" unitParallel="Y"/></task>
+    <task><buildLayer command="abld -check build" targetList="armv5smp" unitParallel="Y" targetParallel="Y"/></task>
+  </configuration>
+<!-- tb101sf configuration -->
+</SystemBuild></SystemDefinition>
\ No newline at end of file